Message ID | 20201112182243.838-1-jamrial@gmail.com |
---|---|
State | Accepted |
Commit | 0cccb5fb14ee98225cb771d0ef060e52e1a1a7f9 |
Headers | show |
Series | [FFmpeg-devel] avcodec/cbs_av1: remove dead code | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
On 11/12/2020 3:22 PM, James Almer wrote: > The other branch already covers cases where enable_order_hint is true > and frame is of type Inter. > Regression since ddb0e4fecdef24e8c7b90fa0a41d13e642ea732f > > Fixes Coverity issues #1469194 and #1469195. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/cbs_av1_syntax_template.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c > index bef53e145b..f866dc7b2e 100644 > --- a/libavcodec/cbs_av1_syntax_template.c > +++ b/libavcodec/cbs_av1_syntax_template.c > @@ -1500,9 +1500,6 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, > priv->ref[i].valid = 0; > } > } > - } else if (!frame_is_intra && seq->enable_order_hint) { > - for (i = 0; i < AV1_NUM_REF_FRAMES; i++) > - infer(ref_order_hint[i], priv->ref[i].order_hint); > } > > if (current->frame_type == AV1_FRAME_KEY || Applied.
diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index bef53e145b..f866dc7b2e 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1500,9 +1500,6 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, priv->ref[i].valid = 0; } } - } else if (!frame_is_intra && seq->enable_order_hint) { - for (i = 0; i < AV1_NUM_REF_FRAMES; i++) - infer(ref_order_hint[i], priv->ref[i].order_hint); } if (current->frame_type == AV1_FRAME_KEY ||
The other branch already covers cases where enable_order_hint is true and frame is of type Inter. Regression since ddb0e4fecdef24e8c7b90fa0a41d13e642ea732f Fixes Coverity issues #1469194 and #1469195. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/cbs_av1_syntax_template.c | 3 --- 1 file changed, 3 deletions(-)