Mercurial > libavcodec.hg
changeset 5092:fd173be649b7 libavcodec
Rename aac_decoder to libfaad_decoder for consistency and to be able to
more easily add a possible future native decoder.
| author | diego |
|---|---|
| date | Sat, 02 Jun 2007 11:44:44 +0000 |
| parents | 160536e80ee6 |
| children | f0ffa056b77c |
| files | allcodecs.c avcodec.h faad.c |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/allcodecs.c Sat Jun 02 11:20:24 2007 +0000 +++ b/allcodecs.c Sat Jun 02 11:44:44 2007 +0000 @@ -164,7 +164,6 @@ 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 @@ 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);
--- a/avcodec.h Sat Jun 02 11:20:24 2007 +0000 +++ b/avcodec.h Sat Jun 02 11:44:44 2007 +0000 @@ -2422,13 +2422,13 @@ 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;
--- a/faad.c Sat Jun 02 11:20:24 2007 +0000 +++ b/faad.c Sat Jun 02 11:44:44 2007 +0000 @@ -324,7 +324,7 @@ } // 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);