mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg
Reversing approved by patch author Originally committed as revision 4646 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
adeba28193
commit
e6885654eb
@ -48,7 +48,7 @@
|
||||
#define WFRAC_BITS 14 /* fractional bits for window */
|
||||
#endif
|
||||
|
||||
#if defined(USE_HIGHPRECISION)
|
||||
#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
|
||||
typedef int32_t OUT_INT;
|
||||
#define OUT_MAX INT32_MAX
|
||||
#define OUT_MIN INT32_MIN
|
||||
@ -329,7 +329,7 @@ static int decode_init(AVCodecContext * avctx)
|
||||
static int init=0;
|
||||
int i, j, k;
|
||||
|
||||
#if defined(USE_HIGHPRECISION)
|
||||
#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
|
||||
avctx->sample_fmt= SAMPLE_FMT_S32;
|
||||
#else
|
||||
avctx->sample_fmt= SAMPLE_FMT_S16;
|
||||
|
Loading…
Reference in New Issue
Block a user