summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-25 00:35:59 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-25 00:44:48 +0200
commit69cf1824c6001ccc37d9ece5308c9a8f8d1dec26 (patch)
treeb4321e24cfb338bb02e7f7b6ba201a003403a6f7 /libavformat
parenta8117a62f41c53eafde94bd84415a3f552824dcd (diff)
Support fourcc XVIX.
Fixes ticket #106.
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 80a1b719ec..3950a06c26 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -84,6 +84,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') },
{ CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') },
{ CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
+ { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },