Merge commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:07:44 +0000 (11:07 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:07:44 +0000 (11:07 +0200)
* commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff':
  mmal: Remove setting extradata on input format

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/mmaldec.c

Simple merge