[FFmpeg-cvslog] Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 24 21:16:08 2015 +0200| [861dec5e90254818636a20188f2844222962bfdf] | committer: Michael Niedermayer

Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=861dec5e90254818636a20188f2844222962bfdf
---