diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-05-09 08:39:37 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-05-14 23:36:11 +0400 |
commit | 6eeb9a0433d793dbd86c43d3dea1a2f8015f1147 (patch) | |
tree | d76b6760e32c091c721b5bae3b46639545a0e807 | |
parent | 369cb092ecbbaff20bb0a2a1d60536c3bc04a8f0 (diff) |
avconv: automatically insert asyncts when -async is used.
Deprecate -async.
-rw-r--r-- | avconv.c | 27 | ||||
-rw-r--r-- | doc/avconv.texi | 1 |
2 files changed, 28 insertions, 0 deletions
@@ -703,6 +703,33 @@ static int configure_audio_filters(FilterGraph *fg, AVFilterContext **in_filter, *out_filter = format; } + if (audio_sync_method > 0) { + AVFilterContext *async; + char args[256]; + int len = 0; + + av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " + "asyncts audio filter instead.\n"); + + if (audio_sync_method > 1) + len += snprintf(args + len, sizeof(args) - len, "compensate=1:" + "max_comp=%d:", audio_sync_method); + snprintf(args + len, sizeof(args) - len, "min_delta=%f", + audio_drift_threshold); + + ret = avfilter_graph_create_filter(&async, + avfilter_get_by_name("asyncts"), + "async", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(*in_filter, 0, async, 0); + if (ret < 0) + return ret; + + *in_filter = async; + } + return 0; } diff --git a/doc/avconv.texi b/doc/avconv.texi index 511642a56d..d6e409612e 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -610,6 +610,7 @@ Audio sync method. "Stretches/squeezes" the audio stream to match the timestamps the parameter is the maximum samples per second by which the audio is changed. -async 1 is a special case where only the start of the audio stream is corrected without any later correction. +This option has been deprecated. Use the @code{asyncts} audio filter instead. @item -copyts Copy timestamps from input to output. @item -copytb |