ffmpeg | branch: master | Piotr Bandurski <ami_st...@o2.pl> | Sun May 22 18:02:43 2016 +0200| [854c405dab236f8219bb0059cc3e0b8c6f66faca] | committer: Michael Niedermayer
avcodec/iff: mention RGB8/RGBN decoder Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=854c405dab236f8219bb0059cc3e0b8c6f66faca --- libavcodec/codec_desc.c | 2 +- libavcodec/iff.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c7acd01..077b2d4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -887,7 +887,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_IFF_ILBM, .type = AVMEDIA_TYPE_VIDEO, .name = "iff_ilbm", - .long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM"), + .long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), .props = AV_CODEC_PROP_LOSSY, }, { diff --git a/libavcodec/iff.c b/libavcodec/iff.c index f92f238..96ecd8a 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -1,5 +1,5 @@ /* - * IFF ACBM/ANIM/DEEP/ILBM/PBM bitmap decoder + * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder * Copyright (c) 2010 Peter Ross <pr...@xvid.org> * Copyright (c) 2010 Sebastian Vater <cdgs.ba...@googlemail.com> * Copyright (c) 2016 Paul B Mahol @@ -23,7 +23,7 @@ /** * @file - * IFF ACBM/ANIM/DEEP/ILBM/PBM bitmap decoder + * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder */ #include <stdint.h> @@ -1751,7 +1751,7 @@ static int decode_frame(AVCodecContext *avctx, #if CONFIG_IFF_ILBM_DECODER AVCodec ff_iff_ilbm_decoder = { .name = "iff", - .long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM"), + .long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_IFF_ILBM, .priv_data_size = sizeof(IffContext), _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
