diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:17:11 +0200 |
| commit | 861dec5e90254818636a20188f2844222962bfdf (patch) | |
| tree | d57ed3c92f784532f364c3db60d76ca09a9425e7 | |
| parent | 9c56cf09ca6da8b89c3155dc50f75232571d0be7 (diff) | |
| parent | b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3 (diff) | |
| download | ffmpeg-861dec5e90254818636a20188f2844222962bfdf.tar.gz | |
Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'
* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
riff: Add GMP4 fourcc for mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 3db0dbb738..b506b94425 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -111,6 +111,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') }, |