Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'

* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82': riff: Add GLV4 fourcc for mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 9c56cf09ca
parent 036162a378 3c04ec04df
commit 9c56cf09ca
1 changed files with 1 additions and 0 deletions
--- 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') },