[FFmpeg-cvslog] Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 13:25:09 2016 +0200| [a826ffb829548b4b177c3b7bc401b0a124b7ecc0] | committer: Clément Bœsch

Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'

* commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720':
  mmaldec: print the MMAL format FourCC automatically

This commit is a noop, see d27a12cb0982921e503e68692bb99b6dfe1a6144

Merged-by: Clément Bœsch <clement at stupeflix.com>

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