From be63ef3c4e6399a3ef8d22cc25e9cb3575cf74ae Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Wed, 3 Aug 2016 01:20:52 -0300
Subject: [PATCH] avcodec/vdpau: clean up vdpau_internal.h
Also don't include it on files that don't need it.
This reduces differences with libav
Tested-by: Timothy Gu <timothygu99@gmail.com>
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/mpeg12.c | 1 -
libavcodec/svq3.c | 1 -
libavcodec/vdpau_internal.h | 10 +---------
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 7c140529ec8..a61d45b39a9 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -39,7 +39,6 @@
#include "mpeg12data.h"
#include "mpegvideodata.h"
#include "bytestream.h"
-#include "vdpau_internal.h"
#include "thread.h"
uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 223819f841e..bb4508cb2a5 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -53,7 +53,6 @@
#include "mathops.h"
#include "rectangle.h"
#include "tpeldsp.h"
-#include "vdpau_internal.h"
#if CONFIG_ZLIB
#include <zlib.h>
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 8a63733546b..77800af33fc 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -24,15 +24,13 @@
#ifndef AVCODEC_VDPAU_INTERNAL_H
#define AVCODEC_VDPAU_INTERNAL_H
-#include "config.h"
#include <stdint.h>
-#if CONFIG_VDPAU
#include <vdpau/vdpau.h>
-#endif
#include "libavutil/frame.h"
#include "avcodec.h"
+#include "vdpau.h"
/** Extract VdpVideoSurface from an AVFrame */
static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
@@ -40,8 +38,6 @@ static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)
return (uintptr_t)pic->data[3];
}
-struct vdpau_picture_context;
-#if CONFIG_VDPAU
union VDPAUPictureInfo {
VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg;
@@ -55,8 +51,6 @@ union VDPAUPictureInfo {
#endif
};
-#include "vdpau.h"
-
typedef struct VDPAUHWContext {
AVVDPAUContext context;
VdpDevice device;
@@ -114,8 +108,6 @@ struct vdpau_picture_context {
int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
int level);
-#endif //CONFIG_VDPAU
-
int ff_vdpau_common_uninit(AVCodecContext *avctx);
int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,
--
GitLab