virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert "avcodec/cbs_av1_syntax_template: Check ref_frame_idx before use"

Browse Source 
This reverts commit 8174e5c77d.

It's no longer needed after the previous commit.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-11-17 10:26:53 -03:00
parent eced91afa5
commit 553c1431ac
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/cbs_av1_syntax_template.c
View File

@ -530,17 +530,16 @@ static int FUNC(frame_size_with_refs)(CodedBitstreamContext *ctx, RWContext *rw,
for (i = 0; i < AV1_REFS_PER_FRAME; i++) { for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
flags(found_ref[i], 1, i); flags(found_ref[i], 1, i);
if (current->found_ref[i]) { if (current->found_ref[i]) {
AV1ReferenceFrameState *ref; AV1ReferenceFrameState *ref =
&priv->ref[current->ref_frame_idx[i]];
if (current->ref_frame_idx[i] < 0 || if (!ref->valid) {
!priv->ref[current->ref_frame_idx[i]].valid) {
av_log(ctx->log_ctx, AV_LOG_ERROR, av_log(ctx->log_ctx, AV_LOG_ERROR,
"Missing reference frame needed for frame size " "Missing reference frame needed for frame size "
"(ref = %d, ref_frame_idx = %d).\n", "(ref = %d, ref_frame_idx = %d).\n",
i, current->ref_frame_idx[i]); i, current->ref_frame_idx[i]);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ref = &priv->ref[current->ref_frame_idx[i]];
priv->upscaled_width = ref->upscaled_width; priv->upscaled_width = ref->upscaled_width;
priv->frame_width = ref->frame_width; priv->frame_width = ref->frame_width;