# HG changeset patch # User diego # Date 1242413676 0 # Node ID 356079de364239efb583d44d7de72b017b49ef45 # Parent e5ea408f6e2a80665840c2aefeaa200afbfda2bd cosmetics: Move some more code around to avoid #ifdeffery. diff -r e5ea408f6e2a -r 356079de3642 libamr.c --- a/libamr.c Fri May 15 17:34:26 2009 +0000 +++ b/libamr.c Fri May 15 18:54:36 2009 +0000 @@ -292,7 +292,6 @@ #define typedef_h #endif -#include #include #include @@ -303,6 +302,15 @@ int mode; } AMRWB_bitrates; +typedef struct AMRWBContext { + int frameCount; + void *state; + int mode; + Word16 allow_dtx; +} AMRWBContext; + +#include + static int getWBBitrateMode(int bitrate) { /* make the correspondance between bitrate and mode */ @@ -329,14 +337,6 @@ return -1; } - -typedef struct AMRWBContext { - int frameCount; - void *state; - int mode; - Word16 allow_dtx; -} AMRWBContext; - static av_cold int amr_wb_encode_init(AVCodecContext * avctx) { AMRWBContext *s = avctx->priv_data;