Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:25:09 +0000 (13:25 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:25:09 +0000 (13:25 +0200)
commita826ffb829548b4b177c3b7bc401b0a124b7ecc0
treec7935a49e278d54c782d394617f40808791fae05
parent7f2626ccda41a850cd1d3b5fa688e9369a75c418
parent45a954f5aa35161a741fffd6c8bb92e9f91a1720
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@stupeflix.com>