diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 22:41:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 22:41:37 +0200 |
| commit | 6101e5322f083a806fd92a6261ff3197fdd0f5e7 (patch) | |
| tree | 8b869bff6c1db61b3aa3bbabcbe322fee9f3dcf0 /libavcodec/mpeg4videodec.c | |
| parent | 5012c07336eff0e928afb57c6d38271e316c0a6c (diff) | |
| parent | d293e3464db647e72fffad50a678eca89546b65f (diff) | |
| download | ffmpeg-6101e5322f083a806fd92a6261ff3197fdd0f5e7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
asfdec: Add an option for not searching for the packet markers
cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
cosmetics: Align codec declarations
cosmetics: Convert mimic.c to utf-8
avconv: remove an unused function parameter.
avconv: remove now pointless variables.
avconv: drop support for building without libavfilter.
nellymoserenc: fix crash due to memsetting the wrong area.
libavformat: Only require first packet to be known for audio/video streams
avplay: Don't try to scale timestamps if the tb isn't set
Conflicts:
Changelog
configure
ffmpeg.c
libavcodec/aacenc.c
libavcodec/bmpenc.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/ffv1.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/libopenjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/pamenc.c
libavcodec/pgssubdec.c
libavcodec/pngenc.c
libavcodec/qtrleenc.c
libavcodec/rawdec.c
libavcodec/sgienc.c
libavcodec/tiffenc.c
libavcodec/v210dec.c
libavcodec/wmv2dec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 43e9d324a6..55e6b17335 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2315,20 +2315,22 @@ static const AVClass mpeg4_vdpau_class = { }; AVCodec ff_mpeg4_decoder = { - .name = "mpeg4", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG4, - .priv_data_size = sizeof(MpegEncContext), - .init = decode_init, - .close = ff_h263_decode_end, - .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, - .flush= ff_mpeg_flush, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), - .pix_fmts= ff_hwaccel_pixfmt_list_420, - .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), - .update_thread_context= ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), + .name = "mpeg4", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MPEG4, + .priv_data_size = sizeof(MpegEncContext), + .init = decode_init, + .close = ff_h263_decode_end, + .decode = ff_h263_decode_frame, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_FRAME_THREADS, + .flush = ff_mpeg_flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + .pix_fmts = ff_hwaccel_pixfmt_list_420, + .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), + .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), .priv_class = &mpeg4_class, }; @@ -2342,9 +2344,11 @@ AVCodec ff_mpeg4_vdpau_decoder = { .init = decode_init, .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_VDPAU_MPEG4, PIX_FMT_NONE}, - .priv_class = &mpeg4_vdpau_class, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_HWACCEL_VDPAU, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_VDPAU_MPEG4, + PIX_FMT_NONE }, + .priv_class = &mpeg4_vdpau_class, }; #endif |