On Wed, Oct 28, 2015 at 8:21 PM, Rémi Denis-Courmont <[email protected]> wrote: > The VDPAU API never explicitly supported H.263 in the first place. > --- > configure | 2 -- > libavcodec/Makefile | 1 - > libavcodec/allcodecs.c | 1 - > libavcodec/vdpau_mpeg4.c | 24 ------------------------ > 4 files changed, 28 deletions(-) > > diff --git a/configure b/configure > index 8d44768..c79c203 100755 > --- a/configure > +++ b/configure > @@ -2061,8 +2061,6 @@ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" > > h263_vaapi_hwaccel_deps="vaapi" > h263_vaapi_hwaccel_select="h263_decoder" > -h263_vdpau_hwaccel_deps="vdpau" > -h263_vdpau_hwaccel_select="h263_decoder" > h264_d3d11va_hwaccel_deps="d3d11va" > h264_d3d11va_hwaccel_select="h264_decoder" > h264_dxva2_hwaccel_deps="dxva2" > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 9dc8009..0cca9ce 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -592,7 +592,6 @@ OBJS-$(CONFIG_VDA) += vda.o > OBJS-$(CONFIG_VDPAU) += vdpau.o > > OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o > -OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o > OBJS-$(CONFIG_H264_D3D11VA_HWACCEL) += dxva2_h264.o > OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o > OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index 731b757..0ad102c 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -75,7 +75,6 @@ void avcodec_register_all(void) > > /* hardware accelerators */ > REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); > - REGISTER_HWACCEL(H263_VDPAU, h263_vdpau); > REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va); > REGISTER_HWACCEL(H264_DXVA2, h264_dxva2); > REGISTER_HWACCEL(H264_MMAL, h264_mmal); > diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c > index 978456a..fcad42f 100644 > --- a/libavcodec/vdpau_mpeg4.c > +++ b/libavcodec/vdpau_mpeg4.c > @@ -88,29 +88,6 @@ static int vdpau_mpeg4_decode_slice(av_unused > AVCodecContext *avctx, > return 0; > } > > -#if CONFIG_H263_VDPAU_HWACCEL > -static int vdpau_h263_init(AVCodecContext *avctx) > -{ > - return ff_vdpau_common_init(avctx, VDP_DECODER_PROFILE_MPEG4_PART2_ASP, > - VDP_DECODER_LEVEL_MPEG4_PART2_ASP_L5); > -} > - > -AVHWAccel ff_h263_vdpau_hwaccel = { > - .name = "h263_vdpau", > - .type = AVMEDIA_TYPE_VIDEO, > - .id = AV_CODEC_ID_H263, > - .pix_fmt = AV_PIX_FMT_VDPAU, > - .start_frame = vdpau_mpeg4_start_frame, > - .end_frame = ff_vdpau_mpeg_end_frame, > - .decode_slice = vdpau_mpeg4_decode_slice, > - .frame_priv_data_size = sizeof(struct vdpau_picture_context), > - .init = vdpau_h263_init, > - .uninit = ff_vdpau_common_uninit, > - .priv_data_size = sizeof(VDPAUContext), > -}; > -#endif > - > -#if CONFIG_MPEG4_VDPAU_HWACCEL > static int vdpau_mpeg4_init(AVCodecContext *avctx) > { > VdpDecoderProfile profile; > @@ -142,4 +119,3 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = { > .uninit = ff_vdpau_common_uninit, > .priv_data_size = sizeof(VDPAUContext), > }; > -#endif > -- > 2.6.2 > > _______________________________________________ > libav-devel mailing list > [email protected] > https://lists.libav.org/mailman/listinfo/libav-devel
-- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
