Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'

* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

11 files changed, 8 insertions, 7 deletions

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 8f5d58d..70ac6f8 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -32,7 +32,6 @@
 #include "cavs.h"
 #include "internal.h"
 #include "mpeg12data.h"
-#include "mpegvideo.h"
 
 static const uint8_t mv_scan[4] = {
     MV_FWD_X0, MV_FWD_X1,
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index f31c5e2..42c4484 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -27,7 +27,6 @@
 #include "libavutil/time.h"
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "dxva2_internal.h"
 
 void *ff_dxva2_get_surface(const AVFrame *frame)
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index 6c9d0bb..c2499e5 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -48,7 +48,6 @@
 #endif
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 typedef void DECODER_BUFFER_DESC;
 
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c
index 89c43e7..64fa196 100644
--- a/libavcodec/dxva2_mpeg2.c
+++ b/libavcodec/dxva2_mpeg2.c
@@ -23,6 +23,7 @@
 #include "libavutil/log.h"
 #include "dxva2_internal.h"
 #include "mpegutils.h"
+#include "mpegvideo.h"
 
 #define MAX_SLICES 1024
 struct dxva2_picture_context {
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 785c4db..15b31c5 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -25,18 +25,21 @@
  * @author Adam Thayer (krevnik@comcast.net)
  */
 
+#include <stdio.h>
+#include <string.h>
 #include <xvid.h>
 
 #include "libavutil/cpu.h"
 #include "libavutil/file.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "internal.h"
 #include "libxvid.h"
 #include "mpegutils.h"
-#include "mpegvideo.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 5e478a3..7f2dd60 100644
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -39,7 +39,6 @@
 #include "internal.h"
 #include "jpegtables.h"
 #include "mjpegenc_common.h"
-#include "mpegvideo.h"
 #include "mjpeg.h"
 #include "mjpegenc.h"
 
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index ee96614..a9b7e82 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -31,7 +31,6 @@
 #include "blockdsp.h"
 #include "bswapdsp.h"
 #include "idctdsp.h"
-#include "mpegvideo.h"
 #include "mpeg12.h"
 #include "thread.h"
 
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index c081bb5..a1ea790 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -22,6 +22,7 @@
  */
 
 #include "libavutil/log.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 
 /**
diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
index 29f46ab..0ba9868 100644
--- a/libavcodec/vaapi_internal.h
+++ b/libavcodec/vaapi_internal.h
@@ -27,7 +27,6 @@
 #include <va/va.h>
 #include "vaapi.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 /**
  * @addtogroup VAAPI_Decoding
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index a3deab1..518fec0 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -21,6 +21,7 @@
  */
 
 #include "mpegutils.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 #include "internal.h"
 
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 426bef2..b5b946d 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "h263.h"
 #include "mpeg4video.h"
+#include "mpegvideo.h"
 
 /** Reconstruct bitstream intra_dc_vlc_thr */
 static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s)