diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-17 04:47:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-17 04:51:33 +0200 |
| commit | f8ae3a2108b612776e886d927b4a7289dde619f1 (patch) | |
| tree | c10fc78e3c6340c9513f99faadf077ee6c7d2986 /libavcodec/mpegaudio.h | |
| parent | e6e7ba0ce3aadef32f7f16f706c4a0406b5bd70f (diff) | |
| parent | 901ff51116f831c9082e14c80c7481dd3999aa30 (diff) | |
Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits
* qatar/master:
ffmpeg: fix -aspect cli option
Restructure video filter implementation in ffmpeg.c.
ffplay: remove audio_write_get_buf_size() forward declaration
lavfi: print key-frame and picture type information in ff_dlog_ref()
mathops: remove ancient confusing comment
cws2fws: Improve error message wording.
tools: Check the return value of write().
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
mpegaudio: remove OUT_MIN/MAX macros
Add missing #includes to mp3_header_(de)compress bsf
dct: fix indentation
dct: bypass table allocation for DCT_II of size 32
h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
Remove unused header mpegaudio3.h.
Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudio.h')
| -rw-r--r-- | libavcodec/mpegaudio.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 30ef349399..138085366f 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -35,8 +35,6 @@ #include "dsputil.h" #include "dct.h" -#define CONFIG_AUDIO_NONSHORT 0 - /* max frame size, in samples */ #define MPA_FRAME_SIZE 1152 @@ -69,19 +67,9 @@ #if CONFIG_FLOAT typedef float OUT_INT; -#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 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 AV_SAMPLE_FMT_S16 #endif #if CONFIG_FLOAT @@ -147,6 +135,9 @@ typedef struct MPADecodeContext { DECLARE_ALIGNED(16, INTFLOAT, sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT]; INTFLOAT mdct_buf[MPA_MAX_CHANNELS][SBLIMIT * 18]; /* previous samples, for layer 3 MDCT */ GranuleDef granules[2][2]; /* Used in Layer 3 */ +#ifdef DEBUG + int frame_count; +#endif int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3 int dither_state; int error_recognition; |