Mercurial > libavcodec.hg

changeset 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 a1d02ca0d339
children 4b3626936f09
files mpegaudiodec.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mpegaudiodec.c	Sat Oct 15 14:33:11 2005 +0000
+++ b/mpegaudiodec.c	Sat Oct 15 16:29:58 2005 +0000
@@ -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 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;