diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:09:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:18:13 +0200 |
| commit | c5fc48fdfb7636e62681d75a33d1a27abcb90a67 (patch) | |
| tree | bea75bb1cb28e34a35297b7108166c4cb9233a1a /libavformat | |
| parent | 8ce321f0aaa96226c9294481403e7dc0f10c002e (diff) | |
| parent | 07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0 (diff) | |
| download | ffmpeg-c5fc48fdfb7636e62681d75a33d1a27abcb90a67.tar.gz | |
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
riff: Add MNM4 FourCC as mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 8e4e3e464c..ddfa829251 100644 --- 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') }, |