avcodec/vdpau: clean up vdpau_internal.h

Also don't include it on files that don't need it. This reduces differences with libav

James Almer committed 10 years ago

Commit be63ef31 parent 376d4b33 files · +1 −11Browse files

Unified · Split

3 files

@@ -39,7 +39,6 @@ · 38 unmodified lines
39	#include "mpeg12data.h"	39	#include "mpeg12data.h"
40	#include "mpegvideodata.h"	40	#include "mpegvideodata.h"
41	#include "bytestream.h"	41	#include "bytestream.h"
42	#include "vdpau_internal.h"
43	#include "thread.h"	42	#include "thread.h"
44		43
45	uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];	44	uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

 #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)
     return (uintptr_t)pic->data[3];
 }
-struct vdpau_picture_context;
-#if CONFIG_VDPAU
 union VDPAUPictureInfo {
     VdpPictureInfoH264        h264;
     VdpPictureInfoMPEG1Or2    mpeg;
 #endif
 };
-#include "vdpau.h"
 typedef struct VDPAUHWContext {
     AVVDPAUContext context;
     VdpDevice device;
 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,

Keyboard shortcuts