Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/64/head
Michael Niedermayer 11 years ago
commit 8f20e3d4df
  1. 2
      libavcodec/ac3tab.c
  2. 1
      libavcodec/h261data.c
  3. 4
      libavcodec/mjpeg2jpeg_bsf.c

@ -25,6 +25,8 @@
*/
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "avcodec.h"
#include "ac3tab.h"

@ -26,6 +26,7 @@
#include <stdint.h>
#include "mpegutils.h"
#include "rl.h"
#include "h261.h"

@ -25,6 +25,10 @@
*/
#include <string.h>
#include "libavutil/error.h"
#include "libavutil/mem.h"
#include "avcodec.h"
#include "mjpeg.h"

Loading…
Cancel
Save