diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vdpau_mpeg4.c | 24 |
5 files changed, 1 insertions, 29 deletions
@@ -2430,8 +2430,6 @@ xvmc_deps="X11_extensions_XvMClib_h" h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_select="h263_decoder" -h263_vdpau_hwaccel_deps="vdpau" -h263_vdpau_hwaccel_select="h263_decoder" h263_videotoolbox_hwaccel_deps="videotoolbox" h263_videotoolbox_hwaccel_select="h263_decoder" h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8162447821..b61424f639 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -714,7 +714,6 @@ OBJS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.o OBJS-$(CONFIG_VDPAU) += vdpau.o OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o -OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o OBJS-$(CONFIG_H264_D3D11VA_HWACCEL) += dxva2_h264.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 49478a193f..29225bf8c9 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(H263_VIDEOTOOLBOX, h263_videotoolbox); REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va); REGISTER_HWACCEL(H264_DXVA2, h264_dxva2); diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 1958119f1e..ca7e5ebe9b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -722,7 +722,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { #if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL AV_PIX_FMT_VAAPI, #endif -#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL +#if CONFIG_MPEG4_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif #if CONFIG_H263_VIDEOTOOLBOX_HWACCEL || CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 9141becd9f..46a00cb27c 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; @@ -145,4 +122,3 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = { .uninit = ff_vdpau_common_uninit, .priv_data_size = sizeof(VDPAUContext), }; -#endif |