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)
commitc5fc48fdfb7636e62681d75a33d1a27abcb90a67
treebea75bb1cb28e34a35297b7108166c4cb9233a1a
parent8ce321f0aaa96226c9294481403e7dc0f10c002e
parent07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
  riff: Add MNM4 FourCC as mpeg4

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