aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorChristian Schmidt <schmidt@digadd.de>2010-04-22 08:57:28 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-04-22 08:57:28 +0000
commit03cb8458cec01cfbb5c868753d7329ec15449a7c (patch)
treedb46250ff2fc81fbb8cadc6cc5cc1cdf908525bb /libavformat
parent9b157b0ccd259f4b9f3f0066e75cb7b5e94ab525 (diff)
downloadffmpeg-03cb8458cec01cfbb5c868753d7329ec15449a7c.tar.gz
Support VP6F in Matroska.
Patch by Christian Schmidt, schmidt digadd de Originally committed as revision 22941 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 12a7ce711b..41c4ab01e2 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -180,6 +180,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') },
{ CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') },
{ CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') },
+ { CODEC_ID_VP6F, MKTAG('F', 'L', 'V', '4') },
{ CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') },
{ CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') },
{ CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },