Merge commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead'

[ffmpeg] / libavcodec / vdpau_mpeg4.c

diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 9141becd9f103dede0732bdf37140224896b81fd..46a00cb27cb998bc5e03d42b3877e380912e7b94 100644 (file)
--- 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