| Message ID | 20240506003845.3956423-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | fdaa6ae2b62de51ac0584b51feec7b2369799549 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/h2645_sei: Remove dead checks | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Mon, May 06, 2024 at 02:38:45AM +0200, Michael Niedermayer wrote: > Fixes: CID1596534 Dereference after null check > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/h2645_sei.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) will apply [...]
diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 96a22e7cf6c..1deb76c765b 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -757,8 +757,7 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, if (!sd) av_buffer_unref(&a53->buf_ref); a53->buf_ref = NULL; - if (avctx) - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; + avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } ret = h2645_sei_to_side_data(avctx, sei, &frame->side_data, &frame->nb_side_data); @@ -844,8 +843,7 @@ FF_ENABLE_DEPRECATION_WARNINGS else fgc->present = fgc->persistence_flag; - if (avctx) - avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; + avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } #if CONFIG_HEVC_SEI
Fixes: CID1596534 Dereference after null check Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/h2645_sei.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)