diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-06 23:54:01 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-06 23:54:01 +0000 |
| commit | 2eed5a461fa163b8b7ee86b9d86f46f188c101c5 (patch) | |
| tree | 8849e95250c98f21dba7791250366345d485e02b /libavcodec | |
| parent | 3ffab3613915854694dd7711c00f2f8a2fa39b8d (diff) | |
| download | ffmpeg-streaming-2eed5a461fa163b8b7ee86b9d86f46f188c101c5.zip ffmpeg-streaming-2eed5a461fa163b8b7ee86b9d86f46f188c101c5.tar.gz | |
Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
Originally committed as revision 7416 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 4 | ||||
| -rw-r--r-- | libavcodec/faad.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7ee2e86..9bf27d3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -243,8 +243,8 @@ OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o -OBJS-$(CONFIG_FAAD) += faad.o -OBJS-$(CONFIG_FAAC) += faac.o +OBJS-$(CONFIG_LIBFAAD) += faad.o +OBJS-$(CONFIG_LIBFAAC) += faac.o OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o OBJS-$(CONFIG_X264) += x264.o OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index f211a1a..ce9df7f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -160,7 +160,7 @@ void avcodec_register_all(void) #endif /* audio codecs */ -#ifdef CONFIG_FAAD +#ifdef CONFIG_LIBFAAD REGISTER_DECODER(AAC, aac); REGISTER_DECODER(MPEG4AAC, mpeg4aac); #endif @@ -180,7 +180,7 @@ void avcodec_register_all(void) #ifdef CONFIG_LIBDTS REGISTER_DECODER(DTS, dts); #endif -#ifdef CONFIG_FAAC +#ifdef CONFIG_LIBFAAC REGISTER_ENCODER(FAAC, faac); #endif REGISTER_ENCDEC (FLAC, flac); diff --git a/libavcodec/faad.c b/libavcodec/faad.c index df33ea0..80e5e0b 100644 --- a/libavcodec/faad.c +++ b/libavcodec/faad.c @@ -35,12 +35,12 @@ #endif /* - * when CONFIG_FAADBIN is defined the libfaad will be opened at runtime + * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime */ -//#undef CONFIG_FAADBIN -//#define CONFIG_FAADBIN +//#undef CONFIG_LIBFAADBIN +//#define CONFIG_LIBFAADBIN -#ifdef CONFIG_FAADBIN +#ifdef CONFIG_LIBFAADBIN #include <dlfcn.h> static const char* libfaadname = "libfaad.so.0"; #else @@ -208,7 +208,7 @@ static int faac_decode_init(AVCodecContext *avctx) FAACContext *s = (FAACContext *) avctx->priv_data; faacDecConfigurationPtr faac_cfg; -#ifdef CONFIG_FAADBIN +#ifdef CONFIG_LIBFAADBIN const char* err = 0; s->handle = dlopen(libfaadname, RTLD_LAZY); @@ -222,9 +222,9 @@ static int faac_decode_init(AVCodecContext *avctx) do { static const char* n = "faacDec" #a; \ if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0) for(;;) { -#else /* !CONFIG_FAADBIN */ +#else /* !CONFIG_LIBFAADBIN */ #define dfaac(a, b) s->faacDec ## a = faacDec ## a -#endif /* CONFIG_FAADBIN */ +#endif /* CONFIG_LIBFAADBIN */ // resolve all needed function calls dfaac(Open, (faacDecHandle FAADAPI (*)(void))); @@ -256,7 +256,7 @@ static int faac_decode_init(AVCodecContext *avctx) #endif #undef dfacc -#ifdef CONFIG_FAADBIN +#ifdef CONFIG_LIBFAADBIN break; } if (err) { |
