diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2020-10-01 20:20:48 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2020-10-01 21:44:54 +0200 |
| commit | 8a2acdc6da97f91b50b61f4b41a2430e4270602b (patch) | |
| tree | 4e5ec0c106684581f07177b4eece062ba3776202 | |
| parent | af2a430bb1c71296f2460c84464208d3615ab186 (diff) | |
| download | ffmpeg-8a2acdc6da97f91b50b61f4b41a2430e4270602b.tar.gz | |
avcodec/cuviddec: backport extradata fixes
| -rw-r--r-- | libavcodec/cuviddec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index a3d0bdd93c..2d6377bc8c 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -795,7 +795,7 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) CUcontext cuda_ctx = NULL; CUcontext dummy; uint8_t *extradata; - uint32_t extradata_size; + int extradata_size; int ret = 0; enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_CUDA, @@ -949,20 +949,21 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) const AVCodecParameters *par = avctx->internal->bsf->par_out; extradata = par->extradata; extradata_size = par->extradata_size; - } else if (avctx->extradata_size > 0) { + } else { extradata = avctx->extradata; extradata_size = avctx->extradata_size; } ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext) - + FFMAX(extradata_size - sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0)); + + FFMAX(extradata_size - (int)sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0)); if (!ctx->cuparse_ext) { ret = AVERROR(ENOMEM); goto error; } - ctx->cuparse_ext->format.seqhdr_data_length = avctx->extradata_size; - memcpy(ctx->cuparse_ext->raw_seqhdr_data, extradata, extradata_size); + if (extradata_size > 0) + memcpy(ctx->cuparse_ext->raw_seqhdr_data, extradata, extradata_size); + ctx->cuparse_ext->format.seqhdr_data_length = extradata_size; ctx->cuparseinfo.pExtVideoInfo = ctx->cuparse_ext; |