aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhao <barryjzhao@tencent.com>2019-09-09 09:39:38 +0800
committerJun Zhao <barryjzhao@tencent.com>2019-09-09 16:03:17 +0800
commita0abcb4a31c35e35f6e4afdc5b0fc2d902dc45f7 (patch)
tree2e888d064b4867fd6f148dde8d4d35bed444999d
parent4e759b56754a2d9843502c4a177bb66eb95d5ed8 (diff)
downloadffmpeg-a0abcb4a31c35e35f6e4afdc5b0fc2d902dc45f7.tar.gz
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@gmail.com> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
-rw-r--r--libavfilter/avf_concat.c2
1 files changed, 1 insertions, 1 deletions
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);