From a383f226f02b969b72d6b286af21d0fcd38ca98a Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 17 Aug 2015 17:05:34 -0400 Subject: lavc: move vdpau decoders under FF_API_VDPAU. Signed-off-by: Ronald S. Bultje --- libavcodec/vdpau.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/vdpau.c') diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 62d9960..7cb8ad2 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -358,6 +358,7 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx, /* Obsolete non-hwaccel VDPAU support below... */ +#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU void ff_vdpau_h264_set_reference_frames(H264Context *h) { struct vdpau_render_state *render, *render_ref; @@ -443,7 +444,6 @@ void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size) render->bitstream_buffers_used++; } -#if CONFIG_H264_VDPAU_DECODER void ff_vdpau_h264_picture_start(H264Context *h) { struct vdpau_render_state *render; @@ -506,7 +506,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h) } #endif /* CONFIG_H264_VDPAU_DECODER */ -#if CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER +#if (CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) && FF_API_VDPAU void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, int buf_size, int slice_count) { @@ -565,7 +565,7 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, } #endif /* CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER */ -#if CONFIG_VC1_VDPAU_DECODER +#if CONFIG_VC1_VDPAU_DECODER && FF_API_VDPAU void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf, int buf_size) { @@ -636,7 +636,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf, } #endif /* (CONFIG_VC1_VDPAU_DECODER */ -#if CONFIG_MPEG4_VDPAU_DECODER +#if CONFIG_MPEG4_VDPAU_DECODER && FF_API_VDPAU void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *ctx, const uint8_t *buf, int buf_size) { -- cgit v1.1