[FFmpeg-cvslog] fftools/ffmpeg_enc: simplify opaque_ref check

Michael Niedermayer git at videolan.org
Tue Jul 2 23:00:46 EEST 2024


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Apr 27 22:20:25 2024 +0200| [97b2ab15de964d9455aa902ab616881f76d2cb67] | committer: Michael Niedermayer

fftools/ffmpeg_enc: simplify opaque_ref check

Found-while-revieweing: CID1520670 Dereference after null check

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 fftools/ffmpeg_enc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 618ba193ff..863d1a43ed 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -476,7 +476,7 @@ void enc_stats_write(OutputStream *ost, EncStats *es,
 
     const FrameData *fd;
 
-    if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) {
+    if (frame ? frame->opaque_ref : pkt->opaque_ref) {
         fd   = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data);
         tbi  = fd->dec.tb;
         ptsi = fd->dec.pts;



More information about the ffmpeg-cvslog mailing list