Turns out cuvid doesn't support h.263.
Unified · Split
| @@ -2552,7 +2552,6 @@ videotoolbox_hwaccel_deps="videotoolbox pthreads" · 2551 unmodified lines | |||
| 2552 | videotoolbox_hwaccel_extralibs="-framework QuartzCore" | 2552 | videotoolbox_hwaccel_extralibs="-framework QuartzCore" |
| 2553 | xvmc_deps="X11_extensions_XvMClib_h" | 2553 | xvmc_deps="X11_extensions_XvMClib_h" |
| 2554 | 2554 | ||
| 2555 | h263_cuvid_hwaccel_deps="cuda cuvid" | ||
| 2556 | h263_vaapi_hwaccel_deps="vaapi" | 2555 | h263_vaapi_hwaccel_deps="vaapi" |
| 2557 | h263_vaapi_hwaccel_select="h263_decoder" | 2556 | h263_vaapi_hwaccel_select="h263_decoder" |
| 2558 | h263_videotoolbox_hwaccel_deps="videotoolbox" | 2557 | h263_videotoolbox_hwaccel_deps="videotoolbox" |
| @@ -2696,8 +2695,6 @@ scale_npp_filter_deps="cuda libnpp" · 137 unmodified lines | |||
| 2696 | 2695 | ||
| 2697 | nvenc_deps_any="dlopen LoadLibrary" | 2696 | nvenc_deps_any="dlopen LoadLibrary" |
| 2698 | nvenc_encoder_deps="nvenc" | 2697 | nvenc_encoder_deps="nvenc" |
| 2699 | h263_cuvid_decoder_deps="cuda cuvid" | ||
| 2700 | h263_cuvid_decoder_select="h263_cuvid_hwaccel" | ||
| 2701 | h264_cuvid_decoder_deps="cuda cuvid" | 2698 | h264_cuvid_decoder_deps="cuda cuvid" |
| 2702 | h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel" | 2699 | h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel" |
| 2703 | h264_nvenc_encoder_deps="nvenc" | 2700 | h264_nvenc_encoder_deps="nvenc" |
| @@ -67,7 +67,6 @@ void avcodec_register_all(void) · 66 unmodified lines | |||
| 67 | initialized = 1; | 67 | initialized = 1; |
| 68 | 68 | ||
| 69 | /* hardware accelerators */ | 69 | /* hardware accelerators */ |
| 70 | REGISTER_HWACCEL(H263_CUVID, h263_cuvid); | ||
| 71 | REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); | 70 | REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); |
| 72 | REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox); | 71 | REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox); |
| 73 | REGISTER_HWACCEL(H264_CUVID, h264_cuvid); | 72 | REGISTER_HWACCEL(H264_CUVID, h264_cuvid); |
| @@ -634,7 +633,6 @@ void avcodec_register_all(void) · 560 unmodified lines | |||
| 634 | /* external libraries, that shouldn't be used by default if one of the | 633 | /* external libraries, that shouldn't be used by default if one of the |
| 635 | * above is available */ | 634 | * above is available */ |
| 636 | REGISTER_ENCDEC (LIBOPENH264, libopenh264); | 635 | REGISTER_ENCDEC (LIBOPENH264, libopenh264); |
| 637 | REGISTER_DECODER(H263_CUVID, h263_cuvid); | ||
| 638 | REGISTER_DECODER(H264_CUVID, h264_cuvid); | 636 | REGISTER_DECODER(H264_CUVID, h264_cuvid); |
| 639 | REGISTER_ENCODER(H264_NVENC, h264_nvenc); | 637 | REGISTER_ENCODER(H264_NVENC, h264_nvenc); |
| 640 | REGISTER_ENCODER(H264_OMX, h264_omx); | 638 | REGISTER_ENCODER(H264_OMX, h264_omx); |
| @@ -664,11 +664,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) · 663 unmodified lines | |||
| 664 | ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext; | 664 | ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext; |
| 665 | 665 | ||
| 666 | switch (avctx->codec->id) { | 666 | switch (avctx->codec->id) { |
| 667 | #if CONFIG_H263_CUVID_DECODER | ||
| 668 | case AV_CODEC_ID_H263: | ||
| 669 | ctx->cuparseinfo.CodecType = cudaVideoCodec_MPEG4; | ||
| 670 | break; | ||
| 671 | #endif | ||
| 672 | #if CONFIG_H264_CUVID_DECODER | 667 | #if CONFIG_H264_CUVID_DECODER |
| 673 | case AV_CODEC_ID_H264: | 668 | case AV_CODEC_ID_H264: |
| 674 | ctx->cuparseinfo.CodecType = cudaVideoCodec_H264; | 669 | ctx->cuparseinfo.CodecType = cudaVideoCodec_H264; |
| @@ -895,10 +890,6 @@ static const AVOption options[] = { · 220 unmodified lines | |||
| 895 | DEFINE_CUVID_CODEC(hevc, HEVC) | 890 | DEFINE_CUVID_CODEC(hevc, HEVC) |
| 896 | #endif | 891 | #endif |
| 897 | 892 | ||
| 898 | #if CONFIG_H263_CUVID_DECODER | ||
| 899 | DEFINE_CUVID_CODEC(h263, H263) | ||
| 900 | #endif | ||
| 901 | |||
| 902 | #if CONFIG_H264_CUVID_DECODER | 893 | #if CONFIG_H264_CUVID_DECODER |
| 903 | DEFINE_CUVID_CODEC(h264, H264) | 894 | DEFINE_CUVID_CODEC(h264, H264) |
| 904 | #endif | 895 | #endif |