Commit 9c0ef69a authored by Diego Biurrun's avatar Diego Biurrun
Browse files

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

Originally committed as revision 18846 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c005a3ba
......@@ -292,7 +292,6 @@ AVCodec libamr_nb_encoder =
#define typedef_h
#endif
#include <amrwb/enc_if.h>
#include <amrwb/dec_if.h>
#include <amrwb/if_rom.h>
......@@ -303,6 +302,15 @@ typedef struct AMRWB_bitrates
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 @@ static int getWBBitrateMode(int bitrate)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment