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)
commit861dec5e90254818636a20188f2844222962bfdf
treed57ed3c92f784532f364c3db60d76ca09a9425e7
parent9c56cf09ca6da8b89c3155dc50f75232571d0be7
parentb17cbb0b1c4fdf8324eff24d40a02201bfaebfd3
Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'

* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3':
  riff: Add GMP4 fourcc for mpeg4

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