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/libx264.c | |
parent | 5012c07336eff0e928afb57c6d38271e316c0a6c (diff) | |
parent | d293e3464db647e72fffad50a678eca89546b65f (diff) | |
download | ffmpeg-streaming-6101e5322f083a806fd92a6261ff3197fdd0f5e7.zip ffmpeg-streaming-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/libx264.c')
-rw-r--r-- | libavcodec/libx264.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d8200d3..d56dfe7 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -638,17 +638,17 @@ static const AVCodecDefault x264_defaults[] = { }; AVCodec ff_libx264_encoder = { - .name = "libx264", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_H264, - .priv_data_size = sizeof(X264Context), - .init = X264_init, - .encode2 = X264_frame, - .close = X264_close, - .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .priv_class = &class, - .defaults = x264_defaults, + .name = "libx264", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_H264, + .priv_data_size = sizeof(X264Context), + .init = X264_init, + .encode2 = X264_frame, + .close = X264_close, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + .priv_class = &class, + .defaults = x264_defaults, .init_static_data = X264_init_static, }; |