Commit c5fc48fd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '07b2db81'

* commit '07b2db81':
  riff: Add MNM4 FourCC as mpeg4
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8ce321f0 07b2db81
......@@ -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') },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment