diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-16 21:37:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-16 21:37:58 +0000 |
| commit | 359a9979adbd6bd4ba31221feb9e4dbdcfc2bba3 (patch) | |
| tree | 37db0ab77f6740d46aec25eb201f74e8823ef16f /libavcodec/sonic.c | |
| parent | 1eb0811e8d716e7c85c96d448c201d9bf601f8c9 (diff) | |
| download | ffmpeg-359a9979adbd6bd4ba31221feb9e4dbdcfc2bba3.tar.gz | |
cosmetics: Move some code blocks to reduce the number of #ifdefs.
Originally committed as revision 19442 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/sonic.c')
| -rw-r--r-- | libavcodec/sonic.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 00ae835873..178ae01528 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -479,12 +479,7 @@ static void modified_levinson_durbin(int *window, int window_entries, av_free(state); } -#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ -static const int samplerate_table[] = - { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 }; - -#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER static inline int code_samplerate(int samplerate) { switch (samplerate) @@ -750,6 +745,9 @@ static int sonic_encode_frame(AVCodecContext *avctx, #endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */ #if CONFIG_SONIC_DECODER +static const int samplerate_table[] = + { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 }; + static av_cold int sonic_decode_init(AVCodecContext *avctx) { SonicContext *s = avctx->priv_data; @@ -936,6 +934,18 @@ static int sonic_decode_frame(AVCodecContext *avctx, return (get_bits_count(&gb)+7)/8; } + +AVCodec sonic_decoder = { + "sonic", + CODEC_TYPE_AUDIO, + CODEC_ID_SONIC, + sizeof(SonicContext), + sonic_decode_init, + NULL, + sonic_decode_close, + sonic_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), +}; #endif /* CONFIG_SONIC_DECODER */ #if CONFIG_SONIC_ENCODER @@ -965,17 +975,3 @@ AVCodec sonic_ls_encoder = { .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), }; #endif - -#if CONFIG_SONIC_DECODER -AVCodec sonic_decoder = { - "sonic", - CODEC_TYPE_AUDIO, - CODEC_ID_SONIC, - sizeof(SonicContext), - sonic_decode_init, - NULL, - sonic_decode_close, - sonic_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Sonic"), -}; -#endif |