aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-17 15:49:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-17 22:18:55 +0200
commit6e4b9b8a2fb52f0deee3f420d553b903532a0444 (patch)
treecf0e30c5483a15556d38e344987c7f7ac30f7a13 /libavcodec
parenta0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7 (diff)
downloadffmpeg-6e4b9b8a2fb52f0deee3f420d553b903532a0444.tar.gz
avcodec: fix compilation without vdpau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vdpau_internal.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 47b6a92c18..7fdfda0457 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -25,10 +25,12 @@
#define AVCODEC_VDPAU_INTERNAL_H
#include <stdint.h>
+#if CONFIG_VDPAU
#include <vdpau/vdpau.h>
+#include "vdpau.h"
+#endif
#include "h264.h"
#include "mpegvideo.h"
-#include "vdpau.h"
/** Extract VdpVideoSurface from a Picture */
static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
@@ -36,6 +38,7 @@ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
return (uintptr_t)pic->f.data[3];
}
+#if CONFIG_VDPAU
#if !FF_API_BUFS_VDPAU
union AVVDPAUPictureInfo {
VdpPictureInfoH264 h264;
@@ -66,6 +69,7 @@ struct vdpau_picture_context {
*/
VdpBitstreamBuffer *bitstream_buffers;
};
+#endif
int ff_vdpau_common_start_frame(Picture *pic,
const uint8_t *buffer, uint32_t size);