Do not set audio_resample to 0 if audio_sync_method is > 1.
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 23 Jan 2011 01:06:59 +0000 (02:06 +0100)
committerMans Rullgard <mans@mansr.com>
Mon, 24 Jan 2011 17:30:33 +0000 (17:30 +0000)
commit07b48f8c7adaaf4020514816ec9b8d14cc8c5fbd
treef95681c396f6d7bcfe1ee25a6747f3d958a3eecc
parent78f318be59a8e6174f21c2d7c3403ef325c73011
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 <mans@mansr.com>
ffmpeg.c