From b073819bc974965056f435d69dc51e9ec5877395 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 8 Apr 2012 15:00:01 -0400 Subject: [PATCH] avconv: allow '-async -1' to disable timestamp sync for audio encoding This will allow a workaround for cases where input timestamps are invalid or when decoder delay of 1 packet or more confuses avconv into using the wrong timestamps as a sync reference. --- avconv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avconv.c b/avconv.c index 2dce66f7f7..7344028bce 100644 --- a/avconv.c +++ b/avconv.c @@ -1101,7 +1101,7 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost, ost->reformat_pair = MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt); } - if (audio_sync_method) { + if (audio_sync_method > 0) { double delta = get_sync_ipts(ost, ist->last_dts) * enc->sample_rate - ost->sync_opts - av_fifo_size(ost->fifo) / (enc->channels * osize); int idelta = delta * dec->sample_rate / enc->sample_rate; @@ -1148,7 +1148,7 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost, av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate); } } - } else + } else if (audio_sync_method == 0) ost->sync_opts = lrintf(get_sync_ipts(ost, ist->last_dts) * enc->sample_rate) - av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong