Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:56:41 +0000 (20:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:09:03 +0000 (21:09 +0200)
* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
  riff: Add GLV4 fourcc for mpeg4

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

Simple merge