virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_.

Browse Source 
CONFIG_ changed semantics and is always defined now.

Originally committed as revision 16598 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-01-14 07:57:12 +00:00
parent 576286ba81
commit 0f6a659ddf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegaudio.h
View File

@ -51,7 +51,7 @@
#define MP3_MASK 0xFFFE0CCF #define MP3_MASK 0xFFFE0CCF
#ifdef CONFIG_MPEGAUDIO_HP #if CONFIG_MPEGAUDIO_HP
#define FRAC_BITS 23 /* fractional bits for sb_samples and dct */ #define FRAC_BITS 23 /* fractional bits for sb_samples and dct */
#define WFRAC_BITS 16 /* fractional bits for window */ #define WFRAC_BITS 16 /* fractional bits for window */
#else #else
@ -63,7 +63,7 @@
#define FIX(a) ((int)((a) * FRAC_ONE)) #define FIX(a) ((int)((a) * FRAC_ONE))
#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
typedef int32_t OUT_INT; 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

2
libavcodec/mpegaudiodec.c
View File

@ -316,7 +316,7 @@ static int decode_init(AVCodecContext * avctx)
s->avctx = avctx; s->avctx = avctx;
#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) #if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
avctx->sample_fmt= SAMPLE_FMT_S32; avctx->sample_fmt= SAMPLE_FMT_S32;
#else #else
avctx->sample_fmt= SAMPLE_FMT_S16; avctx->sample_fmt= SAMPLE_FMT_S16;