Merge commit '49e531ff4706279c7eed774f2c8b896942924ce2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Apr 2015 11:40:36 +0000 (13:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Apr 2015 11:40:58 +0000 (13:40 +0200)
* commit '49e531ff4706279c7eed774f2c8b896942924ce2':
  mmal: Reference MMAL VC lib explicitly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mmaldec.c

Simple merge