History

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

Turns out cuvid doesn't support h.263.

Philip Langdale committed 10 years ago

Commit 21b68cd1 parent 5540d6c3 files · +0 −14Browse files

Unified · Split

3 files
  1. configure +0 −3
  2. libavcodec/allcodecs.c +0 −2
  3. libavcodec/cuvid.c +0 −9
configure+0−3
@@ -2552,7 +2552,6 @@ videotoolbox_hwaccel_deps="videotoolbox pthreads" · 2551 unmodified lines
25522552 videotoolbox_hwaccel_extralibs="-framework QuartzCore"
25532553 xvmc_deps="X11_extensions_XvMClib_h"
25542554
2555−h263_cuvid_hwaccel_deps="cuda cuvid"
25562555 h263_vaapi_hwaccel_deps="vaapi"
25572556 h263_vaapi_hwaccel_select="h263_decoder"
25582557 h263_videotoolbox_hwaccel_deps="videotoolbox"
@@ -2696,8 +2695,6 @@ scale_npp_filter_deps="cuda libnpp" · 137 unmodified lines
26962695
26972696 nvenc_deps_any="dlopen LoadLibrary"
26982697 nvenc_encoder_deps="nvenc"
2699−h263_cuvid_decoder_deps="cuda cuvid"
2700−h263_cuvid_decoder_select="h263_cuvid_hwaccel"
27012698 h264_cuvid_decoder_deps="cuda cuvid"
27022699 h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel"
27032700 h264_nvenc_encoder_deps="nvenc"
libavcodec/allcodecs.c+0−2
@@ -67,7 +67,6 @@ void avcodec_register_all(void) · 66 unmodified lines
6767 initialized = 1;
6868
6969 /* hardware accelerators */
70− REGISTER_HWACCEL(H263_CUVID, h263_cuvid);
7170 REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
7271 REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox);
7372 REGISTER_HWACCEL(H264_CUVID, h264_cuvid);
@@ -634,7 +633,6 @@ void avcodec_register_all(void) · 560 unmodified lines
634633 /* external libraries, that shouldn't be used by default if one of the
635634 * above is available */
636635 REGISTER_ENCDEC (LIBOPENH264, libopenh264);
637− REGISTER_DECODER(H263_CUVID, h263_cuvid);
638636 REGISTER_DECODER(H264_CUVID, h264_cuvid);
639637 REGISTER_ENCODER(H264_NVENC, h264_nvenc);
640638 REGISTER_ENCODER(H264_OMX, h264_omx);
libavcodec/cuvid.c+0−9
@@ -664,11 +664,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) · 663 unmodified lines
664664 ctx->cuparseinfo.pExtVideoInfo = &ctx->cuparse_ext;
665665
666666 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
672667 #if CONFIG_H264_CUVID_DECODER
673668 case AV_CODEC_ID_H264:
674669 ctx->cuparseinfo.CodecType = cudaVideoCodec_H264;
@@ -895,10 +890,6 @@ static const AVOption options[] = { · 220 unmodified lines
895890 DEFINE_CUVID_CODEC(hevc, HEVC)
896891 #endif
897892
898−#if CONFIG_H263_CUVID_DECODER
899−DEFINE_CUVID_CODEC(h263, H263)
900−#endif
901−
902893 #if CONFIG_H264_CUVID_DECODER
903894 DEFINE_CUVID_CODEC(h264, H264)
904895 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t