ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Sep 4 11:42:23 2015 +0200| [cf410f8fb94d2052909f7c2bc5c3a0eee06511ba] | committer: Michael Niedermayer
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 <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf410f8fb94d2052909f7c2bc5c3a0eee06511ba --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 9f9170e..2b3085a 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
