Mercurial > libavcodec.hg
changeset 9955:4ebcb6c121e4 libavcodec
cosmetics: Move some code blocks to reduce the number of #ifdefs.
| author | diego |
|---|---|
| date | Thu, 16 Jul 2009 21:37:58 +0000 |
| parents | 50327500e065 |
| children | 0448219eb490 |
| files | sonic.c |
| diffstat | 1 files changed, 15 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/sonic.c Tue Jul 14 23:12:43 2009 +0000 +++ b/sonic.c Thu Jul 16 21:37:58 2009 +0000 @@ -479,12 +479,7 @@ 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 @@ #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 @@ 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 @@ .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