virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

mpegaudio: move OUT_FMT macro to mpegaudiodec.c

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-05-16 17:06:30 +01:00
parent 92ea249d7d
commit bdefbf3e88
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegaudio.h
View File

@ -67,11 +67,9 @@
#if CONFIG_FLOAT #if CONFIG_FLOAT
typedef float OUT_INT; typedef float OUT_INT;
#define OUT_FMT AV_SAMPLE_FMT_FLT
#else #else
typedef int16_t OUT_INT; typedef int16_t OUT_INT;
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
#define OUT_FMT AV_SAMPLE_FMT_S16
#endif #endif
#if CONFIG_FLOAT #if CONFIG_FLOAT

2
libavcodec/mpegaudiodec.c
View File

@ -47,6 +47,7 @@
# define MULH3(x, y, s) ((s)*(y)*(x)) # define MULH3(x, y, s) ((s)*(y)*(x))
# define MULLx(x, y, s) ((y)*(x)) # define MULLx(x, y, s) ((y)*(x))
# define RENAME(a) a ## _float # define RENAME(a) a ## _float
# define OUT_FMT AV_SAMPLE_FMT_FLT
#else #else
# define SHR(a,b) ((a)>>(b)) # define SHR(a,b) ((a)>>(b))
# define compute_antialias compute_antialias_integer # define compute_antialias compute_antialias_integer
@ -57,6 +58,7 @@
# define MULH3(x, y, s) MULH((s)*(x), y) # define MULH3(x, y, s) MULH((s)*(x), y)
# define MULLx(x, y, s) MULL(x,y,s) # define MULLx(x, y, s) MULL(x,y,s)
# define RENAME(a) a # define RENAME(a) a
# define OUT_FMT AV_SAMPLE_FMT_S16
#endif #endif
/****************/ /****************/