git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e9c5803
)
ffmpeg: Drop redundant ist check
author
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 4 Sep 2015 09:42:23 +0000
(11:42 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 4 Sep 2015 09:42:23 +0000
(11:42 +0200)
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>
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
9f9170e
..
2b3085a
100644
(file)
--- 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);