diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-21 02:49:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-21 05:10:12 +0100 |
| commit | eadd4264ee4319abf9ec2f618ff925d7529f20ed (patch) | |
| tree | 4251d4eb25af927cb290e24d1b6957d584638403 /libavcodec/pnmdec.c | |
| parent | a923b6b8f4f90d09c7c39cc8bfab7ee9d30a2843 (diff) | |
| parent | 770a5c6d025e9c8eb3f5aba9cf1d7d7938fb918a (diff) | |
| download | android_external_ffmpeg-eadd4264ee4319abf9ec2f618ff925d7529f20ed.tar.gz android_external_ffmpeg-eadd4264ee4319abf9ec2f618ff925d7529f20ed.tar.bz2 android_external_ffmpeg-eadd4264ee4319abf9ec2f618ff925d7529f20ed.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
adpcmenc: Use correct frame_size for Yamaha ADPCM.
avcodec: add ff_samples_to_time_base() convenience function to internal.h
adx parser: set duration
mlp parser: set duration instead of frame_size
gsm parser: set duration
mpegaudio parser: set duration instead of frame_size
(e)ac3 parser: set duration instead of frame_size
flac parser: set duration instead of frame_size
avcodec: add duration field to AVCodecParserContext
avutil: add av_rescale_q_rnd() to allow different rounding
pnmdec: remove useless .pix_fmts
libmp3lame: support float and s32 sample formats
libmp3lame: renaming, rearrangement, alignment, and comments
libmp3lame: use the LAME default bit rate
libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
libmp3lame: cosmetics: remove some pointless comments
libmp3lame: convert some debugging code to av_dlog()
libmp3lame: remove outdated comment.
libmp3lame: do not set coded_frame->key_frame.
libmp3lame: improve error handling in MP3lame_encode_init()
...
Conflicts:
doc/APIchanges
libavcodec/libmp3lame.c
libavcodec/pcxenc.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/sgienc.c
libavcodec/utils.c
libavformat/hls.c
libavutil/avutil.h
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmdec.c')
| -rw-r--r-- | libavcodec/pnmdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index c3f7bbda56..0be7ec9326 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -201,7 +201,6 @@ AVCodec ff_pgm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif @@ -216,7 +215,6 @@ AVCodec ff_pgmyuv_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif @@ -231,7 +229,6 @@ AVCodec ff_ppm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif @@ -246,7 +243,6 @@ AVCodec ff_pbm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif @@ -261,7 +257,6 @@ AVCodec ff_pam_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif |