diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 20:56:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:09:03 +0200 |
| commit | 9c56cf09ca6da8b89c3155dc50f75232571d0be7 (patch) | |
| tree | b897989c7828519f0f30613ad71c88dbda070830 /libavformat/riff.c | |
| parent | 036162a3787044cd82b6fa4e73eb56ddf2e57c96 (diff) | |
| parent | 3c04ec04df8cba12f3a7408709ff5c1fddfe8d82 (diff) | |
Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'
* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
riff: Add GLV4 fourcc for mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -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 71c04d225d..3db0dbb738 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -110,6 +110,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') }, { 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_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, { AV_CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, |