virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Do not set audio_resample to 0 if audio_sync_method is > 1.

Browse Source 
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 <mans@mansr.com>
(cherry picked from commit 07b48f8c7a)
This commit is contained in:
Stefano Sabatini
2011-01-23 02:06:59 +01:00
committed by Michael Niedermayer
parent 0fc1961ecc
commit 0f16f72552
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@@ -825,7 +825,9 @@ need_realloc:
if (ost->resample) if (ost->resample)
audio_resample_close(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_channels == enc->channels &&
ost->resample_sample_rate == enc->sample_rate) { ost->resample_sample_rate == enc->sample_rate) {
ost->resample = NULL; ost->resample = NULL;