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

diff --git a/configure b/configure
index 73b64e50a5f130a66abcfc050156899c24948c01..a3c668fca6dc7f5d19ff7afada51aff15e802eff 100755 (executable)
--- 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 84bb8ed570e71b20150520bcb58ca9a4404f5c27..23f9b69772a8ee7419beddfbbcdba61c30a1c135 100644 (file)
--- 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 8880c40600314992bd3d25f6f80df0b57d7616df..f7fbf5f788494b8ff29fa2628076b57968f6073a 100644 (file)
--- 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 ae1db1f39adef4f08e40e0271a42b241b155a288..a782381e324b384f31bcde97fdc2c6d60264472c 100644 (file)
--- 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),