summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2009-02-19 23:09:24 +0000
committerAlex Converse <alex.converse@gmail.com>2009-02-19 23:09:24 +0000
commit528374980e1109f220a7a43f296fddb80eb63d0d (patch)
treec086d96fda106edb44da096b78013ebabe29e347 /libavformat/riff.c
parentd42e44a0ef208b3d9d86199eb24366656c9c0898 (diff)
Add Divio MPEG-4 FOURCC (M4CC)
Originally committed as revision 17465 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index dfdc0fd6f0..e1745a2647 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -73,6 +73,7 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') },
{ CODEC_ID_MPEG4, MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */
{ CODEC_ID_MPEG4, MKTAG('E', 'M', '4', 'A') },
+ { CODEC_ID_MPEG4, MKTAG('M', '4', 'C', 'C') }, /* Divio MPEG-4 */
{ 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') },