diff --git a/configure b/configure index 568e66ab71d1b9172b5b765c0afa78e5ba5a5f12..6ea314c7768c6db37fc2839ae21bef2894562c4c 100755 --- a/configure +++ b/configure @@ -687,9 +687,9 @@ amr_nb_decoder_deps="amr_nb" amr_nb_encoder_deps="amr_nb" amr_wb_decoder_deps="amr_wb" amr_wb_encoder_deps="amr_wb" -dts_decoder_deps="libdts" faac_encoder_deps="libfaac" liba52_decoder_deps="liba52" +libdts_decoder_deps="libdts" libgsm_decoder_deps="libgsm" libgsm_encoder_deps="libgsm" libgsm_ms_decoder_deps="libgsm" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 893e6ceafdac6c34548bfb74524174e99011b311..54ca26118aae7cb8f7f3e032f49da6f0e5d68881 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -171,11 +171,11 @@ void avcodec_register_all(void) REGISTER_DECODER(COOK, cook); REGISTER_DECODER(DCA, dca); REGISTER_DECODER(DSICINAUDIO, dsicinaudio); - REGISTER_DECODER(DTS, dts); REGISTER_ENCODER(FAAC, faac); REGISTER_ENCDEC (FLAC, flac); REGISTER_DECODER(IMC, imc); REGISTER_DECODER(LIBA52, liba52); + REGISTER_DECODER(LIBDTS, libdts); 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 85d7712479a0bc508d70ddcc665ac1d0b91f6403..111eb6bf9c62e2d2cd85729821c702b77d023baf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2427,9 +2427,9 @@ extern AVCodec amr_nb_decoder; extern AVCodec amr_nb_encoder; extern AVCodec amr_wb_decoder; extern AVCodec amr_wb_encoder; -extern AVCodec dts_decoder; extern AVCodec faac_encoder; extern AVCodec liba52_decoder; +extern AVCodec libdts_decoder; extern AVCodec libgsm_decoder; extern AVCodec libgsm_encoder; extern AVCodec libgsm_ms_decoder; diff --git a/libavcodec/dtsdec.c b/libavcodec/dtsdec.c index 6763572ddd56244103c4ef87bb3548830780906d..1be7c84d7fc3e1d4ffc78ceb62325cc23a14b605 100644 --- a/libavcodec/dtsdec.c +++ b/libavcodec/dtsdec.c @@ -256,8 +256,8 @@ dts_decode_end(AVCodecContext * avctx) return 0; } -AVCodec dts_decoder = { - "dts", +AVCodec libdts_decoder = { + "libdts", CODEC_TYPE_AUDIO, CODEC_ID_DTS, sizeof(DTSContext),