aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-06-12 19:12:05 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-06-15 12:29:25 +0100
commit07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0 (patch)
treef6c7827ec33e2aaa038cf24c6c9450e4ecd2fe3b /libavformat
parent74ea1167d91ccb2e1f2943efa030f2c278b598be (diff)
downloadffmpeg-07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0.tar.gz
riff: Add MNM4 FourCC as 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 6e77453b86..e1f76b2660 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -110,6 +110,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') },