diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:03:17 +0200 |
| commit | b97b4b58a6e1ac595002b3e3f3469161771c6003 (patch) | |
| tree | 8c2833931fb16084f95bf0adf8317e1fa28aca12 /libavcodec/mpegaudioenc.c | |
| parent | 67d441499a042edcfb0f8a120e6196d10b1d13db (diff) | |
| parent | a88ef93b4abbea9f18c8750113dc9e99931f2f8a (diff) | |
| download | ffmpeg-b97b4b58a6e1ac595002b3e3f3469161771c6003.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index de2a336e34..515da6f670 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -27,8 +27,9 @@ #include "avcodec.h" #include "put_bits.h" -#undef CONFIG_MPEGAUDIO_HP -#define CONFIG_MPEGAUDIO_HP 0 +#define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ +#define WFRAC_BITS 14 /* fractional bits for window */ + #include "mpegaudio.h" /* currently, cannot change these constants (need to modify |