[FFmpeg-cvslog] fftools/ffmpeg_filter: remove an always-true check

Anton Khirnov git at videolan.org
Mon Aug 29 16:42:37 EEST 2022


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Aug 25 09:42:40 2022 +0200| [4a4a206304e1d168e9a839d1a9c426e459343322] | committer: Anton Khirnov

fftools/ffmpeg_filter: remove an always-true check

ost->enc is always non-NULL here, since
- this code is never called for streamcopy
- opening the output file will fail if an encoder cannot be found, so
  filters are never initialized

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

 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 4e2787eba2..e9479018e4 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -105,7 +105,7 @@ static const char *choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint)
     if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) {
         return av_get_pix_fmt_name(choose_pixel_fmt(ost->enc, ost->enc_ctx->pix_fmt,
                                                     ost->enc_ctx->strict_std_compliance));
-    } else if (ost->enc && ost->enc->pix_fmts) {
+    } else if (ost->enc->pix_fmts) {
         const enum AVPixelFormat *p;
 
         p = ost->enc->pix_fmts;



More information about the ffmpeg-cvslog mailing list