diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:01 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:01 +0100 |
| commit | d15adeacf3e61cd8d2169c090bf06f6d8fc62f8b (patch) | |
| tree | 501bec80e50a7dea73cbf7a9d0f43af5d1b587e6 /libavcodec/vdpau_mpeg4.c | |
| parent | b0b752334c29890020d9cb12a348cc9e6320f5e3 (diff) | |
| parent | d35d0c723e3c8fc8cde76bf677f67928f5e179a8 (diff) | |
Merge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'
* commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8':
vdpau: remove dysfunctional H.263 support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
| -rw-r--r-- | libavcodec/vdpau_mpeg4.c | 24 |
1 files changed, 0 insertions, 24 deletions
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 |