History

lavfi/concat: fix logic error in framerate check

fix logic error in framerate check, it's introduced by commit 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616

Jun Zhao committed 7 years ago

Commit a0abcb41 parent 4e759b51 file · +1 −1Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/avf_concat.c+1−1
@@ -136,7 +136,7 @@ static int config_output(AVFilterLink *outlink) · 135 unmodified lines
136136 for (seg = 1; seg < cat->nb_segments; seg++) {
137137 inlink = ctx->inputs[in_no + seg * ctx->nb_outputs];
138138 if (outlink->frame_rate.num != inlink->frame_rate.num ||
139− outlink->frame_rate.den != outlink->frame_rate.den) {
139+ outlink->frame_rate.den != inlink->frame_rate.den) {
140140 av_log(ctx, AV_LOG_VERBOSE,
141141 "Video inputs have different frame rates, output will be VFR\n");
142142 outlink->frame_rate = av_make_q(1, 0);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t