[FFmpeg-cvslog] r9171 - in trunk: configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/faac.c

[diego]

Author: diego
Date: Sat Jun  2 13:20:24 2007
New Revision: 9171

Log:
Rename faac_encoder to libfaac_encoder for consistency and to be able to
more easily add a possible future native encoder.


Modified:
   trunk/configure
   trunk/libavcodec/allcodecs.c
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/faac.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Jun  2 13:20:24 2007
@@ -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"

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	(original)
+++ trunk/libavcodec/allcodecs.c	Sat Jun  2 13:20:24 2007
@@ -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);

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Sat Jun  2 13:20:24 2007
@@ -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;

Modified: trunk/libavcodec/faac.c
==============================================================================
--- trunk/libavcodec/faac.c	(original)
+++ trunk/libavcodec/faac.c	Sat Jun  2 13:20:24 2007
@@ -143,8 +143,8 @@ static int Faac_encode_close(AVCodecCont
     return 0;
 }
 
-AVCodec faac_encoder = {
-    "aac",
+AVCodec libfaac_encoder = {
+    "libfaac",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(FaacAudioContext),