[SCM] libav/experimental: cosmetics: Move some more code around to avoid #ifdeffery.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:45:55 UTC 2013
The following commit has been merged in the experimental branch:
commit 9c0ef69af73fd5b50f49895767e587f64bd45f66
Author: Diego Biurrun <diego at biurrun.de>
Date: Fri May 15 18:54:36 2009 +0000
cosmetics: Move some more code around to avoid #ifdeffery.
Originally committed as revision 18846 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c
index ee07721..a13facb 100644
--- a/libavcodec/libamr.c
+++ b/libavcodec/libamr.c
@@ -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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list