summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-04-23 13:25:20 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-04-24 14:55:10 +0100
commitb17cbb0b1c4fdf8324eff24d40a02201bfaebfd3 (patch)
treec061d765b78c6791945cd81d95168f3380ba373c /libavformat
parent3c04ec04df8cba12f3a7408709ff5c1fddfe8d82 (diff)
downloadffmpeg-b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3.tar.gz
riff: Add GMP4 fourcc for mpeg4
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 d947107489..54c5eb2a00 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -109,6 +109,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG4, MKTAG('Q', 'M', 'P', '4') }, /* QNAP Systems */
{ AV_CODEC_ID_MPEG4, MKTAG('P', 'L', 'V', '1') }, /* Pelco DVR MPEG-4 */
{ AV_CODEC_ID_MPEG4, MKTAG('G', 'L', 'V', '4') },
+ { AV_CODEC_ID_MPEG4, MKTAG('G', 'M', 'P', '4') }, /* GeoVision camera */
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
{ AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },