aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vmdav.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-07 22:41:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-07 22:41:37 +0200
commit6101e5322f083a806fd92a6261ff3197fdd0f5e7 (patch)
tree8b869bff6c1db61b3aa3bbabcbe322fee9f3dcf0 /libavcodec/vmdav.c
parent5012c07336eff0e928afb57c6d38271e316c0a6c (diff)
parentd293e3464db647e72fffad50a678eca89546b65f (diff)
downloadffmpeg-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/vmdav.c')
-rw-r--r--libavcodec/vmdav.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 8cec24bf5d..f7c6c19b49 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -651,7 +651,7 @@ AVCodec ff_vmdvideo_decoder = {
.close = vmdvideo_decode_end,
.decode = vmdvideo_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
};
AVCodec ff_vmdaudio_decoder = {
@@ -662,5 +662,5 @@ AVCodec ff_vmdaudio_decoder = {
.init = vmdaudio_decode_init,
.decode = vmdaudio_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
};