History

avfilter/vf_stack: use time_base from framesync

Fixes non-monotonous timestamps.

Paul B Mahol committed 7 years ago

Commit bf15dcc1 parent f8577531 file · +4 −3Browse files

Unified · Split

libavfilter/vf_stack.c+4−3
@@ -174,7 +174,6 @@ static int config_output(AVFilterLink *outlink) · 173 unmodified lines
174174 {
175175 AVFilterContext *ctx = outlink->src;
176176 StackContext *s = ctx->priv;
177− AVRational time_base = ctx->inputs[0]->time_base;
178177 AVRational frame_rate = ctx->inputs[0]->frame_rate;
179178 AVRational sar = ctx->inputs[0]->sample_aspect_ratio;
180179 int height = ctx->inputs[0]->h;
@@ -281,7 +280,6 @@ static int config_output(AVFilterLink *outlink) · 100 unmodified lines
281280
282281 outlink->w = width;
283282 outlink->h = height;
284− outlink->time_base = time_base;
285283 outlink->frame_rate = frame_rate;
286284 outlink->sample_aspect_ratio = sar;
287285
@@ -301,7 +299,10 @@ static int config_output(AVFilterLink *outlink) · 13 unmodified lines
301299 in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY;
302300 }
303301
304− return ff_framesync_configure(&s->fs);
302+ ret = ff_framesync_configure(&s->fs);
303+ outlink->time_base = s->fs.time_base;
304+
305+ return ret;
305306 }
306307
307308 static av_cold void uninit(AVFilterContext *ctx)

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