From 07b48f8c7adaaf4020514816ec9b8d14cc8c5fbd Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 23 Jan 2011 02:06:59 +0100 Subject: Do not set audio_resample to 0 if audio_sync_method is > 1. If audio_sync_method is >1 the resampler is used for audio drift compensation, and do_audio_out() was causing an assert failure because audio_resample was not set. Fix issue 2516, which was introduced by SVN r25939. Signed-off-by: Mans Rullgard --- ffmpeg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 0b2bab2cec..56b2dbed5e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -825,7 +825,9 @@ need_realloc: if (ost->resample) audio_resample_close(ost->resample); } - if (ost->resample_sample_fmt == enc->sample_fmt && + /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */ + if (audio_sync_method <= 1 && + ost->resample_sample_fmt == enc->sample_fmt && ost->resample_channels == enc->channels && ost->resample_sample_rate == enc->sample_rate) { ost->resample = NULL; -- cgit v1.2.3