From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Dec 2008 16:49:58 +0000 (+0000)
Subject: add GEOX fourcc for mpeg4
X-Git-Tag: android-x86-4.4-r1~29431
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8cf645bd27f473c00ef3f864f3d492c64fda62c;p=android-x86%2Fexternal-ffmpeg.git

add GEOX fourcc for mpeg4

Originally committed as revision 15992 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0c9c274bf0..52eb91d9cf 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -54,6 +54,7 @@ const AVCodecTag codec_bmp_tags[] = {
     { CODEC_ID_MPEG4,        MKTAG('R', 'M', 'P', '4') },
     { CODEC_ID_MPEG4,        MKTAG('3', 'I', 'V', '2') },
     { CODEC_ID_MPEG4,        MKTAG('F', 'F', 'D', 'S') },
+    { CODEC_ID_MPEG4,        MKTAG('G', 'E', 'O', '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') },