diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/faac.c | 4 |
4 files changed, 5 insertions, 5 deletions
@@ -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" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 84bb8ed570..23f9b69772 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8880c40600..f7fbf5f788 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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; diff --git a/libavcodec/faac.c b/libavcodec/faac.c index ae1db1f39a..a782381e32 100644 --- a/libavcodec/faac.c +++ b/libavcodec/faac.c @@ -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), |