| Message ID | 20231006120540.2023-1-d.kozinski@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v1] fftools/ffmpeg_enc: NULL check for frame pointer removed | expand |
The pointer 'frame', which is dereferenced at ffmpeg_enc.c:930, is compared to a NULL value at ffmpeg_enc.c:955. The pointer 'frame' is checked in the video_sync_process() function before calling the adjust_frame_pts_to_encoder_tb function > -----Original Message----- > From: Dawid Kozinski <d.kozinski@samsung.com> > Sent: piątek, 6 października 2023 14:06 > To: d.frankiewic@samsung.com; ffmpeg-devel@ffmpeg.org > Cc: Dawid Kozinski <d.kozinski@samsung.com> > Subject: [PATCH v1] fftools/ffmpeg_enc: NULL check for frame pointer removed > > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > --- > fftools/ffmpeg_enc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index > ec9cebbd96..61fd31823e 100644 > --- a/fftools/ffmpeg_enc.c > +++ b/fftools/ffmpeg_enc.c > @@ -951,8 +951,8 @@ early_exit: > > if (debug_ts) { > av_log(NULL, AV_LOG_INFO, "filter -> pts:%s pts_time:%s exact:%f > time_base:%d/%d\n", > - frame ? av_ts2str(frame->pts) : "NULL", > - (enc && frame) ? av_ts2timestr(frame->pts, &enc->time_base) : > "NULL", > + av_ts2str(frame->pts), > + (enc) ? av_ts2timestr(frame->pts, &enc->time_base) : > + "NULL", > float_pts, > enc ? enc->time_base.num : -1, > enc ? enc->time_base.den : -1); > -- > 2.25.1
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index ec9cebbd96..61fd31823e 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -951,8 +951,8 @@ early_exit: if (debug_ts) { av_log(NULL, AV_LOG_INFO, "filter -> pts:%s pts_time:%s exact:%f time_base:%d/%d\n", - frame ? av_ts2str(frame->pts) : "NULL", - (enc && frame) ? av_ts2timestr(frame->pts, &enc->time_base) : "NULL", + av_ts2str(frame->pts), + (enc) ? av_ts2timestr(frame->pts, &enc->time_base) : "NULL", float_pts, enc ? enc->time_base.num : -1, enc ? enc->time_base.den : -1);
Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> --- fftools/ffmpeg_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)