eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 06:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Browse Source 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2009-01-13 23:44:16 +00:00
parent 959da985b0
commit b250f9c66d
154 changed files with 757 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libamr.c
View File

@@ -65,7 +65,7 @@
#include "avcodec.h"
#ifdef CONFIG_LIBAMR_NB_FIXED
#if CONFIG_LIBAMR_NB_FIXED
#define MMS_IO
@@ -137,7 +137,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx)
avctx->sample_fmt = SAMPLE_FMT_S16;
}
#ifdef CONFIG_LIBAMR_NB_FIXED
#if CONFIG_LIBAMR_NB_FIXED
/* fixed point version*/
/* frame size in serial bitstream file (frame type + serial stream + flags) */
#define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
@@ -353,7 +353,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
}
#elif defined(CONFIG_LIBAMR_NB) /* Float point version*/
#elif CONFIG_LIBAMR_NB /* Float point version*/
typedef struct AMRContext {
int frameCount;
@@ -492,7 +492,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
#endif
#if defined(CONFIG_LIBAMR_NB) || defined(CONFIG_LIBAMR_NB_FIXED)
#if CONFIG_LIBAMR_NB || CONFIG_LIBAMR_NB_FIXED
AVCodec libamr_nb_decoder =
{
@@ -524,7 +524,7 @@ AVCodec libamr_nb_encoder =
#endif
/* -----------AMR wideband ------------*/
#ifdef CONFIG_LIBAMR_WB
#if CONFIG_LIBAMR_WB
#ifdef _TYPEDEF_H
//To avoid duplicate typedefs from typedef in amr-nb