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	39	#include "mpeg12data.h"
40	40	#include "mpegvideodata.h"
41	41	#include "bytestream.h"
42		−#include "vdpau_internal.h"
43	42	#include "thread.h"
44	43
45	44	uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];

@@ -24,15 +24,13 @@ · 23 unmodified lines
24	24	#ifndef AVCODEC_VDPAU_INTERNAL_H
25	25	#define AVCODEC_VDPAU_INTERNAL_H
26	26
27		−#include "config.h"
28	27	#include <stdint.h>
29		−#if CONFIG_VDPAU
30	28	#include <vdpau/vdpau.h>
31		−#endif
32	29
33	30	#include "libavutil/frame.h"
34	31
35	32	#include "avcodec.h"
	33	+#include "vdpau.h"
36	34
37	35	/** Extract VdpVideoSurface from an AVFrame */
38	36	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) · 1 unmodified line
40	38	return (uintptr_t)pic->data[3];
41	39	}
42	40
43		−struct vdpau_picture_context;
44		−#if CONFIG_VDPAU
45	41	union VDPAUPictureInfo {
46	42	VdpPictureInfoH264 h264;
47	43	VdpPictureInfoMPEG1Or2 mpeg;
@@ -55,8 +51,6 @@ union VDPAUPictureInfo { · 7 unmodified lines
55	51	#endif
56	52	};
57	53
58		−#include "vdpau.h"
59		−
60	54	typedef struct VDPAUHWContext {
61	55	AVVDPAUContext context;
62	56	VdpDevice device;
@@ -114,8 +108,6 @@ struct vdpau_picture_context { · 51 unmodified lines
114	108
115	109	int ff_vdpau_common_init(AVCodecContext *avctx, VdpDecoderProfile profile,
116	110	int level);
117		−#endif //CONFIG_VDPAU
118		−
119	111	int ff_vdpau_common_uninit(AVCodecContext *avctx);
120	112
121	113	int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,

Keyboard shortcuts