aboutsummaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorMichael Niedermayer2008-12-03 16:49:58 +0000
committerMichael Niedermayer2008-12-03 16:49:58 +0000
commitb8cf645bd27f473c00ef3f864f3d492c64fda62c (patch)
tree70be5aad460851b776cacb38a5420328964146f4 /libavformat/riff.c
parentbad406374038d9edef171a3ff4cfb54464edbc10 (diff)
add GEOX fourcc for mpeg4
Originally committed as revision 15992 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 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') },