# HG changeset patch
# User diego
# Date 1180783224 0
# Node ID 160536e80ee654d7492b15b6a2a056e28b1ba7e0
# Parent  20914da7d71b7d86f940e04189f6620ce442dab8
Rename faac_encoder to libfaac_encoder for consistency and to be able to
more easily add a possible future native encoder.

diff -r 20914da7d71b -r 160536e80ee6 allcodecs.c
--- a/allcodecs.c	Sat Jun 02 01:42:47 2007 +0000
+++ b/allcodecs.c	Sat Jun 02 11:20:24 2007 +0000
@@ -172,12 +172,12 @@
     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 -r 20914da7d71b -r 160536e80ee6 avcodec.h
--- a/avcodec.h	Sat Jun 02 01:42:47 2007 +0000
+++ b/avcodec.h	Sat Jun 02 11:20:24 2007 +0000
@@ -2423,12 +2423,12 @@
 
 /* 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 -r 20914da7d71b -r 160536e80ee6 faac.c
--- a/faac.c	Sat Jun 02 01:42:47 2007 +0000
+++ b/faac.c	Sat Jun 02 11:20:24 2007 +0000
@@ -143,8 +143,8 @@
     return 0;
 }
 
-AVCodec faac_encoder = {
-    "aac",
+AVCodec libfaac_encoder = {
+    "libfaac",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AAC,
     sizeof(FaacAudioContext),