summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-12-22 22:54:25 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-12-25 16:22:14 (GMT)
commita752b9b8635ab11f464e215dee76ac02ef6f9a70 (patch)
treecbffcbdf0d14834792d53d46a6ed063817ed94b9
parentf9e55c0fed8ca7c8d3df4a3dfb1b3664209bd1dd (diff)
downloadffmpeg-a752b9b8635ab11f464e215dee76ac02ef6f9a70.zip
ffmpeg-a752b9b8635ab11f464e215dee76ac02ef6f9a70.tar.gz
ffmpeg-a752b9b8635ab11f464e215dee76ac02ef6f9a70.tar.bz2
ffmpeg: use the new swr -async parameter instead of a set of parameters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffmpeg_filter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index ebd44e3..ab2c492 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -661,9 +661,9 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter,
if (audio_sync_method > 0) {
char args[256] = {0};
- av_strlcatf(args, sizeof(args), "min_comp=0.001:min_hard_comp=%f", audio_drift_threshold);
- if (audio_sync_method > 1)
- av_strlcatf(args, sizeof(args), ":max_soft_comp=%f", audio_sync_method/(double)ist->st->codec->sample_rate);
+ av_strlcatf(args, sizeof(args), "async=%d", audio_sync_method);
+ if (audio_drift_threshold != 0.1)
+ av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold);
AUTO_INSERT_FILTER_INPUT("-async", "aresample", args);
}