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>
libavcodec/ac3tab.c
libavcodec/h261data.c
libavcodec/mjpeg2jpeg_bsf.c

index 1ae7ddf..d62d8bf 100644 (file)
@@ -25,6 +25,8 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
+
 #include "avcodec.h"
 #include "ac3tab.h"
 
index 0d1f305..a9891ed 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 
+#include "mpegutils.h"
 #include "rl.h"
 #include "h261.h"
 
index f367288..6adeaf0 100644 (file)
  */
 
 #include <string.h>
+
+#include "libavutil/error.h"
+#include "libavutil/mem.h"
+
 #include "avcodec.h"
 #include "mjpeg.h"