[FFmpeg-cvslog] lavfi/concat: fix logic error in framerate check
Jun Zhao
git at videolan.org
Mon Sep 9 11:04:46 EEST 2019
ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Mon Sep 9 09:39:38 2019 +0800| [a0abcb4a31c35e35f6e4afdc5b0fc2d902dc45f7] | committer: Jun Zhao
lavfi/concat: fix logic error in framerate check
fix logic error in framerate check, it's introduced by commit
3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0abcb4a31c35e35f6e4afdc5b0fc2d902dc45f7
---
libavfilter/avf_concat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 2791859d8f..28bd5407ad 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -136,7 +136,7 @@ static int config_output(AVFilterLink *outlink)
for (seg = 1; seg < cat->nb_segments; seg++) {
inlink = ctx->inputs[in_no + seg * ctx->nb_outputs];
if (outlink->frame_rate.num != inlink->frame_rate.num ||
- outlink->frame_rate.den != outlink->frame_rate.den) {
+ outlink->frame_rate.den != inlink->frame_rate.den) {
av_log(ctx, AV_LOG_VERBOSE,
"Video inputs have different frame rates, output will be VFR\n");
outlink->frame_rate = av_make_q(1, 0);
More information about the ffmpeg-cvslog
mailing list