| Message ID | AM7PR03MB6660A674326B8051221AB6548F2D9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 8b49436452bb99f70da24a254ef4cd45d0dbd496 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/vp8: Remove always-false check | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Tue, Feb 08, 2022 at 04:39:27PM +0100, Andreas Rheinhardt wrote: > Since e9b66175793e5c2af19beefe8e143f6e4901b5df a codec's close > function is never ever called for a codec whose init function has not > been called; in particular, it is never ever called if the > AVCodecContext's private data has not been allocated. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/vp8.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c > index a70d94bd82..c9d9117528 100644 > --- a/libavcodec/vp8.c > +++ b/libavcodec/vp8.c > @@ -2826,9 +2826,6 @@ av_cold int ff_vp8_decode_free(AVCodecContext *avctx) > VP8Context *s = avctx->priv_data; > int i; > > - if (!s) > - return 0; > - > vp8_decode_flush_impl(avctx, 1); > for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) > av_frame_free(&s->frames[i].tf.f); looks good to me. please apply. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index a70d94bd82..c9d9117528 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2826,9 +2826,6 @@ av_cold int ff_vp8_decode_free(AVCodecContext *avctx) VP8Context *s = avctx->priv_data; int i; - if (!s) - return 0; - vp8_decode_flush_impl(avctx, 1); for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) av_frame_free(&s->frames[i].tf.f);
Since e9b66175793e5c2af19beefe8e143f6e4901b5df a codec's close function is never ever called for a codec whose init function has not been called; in particular, it is never ever called if the AVCodecContext's private data has not been allocated. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/vp8.c | 3 --- 1 file changed, 3 deletions(-)