Ticket #6204: vdpau_fix.diff

libs/libavcodec/h264.c

@@ -72 +72 @@
 static VLC_TYPE run7_vlc_table[96][2];
 static const int run7_vlc_table_size = 96;
 
-extern int VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size);
-extern int VDPAU_h264_picture_complete(H264Context *h);
+#ifdef HAVE_VDPAU
+   extern int VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size);
+   extern int VDPAU_h264_picture_complete(H264Context *h);
+#endif
 
 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);

libs/libavcodec/mpeg12.c

@@ -84 +84 @@
 extern void DVDV_decode_mb(MpegEncContext *s);
 #endif
 
-extern int VDPAU_mpeg_field_start(MpegEncContext *s);
-extern void VDPAU_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, int buf_size, int slice_count);
+#ifdef HAVE_VDPAU
+   extern int VDPAU_mpeg_field_start(MpegEncContext *s);
+   extern void VDPAU_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, int buf_size, int slice_count);
+#endif
 
 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,

libs/libavcodec/mpegvideo.c

@@ -58 +58 @@
 extern void XVMC_field_end(MpegEncContext *s);
 extern void XVMC_decode_mb(MpegEncContext *s);
 
-extern int VDPAU_mpeg_field_start(MpegEncContext *s);
+#ifdef HAVE_VDPAU
+   extern int VDPAU_mpeg_field_start(MpegEncContext *s);
+#endif
 
 /* enable all paranoid tests for rounding, overflows, etc... */
 //#define PARANOID

libs/libavcodec/vc1.c

@@ -42 +42 @@
 #define DC_VLC_BITS 9
 #define AC_VLC_BITS 9
 
-extern int VDPAU_vc1_decode_picture(MpegEncContext *s, AVCodecContext *avctx, VC1Context *v, const uint8_t *buf, int buf_size);
+#ifdef HAVE_VDPAU
+   extern int VDPAU_vc1_decode_picture(MpegEncContext *s, AVCodecContext *avctx, VC1Context *v, const uint8_t *buf, int buf_size);
+#endif
 
 static const uint16_t table_mb_intra[64][2];