Fixes non-monotonous timestamps.
Unified · Split
| @@ -174,7 +174,6 @@ static int config_output(AVFilterLink *outlink) · 173 unmodified lines | |||
| 174 | { | 174 | { |
| 175 | AVFilterContext *ctx = outlink->src; | 175 | AVFilterContext *ctx = outlink->src; |
| 176 | StackContext *s = ctx->priv; | 176 | StackContext *s = ctx->priv; |
| 177 | AVRational time_base = ctx->inputs[0]->time_base; | ||
| 178 | AVRational frame_rate = ctx->inputs[0]->frame_rate; | 177 | AVRational frame_rate = ctx->inputs[0]->frame_rate; |
| 179 | AVRational sar = ctx->inputs[0]->sample_aspect_ratio; | 178 | AVRational sar = ctx->inputs[0]->sample_aspect_ratio; |
| 180 | int height = ctx->inputs[0]->h; | 179 | int height = ctx->inputs[0]->h; |
| @@ -281,7 +280,6 @@ static int config_output(AVFilterLink *outlink) · 100 unmodified lines | |||
| 281 | 280 | ||
| 282 | outlink->w = width; | 281 | outlink->w = width; |
| 283 | outlink->h = height; | 282 | outlink->h = height; |
| 284 | outlink->time_base = time_base; | ||
| 285 | outlink->frame_rate = frame_rate; | 283 | outlink->frame_rate = frame_rate; |
| 286 | outlink->sample_aspect_ratio = sar; | 284 | outlink->sample_aspect_ratio = sar; |
| 287 | 285 | ||
| @@ -301,7 +299,10 @@ static int config_output(AVFilterLink *outlink) · 13 unmodified lines | |||
| 301 | in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY; | 299 | in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY; |
| 302 | } | 300 | } |
| 303 | 301 | ||
| 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; | ||
| 305 | } | 306 | } |
| 306 | 307 | ||
| 307 | static av_cold void uninit(AVFilterContext *ctx) | 308 | static av_cold void uninit(AVFilterContext *ctx) |