summaryrefslogtreecommitdiff
path: root/libavcodec/cbs_av1_syntax_template.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2020-08-24 12:21:51 -0300
committerJames Almer <jamrial@gmail.com>2020-08-25 14:49:33 -0300
commitafbe9ebac7b47fec84703459bfe64fc90c2ad937 (patch)
tree79f099d617709332821196f69e375ee7d98b5379 /libavcodec/cbs_av1_syntax_template.c
parente3ed0ce32aaee0487533b10c18f81ab05fd31fa8 (diff)
downloadffmpeg-afbe9ebac7b47fec84703459bfe64fc90c2ad937.tar.gz
avcodec/cbs_av1: infer frame_type in show_existing_frame frames earlier
This follows the spec and will come in handy in the next commit. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/cbs_av1_syntax_template.c')
-rw-r--r--libavcodec/cbs_av1_syntax_template.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index 6a0a105904..258779c591 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -1294,12 +1294,12 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
if (seq->frame_id_numbers_present_flag)
fb(id_len, display_frame_id);
- if (frame->frame_type == AV1_FRAME_KEY)
+ infer(frame_type, frame->frame_type);
+ if (current->frame_type == AV1_FRAME_KEY)
infer(refresh_frame_flags, all_frames);
else
infer(refresh_frame_flags, 0);
- infer(frame_type, frame->frame_type);
infer(frame_width_minus_1, frame->upscaled_width - 1);
infer(frame_height_minus_1, frame->frame_height - 1);
infer(render_width_minus_1, frame->render_width - 1);