Merge commit 'f290e48d86e10f34b5ddc519127636bcebec7c43'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:07:33 +0000 (11:07 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 26 Sep 2015 09:07:33 +0000 (11:07 +0200)
commitc5a312dd6afb9aded1f8f763be71ef70d69c7e17
treeb79f438a9761c9a210d8142487ea4a2de4723e2b
parent0f98fd30e2d3c7254a1c56ce42a9a8bf0f6dc0eb
parentf290e48d86e10f34b5ddc519127636bcebec7c43
Merge commit 'f290e48d86e10f34b5ddc519127636bcebec7c43'

* commit 'f290e48d86e10f34b5ddc519127636bcebec7c43':
  mmal: drop the h264 BSF

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