aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBen Littler <tempn@twmi.rr.com>2010-01-17 19:25:49 +0000
committerBen Littler <tempn@twmi.rr.com>2010-01-17 19:25:49 +0000
commit6667d5a5e54bd560e23553b658601a4b4f6f86c9 (patch)
tree234c4049074fc854cb126f922d67058736b91288 /libavformat
parentaa692d547b81e0c377eba8fde4a1f0360336477f (diff)
downloadffmpeg-6667d5a5e54bd560e23553b658601a4b4f6f86c9.tar.gz
add vspx fourcc to mpeg4 in riff.c
Originally committed as revision 21269 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 23ecee5682..6a9dea64e2 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -77,6 +77,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
{ CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */
{ CODEC_ID_MPEG4, MKTAG('S', 'N', '4', '0') },
+ { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') },
{ CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },