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)
commit8f20e3d4dfe5d54e36113e679bd1350e4550bc4d
treeb6f12b74cfb5d2a136ea71b61e0b36e52e47c933
parent41e7e46cac507e993af6d656c8d3672ba3f9e304
parentdc0c70e018f6b04488333e7e26ec26359e614e4e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

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