| Message ID | AS8P250MB07444510BBF5DAD389A21E328F112@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 4c8a6631ad13b6d68b7190507aa7a630a73884c9 |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffmpeg_filter: Fix check | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Fixes Coverity issues #1596529, #1596531. > Introduced in 8e35e33d42efb89ff7e3da92b841a3b43a5a95bc. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > fftools/ffmpeg_filter.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c > index f108f8daf9..382d0f75b1 100644 > --- a/fftools/ffmpeg_filter.c > +++ b/fftools/ffmpeg_filter.c > @@ -862,7 +862,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, > ofp->fps.vsync_method = opts->vsync_method; > ofp->fps.framerate = ost->frame_rate; > ofp->fps.framerate_max = ost->max_frame_rate; > - ofp->fps.framerate_supported = ost->force_fps && opts->enc ? > + ofp->fps.framerate_supported = ost->force_fps || !opts->enc ? > NULL : opts->enc->supported_framerates; > > // reduce frame rate for mpeg4 to be within the spec limits Will apply. - Andreas
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f108f8daf9..382d0f75b1 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -862,7 +862,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->fps.vsync_method = opts->vsync_method; ofp->fps.framerate = ost->frame_rate; ofp->fps.framerate_max = ost->max_frame_rate; - ofp->fps.framerate_supported = ost->force_fps && opts->enc ? + ofp->fps.framerate_supported = ost->force_fps || !opts->enc ? NULL : opts->enc->supported_framerates; // reduce frame rate for mpeg4 to be within the spec limits
Fixes Coverity issues #1596529, #1596531. Introduced in 8e35e33d42efb89ff7e3da92b841a3b43a5a95bc. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)