[FFmpeg-cvslog] avcodec: fix compilation without vdpau

Michael Niedermayer git at videolan.org
Sat Aug 17 22:28:51 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 17 15:49:59 2013 +0200| [6e4b9b8a2fb52f0deee3f420d553b903532a0444] | committer: Michael Niedermayer

avcodec: fix compilation without vdpau

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e4b9b8a2fb52f0deee3f420d553b903532a0444
---

 libavcodec/vdpau_internal.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 47b6a92..7fdfda0 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);



More information about the ffmpeg-cvslog mailing list