qpeg: use reget_buffer() in decode_frame()

[ffmpeg] / libavcodec / mpegaudio.h

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index da81ac5cc31b4c2e3f6be3db6d70d0964832d2a4..fbfddcc5d25058d7542af94e2b76c347b6229006 100644 (file)
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -1,20 +1,20 @@
 /*
  * copyright (c) 2001 Fabrice Bellard
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -33,6 +33,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
+#include "dct.h"
 
 #define CONFIG_AUDIO_NONSHORT 0
 
@@ -71,19 +72,19 @@
 
 #if CONFIG_FLOAT
 typedef float OUT_INT;
-#define OUT_FMT SAMPLE_FMT_FLT
+#define OUT_FMT AV_SAMPLE_FMT_FLT
 #elif CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
 typedef int32_t OUT_INT;
 #define OUT_MAX INT32_MAX
 #define OUT_MIN INT32_MIN
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
-#define OUT_FMT SAMPLE_FMT_S32
+#define OUT_FMT AV_SAMPLE_FMT_S32
 #else
 typedef int16_t OUT_INT;
 #define OUT_MAX INT16_MAX
 #define OUT_MIN INT16_MIN
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
-#define OUT_FMT SAMPLE_FMT_S16
+#define OUT_FMT AV_SAMPLE_FMT_S16
 #endif
 
 #if CONFIG_FLOAT
@@ -156,6 +157,9 @@ typedef struct MPADecodeContext {
     int dither_state;
     int error_recognition;
     AVCodecContext* avctx;
+#if CONFIG_FLOAT
+    DCTContext dct;
+#endif
     void (*apply_window_mp3)(MPA_INT *synth_buf, MPA_INT *window,
                              int *dither_state, OUT_INT *samples, int incr);
 } MPADecodeContext;
@@ -184,6 +188,7 @@ void ff_mpa_synth_filter_float(MPADecodeContext *s,
                          INTFLOAT sb_samples[SBLIMIT]);
 
 void ff_mpegaudiodec_init_mmx(MPADecodeContext *s);
+void ff_mpegaudiodec_init_altivec(MPADecodeContext *s);
 
 /* fast header check for resync */
 static inline int ff_mpa_check_header(uint32_t header){