On 2013-03-26 23:24:55 +0100, Diego Biurrun wrote: > On Tue, Mar 26, 2013 at 10:53:41PM +0100, Janne Grunau wrote: > > Fixes linking when only a subset of the deprecated vdpau decoders is > > enabled. > > --- > > libavcodec/vdpau.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > BTW, are they officially deprecated in some way? > > > --- a/libavcodec/vdpau.c > > +++ b/libavcodec/vdpau.c > > @@ -48,6 +48,9 @@ int ff_vdpau_common_start_frame(AVCodecContext *avctx, > > > > +#if (CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG1_VDPAU_HWACCEL || \ > > + CONFIG_MPEG2_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL || \ > > + CONFIG_VC1_VDPAU_HWACCEL || CONFIG_WMV3_VDPAU_HWACCEL) > > pointless () > > > @@ -230,7 +235,9 @@ void ff_vdpau_h264_picture_complete(H264Context *h) > > > > +#if (CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) > > same > > > @@ -287,7 +294,9 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, > > const uint8_t *buf, > > ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); > > render->bitstream_buffers_used = 0; > > } > > +#endif /* (CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) */ > > same > > While the patch is not exactly pretty, I don't see a better way, so > probably OK.
will push with the pointless () removed Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
