har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vdpau: clean up vdpau_internal.h

Browse Source 
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>
This commit is contained in:
James Almer 2016-08-03 01:20:52 -03:00
parent 376d4b3c0d
commit be63ef3c4e
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpeg12.c
View File

@ -39,7 +39,6 @@
#include "mpeg12data.h" #include "mpeg12data.h"
#include "mpegvideodata.h" #include "mpegvideodata.h"
#include "bytestream.h" #include "bytestream.h"
#include "vdpau_internal.h"
#include "thread.h" #include "thread.h"
uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

1
libavcodec/svq3.c
View File

@ -53,7 +53,6 @@
#include "mathops.h" #include "mathops.h"
#include "rectangle.h" #include "rectangle.h"
#include "tpeldsp.h" #include "tpeldsp.h"
#include "vdpau_internal.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>

10
libavcodec/vdpau_internal.h
View File

@ -24,15 +24,13 @@
#ifndef AVCODEC_VDPAU_INTERNAL_H #ifndef AVCODEC_VDPAU_INTERNAL_H
#define AVCODEC_VDPAU_INTERNAL_H #define AVCODEC_VDPAU_INTERNAL_H
#include "config.h"
#include <stdint.h> #include <stdint.h>
#if CONFIG_VDPAU
#include <vdpau/vdpau.h> #include <vdpau/vdpau.h>
#endif
#include "libavutil/frame.h" #include "libavutil/frame.h"
#include "avcodec.h" #include "avcodec.h"
#include "vdpau.h"
/** Extract VdpVideoSurface from an AVFrame */ /** Extract VdpVideoSurface from an AVFrame */
static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic) 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]; return (uintptr_t)pic->data[3];
} }
struct vdpau_picture_context;
#if CONFIG_VDPAU
union VDPAUPictureInfo { union VDPAUPictureInfo {
VdpPictureInfoH264 h264; VdpPictureInfoH264 h264;
VdpPictureInfoMPEG1Or2 mpeg; VdpPictureInfoMPEG1Or2 mpeg;
@ -55,8 +51,6 @@ union VDPAUPictureInfo {
#endif #endif
}; };
#include "vdpau.h"
typedef struct VDPAUHWContext { typedef struct VDPAUHWContext {
AVVDPAUContext context; AVVDPAUContext context;
VdpDevice device; VdpDevice device;
@ -114,8 +108,6 @@ struct vdpau_picture_context {
int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile, int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
int level); int level);
#endif //CONFIG_VDPAU
int ff_vdpau_common_uninit(AVCodecContext *avctx); int ff_vdpau_common_uninit(AVCodecContext *avctx);
int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic, int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,