diff options
| -rw-r--r-- | Changelog | 3 | ||||
| -rw-r--r-- | ffmpeg.c | 5 | ||||
| -rw-r--r-- | ffmpeg_filter.c | 16 |
3 files changed, 14 insertions, 10 deletions
@@ -35,7 +35,8 @@ version <next>: the vid.stab library - astats filter - trim and atrim filters -- ffmpeg -t option is now sample-accurate when transcoding audio +- ffmpeg -t and -ss (output-only) options are now sample-accurate when + transcoding audio version 1.2: @@ -1059,11 +1059,6 @@ static int reap_filters(void) 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); - continue; - } } //if (ost->source_index >= 0) // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index b9e3e4eed1..58581c20d7 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -286,10 +286,12 @@ 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; - return 0; + // Use with duration and without output starttime is buggy with trim filters + if (!of->start_time) + return 0; trim = avfilter_get_by_name(name); if (!trim) { @@ -304,8 +306,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; |