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

mpegaudio: merge two #if CONFIG_FLOAT blocks 

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-05-16 18:59:25 +01:00
parent 918d0584a4
commit c7bbc6cd7a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegaudio.h
View File

@ -62,21 +62,18 @@
#define FIX(a) ((int)((a) * FRAC_ONE)) #define FIX(a) ((int)((a) * FRAC_ONE))
#if CONFIG_FLOAT
typedef float OUT_INT;
#else
typedef int16_t OUT_INT;
#endif
#if CONFIG_FLOAT #if CONFIG_FLOAT
# define INTFLOAT float # define INTFLOAT float
typedef float MPA_INT; typedef float MPA_INT;
typedef float OUT_INT;
#elif FRAC_BITS <= 15 #elif FRAC_BITS <= 15
# define INTFLOAT int # define INTFLOAT int
typedef int16_t MPA_INT; typedef int16_t MPA_INT;
typedef int16_t OUT_INT;
#else #else
# define INTFLOAT int # define INTFLOAT int
typedef int32_t MPA_INT; typedef int32_t MPA_INT;
typedef int16_t OUT_INT;
#endif #endif
#define MPA_DECODE_HEADER \ #define MPA_DECODE_HEADER \