summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-06-02 11:20:24 +0000
committerDiego Biurrun <diego@biurrun.de>2007-06-02 11:20:24 +0000
commitc9171a830b99b83317019d50f711637b7b2ff1d5 (patch)
tree198933a9eb1f4d634d4f3b208c43abc7018b7f94
parente5e587afbe165a30d809b45e533c27198670bdb3 (diff)
downloadffmpeg-streaming-c9171a830b99b83317019d50f711637b7b2ff1d5.zip
ffmpeg-streaming-c9171a830b99b83317019d50f711637b7b2ff1d5.tar.gz
Rename faac_encoder to libfaac_encoder for consistency and to be able to
more easily add a possible future native encoder. Originally committed as revision 9171 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/allcodecs.c2
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/faac.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 73b64e5..a3c668f 100755
--- a/configure
+++ b/configure
@@ -711,12 +711,12 @@ zmbv_encoder_deps="zlib"
# external libraries
aac_decoder_deps="libfaad"
mpeg4aac_decoder_deps="libfaad"
-faac_encoder_deps="libfaac"
liba52_decoder_deps="liba52"
libamr_nb_decoder_deps="libamr_nb"
libamr_nb_encoder_deps="libamr_nb"
libamr_wb_decoder_deps="libamr_wb"
libamr_wb_encoder_deps="libamr_wb"
+libfaac_encoder_deps="libfaac"
libgsm_decoder_deps="libgsm"
libgsm_encoder_deps="libgsm"
libgsm_ms_decoder_deps="libgsm"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 84bb8ed..23f9b69 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -172,12 +172,12 @@ void avcodec_register_all(void)
REGISTER_DECODER(COOK, cook);
REGISTER_DECODER(DCA, dca);
REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
- REGISTER_ENCODER(FAAC, faac);
REGISTER_ENCDEC (FLAC, flac);
REGISTER_DECODER(IMC, imc);
REGISTER_ENCDEC (LIBAMR_NB, libamr_nb);
REGISTER_ENCDEC (LIBAMR_WB, libamr_wb);
REGISTER_DECODER(LIBA52, liba52);
+ REGISTER_ENCODER(LIBFAAC, libfaac);
REGISTER_ENCDEC (LIBGSM, libgsm);
REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms);
REGISTER_ENCODER(LIBTHEORA, libtheora);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8880c40..f7fbf5f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder;
/* the following codecs use external libs */
extern AVCodec aac_decoder;
-extern AVCodec faac_encoder;
extern AVCodec liba52_decoder;
extern AVCodec libamr_nb_decoder;
extern AVCodec libamr_nb_encoder;
extern AVCodec libamr_wb_decoder;
extern AVCodec libamr_wb_encoder;
+extern AVCodec libfaac_encoder;
extern AVCodec libgsm_decoder;
extern AVCodec libgsm_encoder;
extern AVCodec libgsm_ms_decoder;
diff --git a/libavcodec/faac.c b/libavcodec/faac.c
index ae1db1f..a782381 100644
--- a/libavcodec/faac.c
+++ b/libavcodec/faac.c
@@ -143,8 +143,8 @@ static int Faac_encode_close(AVCodecContext *avctx)
return 0;
}
-AVCodec faac_encoder = {
- "aac",
+AVCodec libfaac_encoder = {
+ "libfaac",
CODEC_TYPE_AUDIO,
CODEC_ID_AAC,
sizeof(FaacAudioContext),
OpenPOWER on IntegriCloud