diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 21:46:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 21:46:35 +0100 |
| commit | afc660ab9bdfde49be14bcf9ddb38e3688a07511 (patch) | |
| tree | e6368ea4e9f65323462b90f3faa4737778d0a8ce | |
| parent | f9b89b61f819535b4dbe6c3e9f0d6fc8becf64cb (diff) | |
| parent | 5d6a990c115850326711c2f5be4d9fd33f399616 (diff) | |
| download | ffmpeg-afc660ab9bdfde49be14bcf9ddb38e3688a07511.tar.gz | |
Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'
* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
mpegaudioenc: Remove broken integer-only quantization code path
Conflicts:
libavcodec/mpegaudioenc.c
Mostly not merged, the integer code works fine.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 63c8460c32..b660acab4f 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -33,8 +33,13 @@ #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ #define WFRAC_BITS 14 /* fractional bits for window */ +/* define it to use floats in quantization (I don't like floats !) */ +#define USE_FLOATS + #include "mpegaudio.h" #include "mpegaudiodsp.h" +#include "mpegaudiodata.h" +#include "mpegaudiotab.h" /* currently, cannot change these constants (need to modify quantization stage) */ @@ -61,12 +66,6 @@ typedef struct MpegAudioContext { const unsigned char *alloc_table; } MpegAudioContext; -/* define it to use floats in quantization (I don't like floats !) */ -#define USE_FLOATS - -#include "mpegaudiodata.h" -#include "mpegaudiotab.h" - static av_cold int MPA_encode_init(AVCodecContext *avctx) { MpegAudioContext *s = avctx->priv_data; |