ffmpeg | branch: master | Philip Langdale <phil...@overt.org> | Sun Oct 30 10:30:27 2016 -0700| [21b68cdbae6576bb58c19dd44c0669293f7d05d1] | committer: Philip Langdale
avcodec/cuvid: Don't claim to decode h.263 (it doesn't) Turns out cuvid doesn't support h.263. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21b68cdbae6576bb58c19dd44c0669293f7d05d1 --- configure | 3 --- libavcodec/allcodecs.c | 2 -- libavcodec/cuvid.c | 9 --------- 3 files changed, 14 deletions(-) diff --git a/configure b/configure index 5993de5..c4122e9 100755 --- a/configure +++ b/configure @@ -2552,7 +2552,6 @@ videotoolbox_hwaccel_deps="videotoolbox pthreads" videotoolbox_hwaccel_extralibs="-framework QuartzCore" xvmc_deps="X11_extensions_XvMClib_h" -h263_cuvid_hwaccel_deps="cuda cuvid" h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_select="h263_decoder" h263_videotoolbox_hwaccel_deps="videotoolbox" @@ -2696,8 +2695,6 @@ scale_npp_filter_deps="cuda libnpp" nvenc_deps_any="dlopen LoadLibrary" nvenc_encoder_deps="nvenc" -h263_cuvid_decoder_deps="cuda cuvid" -h263_cuvid_decoder_select="h263_cuvid_hwaccel" h264_cuvid_decoder_deps="cuda cuvid" h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel" h264_nvenc_encoder_deps="nvenc" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 594d104..ada9481 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -67,7 +67,6 @@ void avcodec_register_all(void) initialized = 1; /* hardware accelerators */ - REGISTER_HWACCEL(H263_CUVID, h263_cuvid); REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox); REGISTER_HWACCEL(H264_CUVID, h264_cuvid); @@ -634,7 +633,6 @@ void avcodec_register_all(void) /* external libraries, that shouldn't be used by default if one of the * above is available */ REGISTER_ENCDEC (LIBOPENH264, libopenh264); - REGISTER_DECODER(H263_CUVID, h263_cuvid); REGISTER_DECODER(H264_CUVID, h264_cuvid); REGISTER_ENCODER(H264_NVENC, h264_nvenc); REGISTER_ENCODER(H264_OMX, h264_omx); diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index 24ade94..eafce0a 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -664,11 +664,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext; switch (avctx->codec->id) { -#if CONFIG_H263_CUVID_DECODER - case AV_CODEC_ID_H263: - ctx->cuparseinfo.CodecType = cudaVideoCodec_MPEG4; - break; -#endif #if CONFIG_H264_CUVID_DECODER case AV_CODEC_ID_H264: ctx->cuparseinfo.CodecType = cudaVideoCodec_H264; @@ -895,10 +890,6 @@ static const AVOption options[] = { DEFINE_CUVID_CODEC(hevc, HEVC) #endif -#if CONFIG_H263_CUVID_DECODER -DEFINE_CUVID_CODEC(h263, H263) -#endif - #if CONFIG_H264_CUVID_DECODER DEFINE_CUVID_CODEC(h264, H264) #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
