Skip to content

F
ffmpeg
Commit c7bbc6cd authored by Mans Rullgard's avatar Mans Rullgard
Browse files
Options

mpegaudio: merge two #if CONFIG_FLOAT blocks 

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 918d0584
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
libavcodec/mpegaudio.h
View file @ c7bbc6cd
...@@ -62,21 +62,18 @@ ...@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment