virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Rename faac_encoder to libfaac_encoder for consistency and to be able to

Browse Source 
more easily add a possible future native encoder.

Originally committed as revision 9171 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-06-02 11:20:24 +00:00
parent e5e587afbe
commit c9171a830b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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"

2
libavcodec/allcodecs.c
View File

@ -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);

2
libavcodec/avcodec.h
View File

@ -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;

4
libavcodec/faac.c
View File

@ -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),