Commit 52ce8b7b authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'e60a6e75'

* commit 'e60a6e75':
  mpegvideo: Drop mpegvideo.h where not needed
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 7b865c22 e60a6e75
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "cavs.h" #include "cavs.h"
#include "internal.h" #include "internal.h"
#include "mpeg12data.h" #include "mpeg12data.h"
#include "mpegvideo.h"
static const uint8_t mv_scan[4] = { static const uint8_t mv_scan[4] = {
MV_FWD_X0, MV_FWD_X1, MV_FWD_X0, MV_FWD_X1,
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "libavutil/time.h" #include "libavutil/time.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
#include "dxva2_internal.h" #include "dxva2_internal.h"
void *ff_dxva2_get_surface(const AVFrame *frame) void *ff_dxva2_get_surface(const AVFrame *frame)
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#endif #endif
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
typedef void DECODER_BUFFER_DESC; typedef void DECODER_BUFFER_DESC;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "libavutil/log.h" #include "libavutil/log.h"
#include "dxva2_internal.h" #include "dxva2_internal.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h"
#define MAX_SLICES 1024 #define MAX_SLICES 1024
struct dxva2_picture_context { struct dxva2_picture_context {
......
...@@ -25,18 +25,21 @@ ...@@ -25,18 +25,21 @@
* @author Adam Thayer (krevnik@comcast.net) * @author Adam Thayer (krevnik@comcast.net)
*/ */
#include <stdio.h>
#include <string.h>
#include <xvid.h> #include <xvid.h>
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/file.h" #include "libavutil/file.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "libxvid.h" #include "libxvid.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h"
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "internal.h" #include "internal.h"
#include "jpegtables.h" #include "jpegtables.h"
#include "mjpegenc_common.h" #include "mjpegenc_common.h"
#include "mpegvideo.h"
#include "mjpeg.h" #include "mjpeg.h"
#include "mjpegenc.h" #include "mjpegenc.h"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "blockdsp.h" #include "blockdsp.h"
#include "bswapdsp.h" #include "bswapdsp.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "mpegvideo.h"
#include "mpeg12.h" #include "mpeg12.h"
#include "thread.h" #include "thread.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
*/ */
#include "libavutil/log.h" #include "libavutil/log.h"
#include "mpegvideo.h"
#include "vaapi_internal.h" #include "vaapi_internal.h"
/** /**
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <va/va.h> #include <va/va.h>
#include "vaapi.h" #include "vaapi.h"
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h"
/** /**
* @addtogroup VAAPI_Decoding * @addtogroup VAAPI_Decoding
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h"
#include "vaapi_internal.h" #include "vaapi_internal.h"
#include "internal.h" #include "internal.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "internal.h" #include "internal.h"
#include "h263.h" #include "h263.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpegvideo.h"
/** Reconstruct bitstream intra_dc_vlc_thr */ /** Reconstruct bitstream intra_dc_vlc_thr */
static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s) static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment