RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-11-11 21:46:35 +01:00
parent f9b89b61f8 5d6a990c11
commit afc660ab9b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegaudioenc.c
View File

@ -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;