diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/sonic.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/sonic.c')
| -rw-r--r-- | libavcodec/sonic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 6e0bdc839b..44b4582682 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -408,7 +408,7 @@ static int predictor_calc_error(int *k, int *state, int order, int error) return x; } -#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) +#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER // Heavily modified Levinson-Durbin algorithm which // copes better with quantization, and calculates the // actual whitened result as it goes. @@ -479,12 +479,12 @@ static void modified_levinson_durbin(int *window, int window_entries, av_free(state); } -#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */ +#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ static const int samplerate_table[] = { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 }; -#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) +#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER static inline int code_samplerate(int samplerate) { switch (samplerate) @@ -747,9 +747,9 @@ static int sonic_encode_frame(AVCodecContext *avctx, flush_put_bits(&pb); return (put_bits_count(&pb)+7)/8; } -#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */ +#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ -#ifdef CONFIG_SONIC_DECODER +#if CONFIG_SONIC_DECODER static av_cold int sonic_decode_init(AVCodecContext *avctx) { SonicContext *s = avctx->priv_data; @@ -936,7 +936,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, } #endif /* CONFIG_SONIC_DECODER */ -#ifdef CONFIG_SONIC_ENCODER +#if CONFIG_SONIC_ENCODER AVCodec sonic_encoder = { "sonic", CODEC_TYPE_AUDIO, @@ -950,7 +950,7 @@ AVCodec sonic_encoder = { }; #endif -#ifdef CONFIG_SONIC_LS_ENCODER +#if CONFIG_SONIC_LS_ENCODER AVCodec sonic_ls_encoder = { "sonicls", CODEC_TYPE_AUDIO, @@ -964,7 +964,7 @@ AVCodec sonic_ls_encoder = { }; #endif -#ifdef CONFIG_SONIC_DECODER +#if CONFIG_SONIC_DECODER AVCodec sonic_decoder = { "sonic", CODEC_TYPE_AUDIO, |