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/loco.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/loco.c')
| -rw-r--r-- | libavcodec/loco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/loco.c b/libavcodec/loco.c index eaf7e81cd4..cdabd4175c 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -299,5 +299,5 @@ AVCodec ff_loco_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LOCO"), + .long_name = NULL_IF_CONFIG_SMALL("LOCO"), }; |