apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 20:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify: group all the AUDIO_NONSHORT parameters in the same place

Browse Source 
Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2009-01-14 21:41:05 +00:00
parent e29a95b1b8
commit 49cdad8d78
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegaudio.h
View File

@@ -68,11 +68,13 @@ typedef int32_t OUT_INT;
#define OUT_MAX INT32_MAX #define OUT_MAX INT32_MAX
#define OUT_MIN INT32_MIN #define OUT_MIN INT32_MIN
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
#define OUT_FMT SAMPLE_FMT_S32
#else #else
typedef int16_t OUT_INT; typedef int16_t OUT_INT;
#define OUT_MAX INT16_MAX #define OUT_MAX INT16_MAX
#define OUT_MIN INT16_MIN #define OUT_MIN INT16_MIN
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
#define OUT_FMT SAMPLE_FMT_S16
#endif #endif
#if FRAC_BITS <= 15 #if FRAC_BITS <= 15

6
libavcodec/mpegaudiodec.c
View File

@@ -316,11 +316,7 @@ static int decode_init(AVCodecContext * avctx)
s->avctx = avctx; s->avctx = avctx;
#if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT avctx->sample_fmt= OUT_FMT;
avctx->sample_fmt= SAMPLE_FMT_S32;
#else
avctx->sample_fmt= SAMPLE_FMT_S16;
#endif
s->error_recognition= avctx->error_recognition; s->error_recognition= avctx->error_recognition;
if(avctx->antialias_algo != FF_AA_FLOAT) if(avctx->antialias_algo != FF_AA_FLOAT)