diff options
| -rw-r--r-- | Changelog | 3 | ||||
| -rw-r--r-- | avconv.c | 5 | ||||
| -rw-r--r-- | avconv_filter.c | 12 |
3 files changed, 11 insertions, 9 deletions
@@ -14,7 +14,8 @@ version 10: - JPEG 2000 decoder - new asetpts filter (same as setpts, but for audio) - new trim and atrim filters -- avconv -t option is now sample-accurate when transcoding audio +- avconv -t and -ss (output-only) options are now sample-accurate when + transcoding audio version 9: @@ -681,11 +681,6 @@ static int poll_filter(OutputStream *ost) av_rescale_q(of->start_time, AV_TIME_BASE_Q, ost->st->codec->time_base); - - if (of->start_time && filtered_frame->pts < 0) { - av_frame_unref(filtered_frame); - return 0; - } } switch (ost->filter->filter->inputs[0]->type) { diff --git a/avconv_filter.c b/avconv_filter.c index 0a47c95191..1d8044d70b 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -183,7 +183,7 @@ static int insert_trim(OutputStream *ost, AVFilterContext **last_filter, int *pa char filter_name[128]; int ret = 0; - if (of->recording_time == INT64_MAX) + if (of->recording_time == INT64_MAX && !of->start_time) return 0; trim = avfilter_get_by_name(name); @@ -199,8 +199,14 @@ static int insert_trim(OutputStream *ost, AVFilterContext **last_filter, int *pa if (!ctx) return AVERROR(ENOMEM); - ret = av_opt_set_double(ctx, "duration", (double)of->recording_time / 1e6, - AV_OPT_SEARCH_CHILDREN); + if (of->recording_time != INT64_MAX) { + ret = av_opt_set_double(ctx, "duration", (double)of->recording_time / 1e6, + AV_OPT_SEARCH_CHILDREN); + } + if (ret >= 0 && of->start_time) { + ret = av_opt_set_double(ctx, "start", (double)of->start_time / 1e6, + AV_OPT_SEARCH_CHILDREN); + } if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Error configuring the %s filter", name); return ret; |