xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename aac_decoder to libfaad_decoder for consistency and to be able to

Browse Source 
more easily add a possible future native decoder.

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

2
configure vendored
View File

@ -709,7 +709,6 @@ zmbv_decoder_deps="zlib"
zmbv_encoder_deps="zlib"
# external libraries
aac_decoder_deps="libfaad"
mpeg4aac_decoder_deps="libfaad"
liba52_decoder_deps="liba52"
libamr_nb_decoder_deps="libamr_nb"
@ -717,6 +716,7 @@ libamr_nb_encoder_deps="libamr_nb"
libamr_wb_decoder_deps="libamr_wb"
libamr_wb_encoder_deps="libamr_wb"
libfaac_encoder_deps="libfaac"
libfaad_decoder_deps="libfaad"
libgsm_decoder_deps="libgsm"
libgsm_encoder_deps="libgsm"
libgsm_ms_decoder_deps="libgsm"

2
libavcodec/allcodecs.c
View File

@ -164,7 +164,6 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (ZMBV, zmbv);
/* audio codecs */
REGISTER_DECODER(AAC, aac);
REGISTER_DECODER(MPEG4AAC, mpeg4aac);
REGISTER_ENCODER(AC3, ac3);
REGISTER_DECODER(ALAC, alac);
@ -178,6 +177,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (LIBAMR_WB, libamr_wb);
REGISTER_DECODER(LIBA52, liba52);
REGISTER_ENCODER(LIBFAAC, libfaac);
REGISTER_DECODER(LIBFAAD, libfaad);
REGISTER_ENCDEC (LIBGSM, libgsm);
REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms);
REGISTER_ENCODER(LIBTHEORA, libtheora);

2
libavcodec/avcodec.h
View File

@ -2422,13 +2422,13 @@ extern AVCodec rawvideo_decoder;
extern AVCodec rawvideo_encoder;
/* the following codecs use external libs */
extern AVCodec aac_decoder;
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 libfaad_decoder;
extern AVCodec libgsm_decoder;
extern AVCodec libgsm_encoder;
extern AVCodec libgsm_ms_decoder;

2
libavcodec/faad.c
View File

@ -324,7 +324,7 @@ AVCodec name ## _decoder = { \
}
// FIXME - raw AAC files - maybe just one entry will be enough
AAC_CODEC(CODEC_ID_AAC, aac);
AAC_CODEC(CODEC_ID_AAC, libfaad);
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
// If it's mp4 file - usually embeded into Qt Mov
AAC_CODEC(CODEC_ID_MPEG4AAC, mpeg4aac);