git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74ea116
)
riff: Add MNM4 FourCC as mpeg4
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Fri, 12 Jun 2015 18:12:05 +0000
(19:12 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 15 Jun 2015 11:29:25 +0000
(12:29 +0100)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
6e77453
..
e1f76b2
100644
(file)
--- 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') },