mpegvideo: Drop mpegvideo.h where not needed

Add necessary headers in .c files.

11 files changed, 8 insertions, 7 deletions

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 51b8878501..a455a34bd0 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -31,7 +31,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 d4ac98d078..6a7dd53310 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 7155123b5d..30aec8b93c 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -47,7 +47,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 99a0787be6..62308b403e 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 1ab8e56964..4b24ca6292 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 <unistd.h>
 #include <xvid.h>
 
 #include "libavutil/cpu.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"
 
 /**
  * Buffer management macros.
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 4e02e3c906..41dba89b7b 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 83b83d02ad..39395e2ea9 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -30,7 +30,6 @@
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "idctdsp.h"
-#include "mpegvideo.h"
 #include "mpeg12.h"
 #include "thread.h"
 
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index aa90793952..d00be2fc98 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -22,6 +22,7 @@
  */
 
 #include "h264.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 
 /**
diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
index d0fa7ae917..5e2a6ca631 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 d41a14a790..7d0e205932 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 49d5f07e43..1b9053c79b 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)