Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 19:09:33 +0000 (21:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 19:18:13 +0000 (21:18 +0200)
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/riff.c

Simple merge