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)
commitf3310df8538d201e8623ffbcf7f4fee0bec94f83
tree9c2b0c0b1f21965909288e68011499bed9ffee0d
parentc5a312dd6afb9aded1f8f763be71ef70d69c7e17
parent49623f531972be5dc2dd8c1b4b8748cad7c424ff
Merge commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff'

* commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff':
  mmal: Remove setting extradata on input format

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