generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics: Move some more code around to avoid #ifdeffery.

Browse Source 
Originally committed as revision 18846 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-05-15 18:54:36 +00:00
parent c005a3ba59
commit 9c0ef69af7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/libamr.c
View File

@@ -292,7 +292,6 @@ AVCodec libamr_nb_encoder =
#define typedef_h #define typedef_h
#endif #endif
#include <amrwb/enc_if.h>
#include <amrwb/dec_if.h> #include <amrwb/dec_if.h>
#include <amrwb/if_rom.h> #include <amrwb/if_rom.h>
@@ -303,6 +302,15 @@ typedef struct AMRWB_bitrates
int mode; int mode;
} AMRWB_bitrates; } 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) static int getWBBitrateMode(int bitrate)
{ {
/* make the correspondance between bitrate and mode */ /* make the correspondance between bitrate and mode */
@@ -329,14 +337,6 @@ static int getWBBitrateMode(int bitrate)
return -1; 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) static av_cold int amr_wb_encode_init(AVCodecContext * avctx)
{ {
AMRWBContext *s = avctx->priv_data; AMRWBContext *s = avctx->priv_data;