aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-04 11:42:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-04 11:42:23 +0200
commitcf410f8fb94d2052909f7c2bc5c3a0eee06511ba (patch)
treefa710512dfb245d64caad6e1ce8f207dadf31735 /ffmpeg.c
parente9c58033e884b6ec8b8628793bb3d65c124b6590 (diff)
downloadandroid_external_ffmpeg-cf410f8fb94d2052909f7c2bc5c3a0eee06511ba.tar.gz
android_external_ffmpeg-cf410f8fb94d2052909f7c2bc5c3a0eee06511ba.tar.bz2
android_external_ffmpeg-cf410f8fb94d2052909f7c2bc5c3a0eee06511ba.zip
ffmpeg: Drop redundant ist check
stream copy always has a input stream, it cannot use complex video/audio filters with unambigous input Fixes CID1322348 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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 9f9170e327..2b3085afea 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2914,7 +2914,7 @@ static int transcode_init(void)
enc_ctx->time_base = dec_ctx->time_base;
}
- if (ist && !ost->frame_rate.num)
+ if (!ost->frame_rate.num)
ost->frame_rate = ist->framerate;
if(ost->frame_rate.num)
enc_ctx->time_base = av_inv_q(ost->frame_rate);