diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-06-02 11:44:44 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-06-02 11:44:44 +0000 |
| commit | 69ddbd1dada13612582aac97ffe2a3222952d011 (patch) | |
| tree | 9b32c27e7b74492500f7337c5bfccbe9c744a45d | |
| parent | c9171a830b99b83317019d50f711637b7b2ff1d5 (diff) | |
| download | ffmpeg-streaming-69ddbd1dada13612582aac97ffe2a3222952d011.zip ffmpeg-streaming-69ddbd1dada13612582aac97ffe2a3222952d011.tar.gz | |
Rename aac_decoder to libfaad_decoder for consistency and to be able to
more easily add a possible future native decoder.
Originally committed as revision 9172 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/faad.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -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" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 23f9b69..5956f19 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f7fbf5f..53d4b3f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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; diff --git a/libavcodec/faad.c b/libavcodec/faad.c index 672a975..8c265e3 100644 --- a/libavcodec/faad.c +++ b/libavcodec/faad.c @@ -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); |
