[FFmpeg-cvslog] r19442 - trunk/libavcodec/sonic.c
diego
subversion
Thu Jul 16 23:37:58 CEST 2009
Author: diego
Date: Thu Jul 16 23:37:58 2009
New Revision: 19442
Log:
cosmetics: Move some code blocks to reduce the number of #ifdefs.
Modified:
trunk/libavcodec/sonic.c
Modified: trunk/libavcodec/sonic.c
==============================================================================
--- trunk/libavcodec/sonic.c Thu Jul 16 18:12:57 2009 (r19441)
+++ trunk/libavcodec/sonic.c Thu Jul 16 23:37:58 2009 (r19442)
@@ -479,12 +479,7 @@ static void modified_levinson_durbin(int
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(AVCodecCon
#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(AVCodecCon
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
More information about the ffmpeg-cvslog
mailing list