Mercurial > libavcodec.hg

comparison mpegaudiodec.c @ 2911:7f2959d05900 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg Reversing approved by patch author
author rtognimp
date Sat, 15 Oct 2005 16:29:58 +0000
parents 59af72b453e3
children cc55bc1f8d92
comparison
equal deleted inserted replaced
2910:a1d02ca0d339 2911:7f2959d05900
46 #else 46 #else
47 #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ 47 #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */
48 #define WFRAC_BITS 14 /* fractional bits for window */ 48 #define WFRAC_BITS 14 /* fractional bits for window */
49 #endif 49 #endif
50 50
51 #if defined(USE_HIGHPRECISION) 51 #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
52 typedef int32_t OUT_INT; 52 typedef int32_t OUT_INT;
53 #define OUT_MAX INT32_MAX 53 #define OUT_MAX INT32_MAX
54 #define OUT_MIN INT32_MIN 54 #define OUT_MIN INT32_MIN
55 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) 55 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
56 #else 56 #else
327 { 327 {
328 MPADecodeContext *s = avctx->priv_data; 328 MPADecodeContext *s = avctx->priv_data;
329 static int init=0; 329 static int init=0;
330 int i, j, k; 330 int i, j, k;
331 331
332 #if defined(USE_HIGHPRECISION) 332 #if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
333 avctx->sample_fmt= SAMPLE_FMT_S32; 333 avctx->sample_fmt= SAMPLE_FMT_S32;
334 #else 334 #else
335 avctx->sample_fmt= SAMPLE_FMT_S16; 335 avctx->sample_fmt= SAMPLE_FMT_S16;
336 #endif 336 #endif
337 337