Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0': riff: Add MNM4 FourCC as mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · c5fc48fdfb
parent 8ce321f0aa 07b2db81d0
commit c5fc48fdfb
1 changed files with 1 additions and 0 deletions
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@ -112,6 +112,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
    { 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_MPEG4,        MKTAG('M', 'N', 'M', '4') }, /* March Networks DVR */
    { 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') },