aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-15 12:34:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-15 12:34:20 +0200
commitda2f1568439ff1786413899dbb4fe30d87ab2721 (patch)
treed73f57bad2a7e0b2174cfe86a295bd39b9a4e127 /ffmpeg.c
parent3793caa5e2d1d16ed45771574b2ffc932497cfcf (diff)
downloadffmpeg-da2f1568439ff1786413899dbb4fe30d87ab2721.tar.gz
ffmpeg: remove unneeded ost->filter check
Fixes CID1241508 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 8c288ae366..fde2bcf54e 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)))){