virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/cuvid: Don't claim to decode h.263 (it doesn't)

Browse Source 
Turns out cuvid doesn't support h.263.
This commit is contained in:
Philip Langdale 2016-10-30 10:30:27 -07:00
parent 5540d6c134
commit 21b68cdbae
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -2552,7 +2552,6 @@ videotoolbox_hwaccel_deps="videotoolbox pthreads"
videotoolbox_hwaccel_extralibs="-framework QuartzCore" videotoolbox_hwaccel_extralibs="-framework QuartzCore"
xvmc_deps="X11_extensions_XvMClib_h" xvmc_deps="X11_extensions_XvMClib_h"
h263_cuvid_hwaccel_deps="cuda cuvid"
h263_vaapi_hwaccel_deps="vaapi" h263_vaapi_hwaccel_deps="vaapi"
h263_vaapi_hwaccel_select="h263_decoder" h263_vaapi_hwaccel_select="h263_decoder"
h263_videotoolbox_hwaccel_deps="videotoolbox" h263_videotoolbox_hwaccel_deps="videotoolbox"
@ -2696,8 +2695,6 @@ scale_npp_filter_deps="cuda libnpp"
nvenc_deps_any="dlopen LoadLibrary" nvenc_deps_any="dlopen LoadLibrary"
nvenc_encoder_deps="nvenc" 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_deps="cuda cuvid"
h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel" h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel"
h264_nvenc_encoder_deps="nvenc" h264_nvenc_encoder_deps="nvenc"

2
libavcodec/allcodecs.c
View File

@ -67,7 +67,6 @@ void avcodec_register_all(void)
initialized = 1; initialized = 1;
/* hardware accelerators */ /* hardware accelerators */
REGISTER_HWACCEL(H263_CUVID, h263_cuvid);
REGISTER_HWACCEL(H263_VAAPI, h263_vaapi); REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox); REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox);
REGISTER_HWACCEL(H264_CUVID, h264_cuvid); 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 /* external libraries, that shouldn't be used by default if one of the
* above is available */ * above is available */
REGISTER_ENCDEC (LIBOPENH264, libopenh264); REGISTER_ENCDEC (LIBOPENH264, libopenh264);
REGISTER_DECODER(H263_CUVID, h263_cuvid);
REGISTER_DECODER(H264_CUVID, h264_cuvid); REGISTER_DECODER(H264_CUVID, h264_cuvid);
REGISTER_ENCODER(H264_NVENC, h264_nvenc); REGISTER_ENCODER(H264_NVENC, h264_nvenc);
REGISTER_ENCODER(H264_OMX, h264_omx); REGISTER_ENCODER(H264_OMX, h264_omx);

9
libavcodec/cuvid.c
View File

@ -664,11 +664,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext; ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext;
switch (avctx->codec->id) { 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 #if CONFIG_H264_CUVID_DECODER
case AV_CODEC_ID_H264: case AV_CODEC_ID_H264:
ctx->cuparseinfo.CodecType = cudaVideoCodec_H264; ctx->cuparseinfo.CodecType = cudaVideoCodec_H264;
@ -895,10 +890,6 @@ static const AVOption options[] = {
DEFINE_CUVID_CODEC(hevc, HEVC) DEFINE_CUVID_CODEC(hevc, HEVC)
#endif #endif
#if CONFIG_H263_CUVID_DECODER
DEFINE_CUVID_CODEC(h263, H263)
#endif
#if CONFIG_H264_CUVID_DECODER #if CONFIG_H264_CUVID_DECODER
DEFINE_CUVID_CODEC(h264, H264) DEFINE_CUVID_CODEC(h264, H264)
#endif #endif