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)
* commit 'f290e48d86e10f34b5ddc519127636bcebec7c43':
  mmal: drop the h264 BSF

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

Simple merge