Commit d35d0c72 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Vittorio Giovara

vdpau: remove dysfunctional H.263 support

The VDPAU API never explicitly supported H.263 in the first place.
Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent f53583ea
...@@ -2060,8 +2060,6 @@ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" ...@@ -2060,8 +2060,6 @@ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_deps="vaapi"
h263_vaapi_hwaccel_select="h263_decoder" 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_deps="d3d11va"
h264_d3d11va_hwaccel_select="h264_decoder" h264_d3d11va_hwaccel_select="h264_decoder"
h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_deps="dxva2"
......
...@@ -592,7 +592,6 @@ OBJS-$(CONFIG_VDA) += vda.o ...@@ -592,7 +592,6 @@ OBJS-$(CONFIG_VDA) += vda.o
OBJS-$(CONFIG_VDPAU) += vdpau.o OBJS-$(CONFIG_VDPAU) += vdpau.o
OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.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_D3D11VA_HWACCEL) += dxva2_h264.o
OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o
OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
......
...@@ -75,7 +75,6 @@ void avcodec_register_all(void) ...@@ -75,7 +75,6 @@ void avcodec_register_all(void)
/* hardware accelerators */ /* hardware accelerators */
REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
REGISTER_HWACCEL(H263_VDPAU, h263_vdpau);
REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va); REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va);
REGISTER_HWACCEL(H264_DXVA2, h264_dxva2); REGISTER_HWACCEL(H264_DXVA2, h264_dxva2);
REGISTER_HWACCEL(H264_MMAL, h264_mmal); REGISTER_HWACCEL(H264_MMAL, h264_mmal);
......
...@@ -657,7 +657,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { ...@@ -657,7 +657,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL #if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL
AV_PIX_FMT_VAAPI_VLD, AV_PIX_FMT_VAAPI_VLD,
#endif #endif
#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL #if CONFIG_MPEG4_VDPAU_HWACCEL
AV_PIX_FMT_VDPAU, AV_PIX_FMT_VDPAU,
#endif #endif
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,
......
...@@ -88,29 +88,6 @@ static int vdpau_mpeg4_decode_slice(av_unused AVCodecContext *avctx, ...@@ -88,29 +88,6 @@ static int vdpau_mpeg4_decode_slice(av_unused AVCodecContext *avctx,
return 0; 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) static int vdpau_mpeg4_init(AVCodecContext *avctx)
{ {
VdpDecoderProfile profile; VdpDecoderProfile profile;
...@@ -142,4 +119,3 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = { ...@@ -142,4 +119,3 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = {
.uninit = ff_vdpau_common_uninit, .uninit = ff_vdpau_common_uninit,
.priv_data_size = sizeof(VDPAUContext), .priv_data_size = sizeof(VDPAUContext),
}; };
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment