[FFmpeg-cvslog] avcodec/cuviddec: backport extradata fixes
Timo Rothenpieler
git at videolan.org
Thu Oct 1 23:17:55 EEST 2020
ffmpeg | branch: release/4.1 | Timo Rothenpieler <timo at rothenpieler.org> | Thu Oct 1 20:20:48 2020 +0200| [d44da66fac3127b655b316711b8f1e57b7ed1acf] | committer: Timo Rothenpieler
avcodec/cuviddec: backport extradata fixes
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d44da66fac3127b655b316711b8f1e57b7ed1acf
---
libavcodec/cuviddec.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index fef72385ed..35e6fe38e7 100644
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -819,7 +819,7 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
CUcontext dummy;
const AVBitStreamFilter *bsf;
uint8_t *extradata;
- uint32_t extradata_size;
+ int extradata_size;
int ret = 0;
enum AVPixelFormat pix_fmts[3] = { AV_PIX_FMT_CUDA,
@@ -989,20 +989,21 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
extradata = ctx->bsf->par_out->extradata;
extradata_size = ctx->bsf->par_out->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;
More information about the ffmpeg-cvslog
mailing list