diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 00:41:37 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 00:41:37 +0400 |
| commit | 6101e5322f083a806fd92a6261ff3197fdd0f5e7 (patch) | |
| tree | 8b869bff6c1db61b3aa3bbabcbe322fee9f3dcf0 /libavcodec/ffv1.c | |
| parent | 5012c07336eff0e928afb57c6d38271e316c0a6c (diff) | |
| parent | d293e3464db647e72fffad50a678eca89546b65f (diff) | |
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/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index c9ea822668..0d63dd8bf7 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1851,8 +1851,9 @@ AVCodec ff_ffv1_decoder = { .init = decode_init, .close = common_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | CODEC_CAP_SLICE_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | + CODEC_CAP_SLICE_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; #if CONFIG_FFV1_ENCODER @@ -1864,8 +1865,8 @@ AVCodec ff_ffv1_encoder = { .init = encode_init, .encode2 = encode_frame, .close = common_end, - .capabilities = CODEC_CAP_SLICE_THREADS, + .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUVA420P, PIX_FMT_YUV444P, PIX_FMT_YUVA444P, PIX_FMT_YUV440P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV444P9, PIX_FMT_YUV422P9, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10, PIX_FMT_GRAY16, PIX_FMT_GRAY8, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; #endif |