Commit c9171a83 authored by Diego Biurrun's avatar Diego Biurrun

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
parent e5e587af
...@@ -711,12 +711,12 @@ zmbv_encoder_deps="zlib" ...@@ -711,12 +711,12 @@ zmbv_encoder_deps="zlib"
# external libraries # external libraries
aac_decoder_deps="libfaad" aac_decoder_deps="libfaad"
mpeg4aac_decoder_deps="libfaad" mpeg4aac_decoder_deps="libfaad"
faac_encoder_deps="libfaac"
liba52_decoder_deps="liba52" liba52_decoder_deps="liba52"
libamr_nb_decoder_deps="libamr_nb" libamr_nb_decoder_deps="libamr_nb"
libamr_nb_encoder_deps="libamr_nb" libamr_nb_encoder_deps="libamr_nb"
libamr_wb_decoder_deps="libamr_wb" libamr_wb_decoder_deps="libamr_wb"
libamr_wb_encoder_deps="libamr_wb" libamr_wb_encoder_deps="libamr_wb"
libfaac_encoder_deps="libfaac"
libgsm_decoder_deps="libgsm" libgsm_decoder_deps="libgsm"
libgsm_encoder_deps="libgsm" libgsm_encoder_deps="libgsm"
libgsm_ms_decoder_deps="libgsm" libgsm_ms_decoder_deps="libgsm"
......
...@@ -172,12 +172,12 @@ void avcodec_register_all(void) ...@@ -172,12 +172,12 @@ void avcodec_register_all(void)
REGISTER_DECODER(COOK, cook); REGISTER_DECODER(COOK, cook);
REGISTER_DECODER(DCA, dca); REGISTER_DECODER(DCA, dca);
REGISTER_DECODER(DSICINAUDIO, dsicinaudio); REGISTER_DECODER(DSICINAUDIO, dsicinaudio);
REGISTER_ENCODER(FAAC, faac);
REGISTER_ENCDEC (FLAC, flac); REGISTER_ENCDEC (FLAC, flac);
REGISTER_DECODER(IMC, imc); REGISTER_DECODER(IMC, imc);
REGISTER_ENCDEC (LIBAMR_NB, libamr_nb); REGISTER_ENCDEC (LIBAMR_NB, libamr_nb);
REGISTER_ENCDEC (LIBAMR_WB, libamr_wb); REGISTER_ENCDEC (LIBAMR_WB, libamr_wb);
REGISTER_DECODER(LIBA52, liba52); REGISTER_DECODER(LIBA52, liba52);
REGISTER_ENCODER(LIBFAAC, libfaac);
REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCDEC (LIBGSM, libgsm);
REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms);
REGISTER_ENCODER(LIBTHEORA, libtheora); REGISTER_ENCODER(LIBTHEORA, libtheora);
......
...@@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder; ...@@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder;
/* the following codecs use external libs */ /* the following codecs use external libs */
extern AVCodec aac_decoder; extern AVCodec aac_decoder;
extern AVCodec faac_encoder;
extern AVCodec liba52_decoder; extern AVCodec liba52_decoder;
extern AVCodec libamr_nb_decoder; extern AVCodec libamr_nb_decoder;
extern AVCodec libamr_nb_encoder; extern AVCodec libamr_nb_encoder;
extern AVCodec libamr_wb_decoder; extern AVCodec libamr_wb_decoder;
extern AVCodec libamr_wb_encoder; extern AVCodec libamr_wb_encoder;
extern AVCodec libfaac_encoder;
extern AVCodec libgsm_decoder; extern AVCodec libgsm_decoder;
extern AVCodec libgsm_encoder; extern AVCodec libgsm_encoder;
extern AVCodec libgsm_ms_decoder; extern AVCodec libgsm_ms_decoder;
......
...@@ -143,8 +143,8 @@ static int Faac_encode_close(AVCodecContext *avctx) ...@@ -143,8 +143,8 @@ static int Faac_encode_close(AVCodecContext *avctx)
return 0; return 0;
} }
AVCodec faac_encoder = { AVCodec libfaac_encoder = {
"aac", "libfaac",
CODEC_TYPE_AUDIO, CODEC_TYPE_AUDIO,
CODEC_ID_AAC, CODEC_ID_AAC,
sizeof(FaacAudioContext), sizeof(FaacAudioContext),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment