[FFmpeg-cvslog] ffmpeg: remove unneeded ost->filter check

Michael Niedermayer git at videolan.org
Fri May 15 12:56:33 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 15 12:34:20 2015 +0200| [da2f1568439ff1786413899dbb4fe30d87ab2721] | committer: Michael Niedermayer

ffmpeg: remove unneeded ost->filter check

Fixes CID1241508

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 8c288ae..fde2bcf 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2886,7 +2886,7 @@ static int transcode_init(void)
                 break;
             case AVMEDIA_TYPE_VIDEO:
                 enc_ctx->time_base = av_inv_q(ost->frame_rate);
-                if (ost->filter && !(enc_ctx->time_base.num && enc_ctx->time_base.den))
+                if (!(enc_ctx->time_base.num && enc_ctx->time_base.den))
                     enc_ctx->time_base = ost->filter->filter->inputs[0]->time_base;
                 if (   av_q2d(enc_ctx->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH
                    && (video_sync_method == VSYNC_CFR || video_sync_method == VSYNC_VSCFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){



More information about the ffmpeg-cvslog mailing list