Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'

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

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

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,

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)

libavcodec/dxva2_internal.h

@@ -48,7 +48,6 @@
 #endif
 
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 typedef void DECODER_BUFFER_DESC;
 

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 {

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>

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"
 

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"
 

libavcodec/vaapi.c

@@ -22,6 +22,7 @@
  */
 
 #include "libavutil/log.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 
 /**

libavcodec/vaapi_internal.h

@@ -27,7 +27,6 @@
 #include <va/va.h>
 #include "vaapi.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 
 /**
  * @addtogroup VAAPI_Decoding

libavcodec/vaapi_mpeg2.c

@@ -21,6 +21,7 @@
  */
 
 #include "mpegutils.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 #include "internal.h"
 

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)