diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2015-10-28 21:21:51 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-30 12:46:56 +0100 |
| commit | d35d0c723e3c8fc8cde76bf677f67928f5e179a8 (patch) | |
| tree | bfccb84b4e2cc53031e458e8c84d127c22ba71bb /libavcodec | |
| parent | f53583ea6e2e3fda4e4aa363f9a62cff4285affb (diff) | |
| download | ffmpeg-d35d0c723e3c8fc8cde76bf677f67928f5e179a8.tar.gz | |
vdpau: remove dysfunctional H.263 support
The VDPAU API never explicitly supported H.263 in the first place.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
| -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 |
4 files changed, 1 insertions, 27 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9dc800990c..0cca9ce7f5 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 731b757700..0ad102cf26 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/h263dec.c b/libavcodec/h263dec.c index fd1e57b764..9e8cea5a9a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -657,7 +657,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { #if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL AV_PIX_FMT_VAAPI_VLD, #endif -#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL +#if CONFIG_MPEG4_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif AV_PIX_FMT_YUV420P, diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 978456ad2a..fcad42f0a4 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 |