[FFmpeg-cvslog] avcodec/h2645_sei: Remove dead checks

2024-05-24 Thread Michael Niedermayer 
ffmpeg | branch: release/6.1 | Michael Niedermayer  | 
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 
(cherry picked from commit fdaa6ae2b62de51ac0584b51feec7b2369799549)
Signed-off-by: Michael Niedermayer 

> 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) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/h2645_sei: Remove dead checks

2024-05-22 Thread Michael Niedermayer 
ffmpeg | branch: release/7.0 | Michael Niedermayer  | 
Mon May  6 01:00:17 2024 +0200| [15de2a9b969086cec71cea96ae8ab3961d1c03d8] | 
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 
(cherry picked from commit fdaa6ae2b62de51ac0584b51feec7b2369799549)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15de2a9b969086cec71cea96ae8ab3961d1c03d8
---

 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 afc103b69c..3b58d22d6f 100644
--- a/libavcodec/h2645_sei.c
+++ b/libavcodec/h2645_sei.c
@@ -621,8 +621,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++) {
@@ -718,8 +717,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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/h2645_sei: Remove dead checks

2024-05-12 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Mon 
May  6 01:00:17 2024 +0200| [fdaa6ae2b62de51ac0584b51feec7b2369799549] | 
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 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdaa6ae2b62de51ac0584b51feec7b2369799549
---

 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 96a22e7cf6..1deb76c765 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

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".