diff options
Diffstat (limited to 'libavcodec/mpegaudiodec_fixed.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_fixed.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c index 2db1e184df..ad7ceb20b6 100644 --- a/libavcodec/mpegaudiodec_fixed.c +++ b/libavcodec/mpegaudiodec_fixed.c @@ -1,37 +1,37 @@ /* * Fixed-point MPEG audio decoder * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" #include "libavutil/samplefmt.h" -#define CONFIG_FLOAT 0 +#define USE_FLOATS 0 #include "mpegaudio.h" -#define SHR(a,b) ((a)>>(b)) +#define SHR(a,b) (((int)(a))>>(b)) /* WARNING: only correct for positive numbers */ #define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5)) #define FIXR(a) ((int)((a) * FRAC_ONE + 0.5)) #define FIXHR(a) ((int)((a) * (1LL<<32) + 0.5)) #define MULH3(x, y, s) MULH((s)*(x), y) -#define MULLx(x, y, s) MULL(x,y,s) +#define MULLx(x, y, s) MULL((int)(x),(y),s) #define RENAME(a) a ## _fixed #define OUT_FMT AV_SAMPLE_FMT_S16 #define OUT_FMT_P AV_SAMPLE_FMT_S16P |