Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:16:08 +0000 (21:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:17:11 +0000 (21:17 +0200)
* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
  riff: Add GMP4 fourcc for mpeg4

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

Simple merge