Mercurial > libavcodec.hg
changeset 9652:356079de3642 libavcodec
cosmetics: Move some more code around to avoid #ifdeffery.
author | diego |
---|---|
date | Fri, 15 May 2009 18:54:36 +0000 |
parents | e5ea408f6e2a |
children | a572a4628a5a |
files | libamr.c |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 <amrwb/enc_if.h> #include <amrwb/dec_if.h> #include <amrwb/if_rom.h> @@ -303,6 +302,15 @@ int mode; } AMRWB_bitrates; +typedef struct AMRWBContext { + int frameCount; + void *state; + int mode; + Word16 allow_dtx; +} AMRWBContext; + +#include <amrwb/enc_if.h> + 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;