[FFmpeg-cvslog] avcodec/h2645_sei: Remove dead checks
Michael Niedermayer
git at videolan.org
Sat May 25 01:57:15 EEST 2024
ffmpeg | branch: release/6.1 | Michael Niedermayer <michael at niedermayer.cc> | Mon May 6 01:00:17 2024 +0200| [b586ff27683af11315f3e637c08e0ec0a07d9f35] | committer: Michael Niedermayer
avcodec/h2645_sei: Remove dead checks
Fixes: CID1596534 Dereference after null check
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit fdaa6ae2b62de51ac0584b51feec7b2369799549)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b586ff27683af11315f3e637c08e0ec0a07d9f35
---
libavcodec/h2645_sei.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c
index cb6be0594b..adc0bd3e25 100644
--- a/libavcodec/h2645_sei.c
+++ b/libavcodec/h2645_sei.c
@@ -599,8 +599,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;
}
for (unsigned i = 0; i < sei->unregistered.nb_buf_ref; i++) {
@@ -686,8 +685,7 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei,
else
fgc->present = fgc->persistence_flag;
- if (avctx)
- avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN;
+ avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN;
}
if (sei->ambient_viewing_environment.present) {
More information about the ffmpeg-cvslog
mailing list