On Fri, Jan 11, 2013 at 11:28:03PM +0200, Rémi Denis-Courmont wrote:
>
> diff --git a/configure b/configure
> index c62ea2d..da13f00 100755
> --- a/configure
> +++ b/configure
> @@ -1623,9 +1623,11 @@ vc1_dxva2_hwaccel_deps="dxva2api_h"
> vc1_dxva2_hwaccel_select="dxva2 vc1_decoder"
> vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
> vc1_vdpau_decoder_select="vdpau vc1_decoder"
> +vc1_vdpau_hwaccel_select="vdpau vc1_decoder"
> wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
> wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
> wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
> +wmv3_vdpau_hwaccel_select="vdpau wmv3_decoder"
Our WMV3 decoder directly selects the VC-1 decoder and is not available
separately. I think it makes sense to have the same logic for the
hwaccels. So change this to
wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
Then you can ..
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -416,6 +417,7 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o
> wmv2.o \
> OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \
> msmpeg4.o msmpeg4enc.o
> msmpeg4data.o \
> mpeg4videodec.o ituh263dec.o
> h263dec.o
> +OBJS-$(CONFIG_WMV3_VDPAU_HWACCEL) += vdpau_vc1.o
> OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
> OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
.. drop this line and ..
> --- /dev/null
> +++ b/libavcodec/vdpau_vc1.c
> @@ -0,0 +1,127 @@
> +
> +#if CONFIG_WMV3_VDPAU_HWACCEL
> +AVHWAccel ff_wmv3_vdpau_hwaccel = {
> + .name = "wm3_vdpau",
> + .type = AVMEDIA_TYPE_VIDEO,
> + .id = AV_CODEC_ID_WMV3,
> + .pix_fmt = AV_PIX_FMT_VDPAU,
> + .start_frame = vdpau_vc1_start_frame,
> + .end_frame = ff_vdpau_common_end_frame,
> + .decode_slice = vdpau_vc1_decode_slice,
> +};
> +#endif
> +
> +#if CONFIG_VC1_VDPAU_HWACCEL
> +AVHWAccel ff_vc1_vdpau_hwaccel = {
> + .name = "vc1_vdpau",
> + .type = AVMEDIA_TYPE_VIDEO,
> + .id = AV_CODEC_ID_VC1,
> + .pix_fmt = AV_PIX_FMT_VDPAU,
> + .start_frame = vdpau_vc1_start_frame,
> + .end_frame = ff_vdpau_common_end_frame,
> + .decode_slice = vdpau_vc1_decode_slice,
> +};
> +#endif
.. drop the ifdefs.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
