@@ -2672,45 +2672,36 @@ h263_vaapi_hwaccel_deps="vaapi"

 h263_vaapi_hwaccel_select="h263_decoder"

 h263_videotoolbox_hwaccel_deps="videotoolbox"

 h263_videotoolbox_hwaccel_select="h263_decoder"

-h264_cuvid_hwaccel_select="h264_cuvid_decoder"

 h264_d3d11va_hwaccel_deps="d3d11va"

 h264_d3d11va_hwaccel_select="h264_decoder"

 h264_d3d11va2_hwaccel_deps="d3d11va"

 h264_d3d11va2_hwaccel_select="h264_decoder"

 h264_dxva2_hwaccel_deps="dxva2"

 h264_dxva2_hwaccel_select="h264_decoder"

-h264_mediacodec_hwaccel_deps="mediacodec"

-h264_mmal_hwaccel_deps="mmal"

 h264_nvdec_hwaccel_deps="nvdec"

 h264_nvdec_hwaccel_select="h264_decoder"

-h264_qsv_hwaccel_deps="libmfx"

 h264_vaapi_hwaccel_deps="vaapi"

 h264_vaapi_hwaccel_select="h264_decoder"

 h264_vdpau_hwaccel_deps="vdpau"

 h264_vdpau_hwaccel_select="h264_decoder"

 h264_videotoolbox_hwaccel_deps="videotoolbox"

 h264_videotoolbox_hwaccel_select="h264_decoder"

-hevc_cuvid_hwaccel_select="hevc_cuvid_decoder"

 hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"

 hevc_d3d11va_hwaccel_select="hevc_decoder"

-hevc_mediacodec_hwaccel_deps="mediacodec"

 hevc_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"

 hevc_d3d11va2_hwaccel_select="hevc_decoder"

 hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"

 hevc_dxva2_hwaccel_select="hevc_decoder"

 hevc_nvdec_hwaccel_deps="nvdec"

 hevc_nvdec_hwaccel_select="hevc_decoder"

-hevc_qsv_hwaccel_deps="libmfx"

 hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"

 hevc_vaapi_hwaccel_select="hevc_decoder"

 hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"

 hevc_vdpau_hwaccel_select="hevc_decoder"

 hevc_videotoolbox_hwaccel_deps="videotoolbox"

 hevc_videotoolbox_hwaccel_select="hevc_decoder"

-mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"

 mpeg_xvmc_hwaccel_deps="xvmc"

 mpeg_xvmc_hwaccel_select="mpeg2video_decoder"

-mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"

 mpeg1_nvdec_hwaccel_deps="nvdec"

 mpeg1_nvdec_hwaccel_select="mpeg1video_decoder"

 mpeg1_vdpau_hwaccel_deps="vdpau"

@@ -2719,18 +2710,14 @@ mpeg1_videotoolbox_hwaccel_deps="videotoolbox"

 mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"

 mpeg1_xvmc_hwaccel_deps="xvmc"

 mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"

-mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"

 mpeg2_d3d11va_hwaccel_deps="d3d11va"

 mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"

 mpeg2_d3d11va2_hwaccel_deps="d3d11va"

 mpeg2_d3d11va2_hwaccel_select="mpeg2video_decoder"

 mpeg2_dxva2_hwaccel_deps="dxva2"

 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"

-mpeg2_mediacodec_hwaccel_deps="mediacodec"

-mpeg2_mmal_hwaccel_deps="mmal"

 mpeg2_nvdec_hwaccel_deps="nvdec"

 mpeg2_nvdec_hwaccel_select="mpeg2video_decoder"

-mpeg2_qsv_hwaccel_deps="libmfx"

 mpeg2_vaapi_hwaccel_deps="vaapi"

 mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"

 mpeg2_vdpau_hwaccel_deps="vdpau"

@@ -2739,9 +2726,6 @@ mpeg2_videotoolbox_hwaccel_deps="videotoolbox"

 mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"

 mpeg2_xvmc_hwaccel_deps="xvmc"

 mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"

-mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"

-mpeg4_mediacodec_hwaccel_deps="mediacodec"

-mpeg4_mmal_hwaccel_deps="mmal"

 mpeg4_nvdec_hwaccel_deps="nvdec"

 mpeg4_nvdec_hwaccel_select="mpeg4_decoder"

 mpeg4_vaapi_hwaccel_deps="vaapi"

@@ -2750,32 +2734,24 @@ mpeg4_vdpau_hwaccel_deps="vdpau"

 mpeg4_vdpau_hwaccel_select="mpeg4_decoder"

 mpeg4_videotoolbox_hwaccel_deps="videotoolbox"

 mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"

-vc1_cuvid_hwaccel_select="vc1_cuvid_decoder"

 vc1_d3d11va_hwaccel_deps="d3d11va"

 vc1_d3d11va_hwaccel_select="vc1_decoder"

 vc1_d3d11va2_hwaccel_deps="d3d11va"

 vc1_d3d11va2_hwaccel_select="vc1_decoder"

 vc1_dxva2_hwaccel_deps="dxva2"

 vc1_dxva2_hwaccel_select="vc1_decoder"

-vc1_mmal_hwaccel_deps="mmal"

 vc1_nvdec_hwaccel_deps="nvdec"

 vc1_nvdec_hwaccel_select="vc1_decoder"

-vc1_qsv_hwaccel_deps="libmfx"

 vc1_vaapi_hwaccel_deps="vaapi"

 vc1_vaapi_hwaccel_select="vc1_decoder"

 vc1_vdpau_hwaccel_deps="vdpau"

 vc1_vdpau_hwaccel_select="vc1_decoder"

-vp8_cuvid_hwaccel_select="vp8_cuvid_decoder"

-vp9_cuvid_hwaccel_select="vp9_cuvid_decoder"

-vp8_mediacodec_hwaccel_deps="mediacodec"

-vp8_qsv_hwaccel_deps="libmfx"

 vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"

 vp9_d3d11va_hwaccel_select="vp9_decoder"

 vp9_d3d11va2_hwaccel_deps="d3d11va DXVA_PicParams_VP9"

 vp9_d3d11va2_hwaccel_select="vp9_decoder"

 vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"

 vp9_dxva2_hwaccel_select="vp9_decoder"

-vp9_mediacodec_hwaccel_deps="mediacodec"

 vp9_nvdec_hwaccel_deps="nvdec"

 vp9_nvdec_hwaccel_select="vp9_decoder"

 vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"

@@ -2816,7 +2792,7 @@ h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser"

 h264_mmal_decoder_deps="mmal"

 h264_nvenc_encoder_deps="nvenc"

 h264_omx_encoder_deps="omx"

-h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"

+h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec"

 h264_qsv_encoder_select="qsvenc"

 h264_rkmpp_decoder_deps="rkmpp"

 h264_rkmpp_decoder_select="h264_mp4toannexb_bsf"

@@ -2829,7 +2805,7 @@ hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"

 hevc_mediacodec_decoder_deps="mediacodec"

 hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"

 hevc_nvenc_encoder_deps="nvenc"

-hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"

+hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec"

 hevc_qsv_encoder_select="hevcparse qsvenc"

 hevc_rkmpp_decoder_deps="rkmpp"

 hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf"

@@ -2848,7 +2824,7 @@ mpeg2_crystalhd_decoder_select="crystalhd"

 mpeg2_cuvid_decoder_deps="cuvid"

 mpeg2_mmal_decoder_deps="mmal"

 mpeg2_mediacodec_decoder_deps="mediacodec"

-mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"

+mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"

 mpeg2_qsv_encoder_select="qsvenc"

 mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"

 mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode"

@@ -2866,11 +2842,11 @@ nvenc_hevc_encoder_select="hevc_nvenc_encoder"

 vc1_crystalhd_decoder_select="crystalhd"

 vc1_cuvid_decoder_deps="cuvid"

 vc1_mmal_decoder_deps="mmal"

-vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"

+vc1_qsv_decoder_select="qsvdec vc1_parser"

 vc1_v4l2m2m_decoder_deps="v4l2_m2m vc1_v4l2_m2m"

 vp8_cuvid_decoder_deps="cuvid"

 vp8_mediacodec_decoder_deps="mediacodec"

-vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"

+vp8_qsv_decoder_select="qsvdec vp8_parser"

 vp8_rkmpp_decoder_deps="rkmpp"

 vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"

 vp8_vaapi_encoder_select="vaapi_encode"

@@ -1115,12 +1115,6 @@ static const AVCodecHWConfigInternal *cuvid_hw_configs[] = {

         .option = options, \

         .version = LIBAVUTIL_VERSION_INT, \

     }; \

-    AVHWAccel ff_##x##_cuvid_hwaccel = { \

-        .name           = #x "_cuvid", \

-        .type           = AVMEDIA_TYPE_VIDEO, \

-        .id             = AV_CODEC_ID_##X, \

-        .pix_fmt        = AV_PIX_FMT_CUDA, \

-    }; \

     AVCodec ff_##x##_cuvid_decoder = { \

         .name           = #x "_cuvid", \

         .long_name      = NULL_IF_CONFIG_SMALL("Nvidia CUVID " #X " decoder"), \

@@ -26,7 +26,7 @@

 #include "mediacodec.h"

-#if CONFIG_H264_MEDIACODEC_HWACCEL

+#if CONFIG_MEDIACODEC

 #include <jni.h>

@@ -757,45 +757,3 @@ int ff_mediacodec_dec_is_flushing(AVCodecContext *avctx, MediaCodecDecContext *s

 {

     return s->flushing;

 }

-

-AVHWAccel ff_h264_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_H264,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

-

-AVHWAccel ff_hevc_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_HEVC,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

-

-AVHWAccel ff_mpeg2_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_MPEG2VIDEO,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

-

-AVHWAccel ff_mpeg4_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_MPEG4,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

-

-AVHWAccel ff_vp8_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_VP8,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

-

-AVHWAccel ff_vp9_mediacodec_hwaccel = {

-    .name    = "mediacodec",

-    .type    = AVMEDIA_TYPE_VIDEO,

-    .id      = AV_CODEC_ID_VP9,

-    .pix_fmt = AV_PIX_FMT_MEDIACODEC,

-};

@@ -808,34 +808,6 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame,

     return ret;

 }

-AVHWAccel ff_h264_mmal_hwaccel = {

-    .name       = "h264_mmal",

-    .type       = AVMEDIA_TYPE_VIDEO,

-    .id         = AV_CODEC_ID_H264,

-    .pix_fmt    = AV_PIX_FMT_MMAL,

-};

-

-AVHWAccel ff_mpeg2_mmal_hwaccel = {

-    .name       = "mpeg2_mmal",

-    .type       = AVMEDIA_TYPE_VIDEO,

-    .id         = AV_CODEC_ID_MPEG2VIDEO,

-    .pix_fmt    = AV_PIX_FMT_MMAL,

-};

-

-AVHWAccel ff_mpeg4_mmal_hwaccel = {

-    .name       = "mpeg4_mmal",

-    .type       = AVMEDIA_TYPE_VIDEO,

-    .id         = AV_CODEC_ID_MPEG4,

-    .pix_fmt    = AV_PIX_FMT_MMAL,

-};

-

-AVHWAccel ff_vc1_mmal_hwaccel = {

-    .name       = "vc1_mmal",

-    .type       = AVMEDIA_TYPE_VIDEO,

-    .id         = AV_CODEC_ID_VC1,

-    .pix_fmt    = AV_PIX_FMT_MMAL,

-};

-

 static const AVCodecHWConfigInternal *mmal_hw_configs[] = {

     HW_CONFIG_INTERNAL(MMAL),

     NULL

@@ -180,15 +180,6 @@ static void qsv_decode_flush(AVCodecContext *avctx)

 #define OFFSET(x) offsetof(QSVH2645Context, x)

 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM

-#if CONFIG_HEVC_QSV_HWACCEL

-AVHWAccel ff_hevc_qsv_hwaccel = {

-    .name           = "hevc_qsv",

-    .type           = AVMEDIA_TYPE_VIDEO,

-    .id             = AV_CODEC_ID_HEVC,

-    .pix_fmt        = AV_PIX_FMT_QSV,

-};

-#endif

-

 #if CONFIG_HEVC_QSV_DECODER

 static const AVOption hevc_options[] = {

     { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD },

@@ -231,15 +222,6 @@ AVCodec ff_hevc_qsv_decoder = {

 };

 #endif

-#if CONFIG_H264_QSV_HWACCEL

-AVHWAccel ff_h264_qsv_hwaccel = {

-    .name           = "h264_qsv",

-    .type           = AVMEDIA_TYPE_VIDEO,

-    .id             = AV_CODEC_ID_H264,

-    .pix_fmt        = AV_PIX_FMT_QSV,

-};

-#endif

-

 #if CONFIG_H264_QSV_DECODER

 static const AVOption options[] = {

     { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD },

@@ -158,15 +158,6 @@ static const AVOption options[] = {

     { NULL },

 };

-#if CONFIG_MPEG2_QSV_HWACCEL

-AVHWAccel ff_mpeg2_qsv_hwaccel = {

-    .name           = "mpeg2_qsv",

-    .type           = AVMEDIA_TYPE_VIDEO,

-    .id             = AV_CODEC_ID_MPEG2VIDEO,

-    .pix_fmt        = AV_PIX_FMT_QSV,

-};

-#endif

-

 #if CONFIG_MPEG2_QSV_DECODER

 static const AVClass mpeg2_qsv_class = {

     .class_name = "mpeg2_qsv",

@@ -194,15 +185,6 @@ AVCodec ff_mpeg2_qsv_decoder = {

 };

 #endif

-#if CONFIG_VC1_QSV_HWACCEL

-AVHWAccel ff_vc1_qsv_hwaccel = {

-    .name           = "vc1_qsv",

-    .type           = AVMEDIA_TYPE_VIDEO,

-    .id             = AV_CODEC_ID_VC1,

-    .pix_fmt        = AV_PIX_FMT_QSV,

-};

-#endif

-

 #if CONFIG_VC1_QSV_DECODER

 static const AVClass vc1_qsv_class = {

     .class_name = "vc1_qsv",

@@ -230,15 +212,6 @@ AVCodec ff_vc1_qsv_decoder = {

 };

 #endif

-#if CONFIG_VP8_QSV_HWACCEL

-AVHWAccel ff_vp8_qsv_hwaccel = {

-    .name           = "vp8_qsv",

-    .type           = AVMEDIA_TYPE_VIDEO,

-    .id             = AV_CODEC_ID_VP8,

-    .pix_fmt        = AV_PIX_FMT_QSV,

-};

-#endif

-

 #if CONFIG_VP8_QSV_DECODER

 static const AVClass vp8_qsv_class = {

     .class_name = "vp8_qsv",