Fixes non-monotonous timestamps.
Unified · Split
| @@ -311,7 +311,6 @@ static int config_output(AVFilterLink *outlink) · 310 unmodified lines | |||
| 311 | 311 | ||
| 312 | outlink->w = base->w; | 312 | outlink->w = base->w; |
| 313 | outlink->h = base->h; | 313 | outlink->h = base->h; |
| 314 | outlink->time_base = base->time_base; | ||
| 315 | outlink->sample_aspect_ratio = base->sample_aspect_ratio; | 314 | outlink->sample_aspect_ratio = base->sample_aspect_ratio; |
| 316 | outlink->frame_rate = base->frame_rate; | 315 | outlink->frame_rate = base->frame_rate; |
| 317 | 316 | ||
| @@ -330,7 +329,10 @@ static int config_output(AVFilterLink *outlink) · 12 unmodified lines | |||
| 330 | s->fs.opaque = s; | 329 | s->fs.opaque = s; |
| 331 | s->fs.on_event = process_frame; | 330 | s->fs.on_event = process_frame; |
| 332 | 331 | ||
| 333 | return ff_framesync_configure(&s->fs); | 332 | ret = ff_framesync_configure(&s->fs); |
| 333 | outlink->time_base = s->fs.time_base; | ||
| 334 | |||
| 335 | return ret; | ||
| 334 | } | 336 | } |
| 335 | 337 | ||
| 336 | static int activate(AVFilterContext *ctx) | 338 | static int activate(AVFilterContext *ctx) |