diff options
| author | Philip Langdale <philipl@overt.org> | 2016-10-30 10:30:27 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2016-10-30 15:47:37 -0700 |
| commit | 21b68cdbae6576bb58c19dd44c0669293f7d05d1 (patch) | |
| tree | 1395aa061f642c849aad331f9f1416cac786869b /libavcodec | |
| parent | 5540d6c1343e6d1e06d6601b7d35884761711e3e (diff) | |
| download | ffmpeg-21b68cdbae6576bb58c19dd44c0669293f7d05d1.tar.gz | |
avcodec/cuvid: Don't claim to decode h.263 (it doesn't)
Turns out cuvid doesn't support h.263.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/cuvid.c | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 594d104056..ada9481d27 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 24ade94ab9..eafce0ac19 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 |