diff mbox series

[FFmpeg-devel,2/3] fftools/ffmpeg_enc: Remove always-true checks

Message ID GV1P250MB07373A3597AA38557EEF6F2F8F3AA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit bfe15b81b317bc859223d6804f768ecda7b73db3
Headers show
Series [FFmpeg-devel,1/3] avcodec/evc_ps: Fix size of tile_(row|column) arrays | expand

Checks

Context Check Description
yinshiyou/make_fate_loongarch64 success Make fate finished
yinshiyou/make_loongarch64 warning New warnings during build
andriy/make_fate_x86 success Make fate finished
andriy/make_x86 warning New warnings during build

Commit Message

Andreas Rheinhardt July 16, 2023, 2:24 p.m. UTC 
frame is always != NULL for audio and video here
(this is checked by an assert and the frame is already dereferenced
before it reaches this code here).
Fixes Coverity issue #1538858.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/ffmpeg_enc.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Anton Khirnov July 17, 2023, 7:44 a.m. UTC | #1 
Quoting Andreas Rheinhardt (2023-07-16 16:24:35)
> frame is always != NULL for audio and video here
> (this is checked by an assert and the frame is already dereferenced
> before it reaches this code here).
> Fixes Coverity issue #1538858.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  fftools/ffmpeg_enc.c | 4 ----
>  1 file changed, 4 deletions(-)

This and the next patch look ok.

Thanks,
diff mbox series

Patch

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 1489b2f179..2c7e29af24 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -304,20 +304,17 @@  int enc_open(OutputStream *ost, AVFrame *frame)
             enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample,
                                                  av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth);
 
-        if (frame) {
             enc_ctx->color_range            = frame->color_range;
             enc_ctx->color_primaries        = frame->color_primaries;
             enc_ctx->color_trc              = frame->color_trc;
             enc_ctx->colorspace             = frame->colorspace;
             enc_ctx->chroma_sample_location = frame->chroma_location;
-        }
 
         enc_ctx->framerate = fr;
 
         ost->st->avg_frame_rate = fr;
 
         // Field order: autodetection
-        if (frame) {
             if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
                 ost->top_field_first >= 0)
                 if (ost->top_field_first)
@@ -332,7 +329,6 @@  int enc_open(OutputStream *ost, AVFrame *frame)
                     enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT;
             } else
                 enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
-        }
 
         // Field order: override
         if (ost->top_field_first == 0) {