Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:38:43 +0000 (19:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:39:00 +0000 (19:39 +0100)
* qatar/master:
  avcodec: add missing includes

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

Simple merge
Simple merge
Simple merge