Originally committed as revision 7939 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -575,13 +575,13 @@ zmbv_encoder_deps="zlib" | |||||
| aac_decoder_deps="libfaad" | aac_decoder_deps="libfaad" | ||||
| mpeg4aac_decoder_deps="libfaad" | mpeg4aac_decoder_deps="libfaad" | ||||
| ac3_decoder_deps="liba52bin" | |||||
| amr_nb_decoder_deps_any="amr_nb amr_nb_fixed" | amr_nb_decoder_deps_any="amr_nb amr_nb_fixed" | ||||
| amr_nb_encoder_deps_any="amr_nb amr_nb_fixed" | amr_nb_encoder_deps_any="amr_nb amr_nb_fixed" | ||||
| amr_wb_decoder_deps="amr_wb" | amr_wb_decoder_deps="amr_wb" | ||||
| amr_wb_encoder_deps="amr_wb" | amr_wb_encoder_deps="amr_wb" | ||||
| dts_decoder_deps="libdts" | dts_decoder_deps="libdts" | ||||
| faac_encoder_deps="libfaac" | faac_encoder_deps="libfaac" | ||||
| liba52bin_decoder_deps="liba52" | |||||
| libgsm_decoder_deps="libgsm" | libgsm_decoder_deps="libgsm" | ||||
| libgsm_encoder_deps="libgsm" | libgsm_encoder_deps="libgsm" | ||||
| libtheora_encoder_deps="libtheora" | libtheora_encoder_deps="libtheora" | ||||
| @@ -230,7 +230,7 @@ static int a52_decode_end(AVCodecContext *avctx) | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| AVCodec ac3_decoder = { | |||||
| AVCodec liba52_decoder = { | |||||
| "ac3", | "ac3", | ||||
| CODEC_TYPE_AUDIO, | CODEC_TYPE_AUDIO, | ||||
| CODEC_ID_AC3, | CODEC_ID_AC3, | ||||
| @@ -152,7 +152,6 @@ void avcodec_register_all(void) | |||||
| /* audio codecs */ | /* audio codecs */ | ||||
| REGISTER_DECODER(AAC, aac); | REGISTER_DECODER(AAC, aac); | ||||
| REGISTER_DECODER(MPEG4AAC, mpeg4aac); | REGISTER_DECODER(MPEG4AAC, mpeg4aac); | ||||
| REGISTER_DECODER(AC3, ac3); | |||||
| REGISTER_ENCODER(AC3, ac3); | REGISTER_ENCODER(AC3, ac3); | ||||
| REGISTER_DECODER(ALAC, alac); | REGISTER_DECODER(ALAC, alac); | ||||
| REGISTER_ENCDEC (AMR_NB, amr_nb); | REGISTER_ENCDEC (AMR_NB, amr_nb); | ||||
| @@ -163,6 +162,7 @@ void avcodec_register_all(void) | |||||
| REGISTER_ENCODER(FAAC, faac); | REGISTER_ENCODER(FAAC, faac); | ||||
| REGISTER_ENCDEC (FLAC, flac); | REGISTER_ENCDEC (FLAC, flac); | ||||
| REGISTER_DECODER(IMC, imc); | REGISTER_DECODER(IMC, imc); | ||||
| REGISTER_DECODER(LIBA52, liba52); | |||||
| REGISTER_ENCDEC (LIBGSM, libgsm); | REGISTER_ENCDEC (LIBGSM, libgsm); | ||||
| REGISTER_ENCODER(LIBTHEORA, libtheora); | REGISTER_ENCODER(LIBTHEORA, libtheora); | ||||
| REGISTER_DECODER(MACE3, mace3); | REGISTER_DECODER(MACE3, mace3); | ||||
| @@ -2378,8 +2378,8 @@ extern AVCodec rawvideo_decoder; | |||||
| extern AVCodec rawvideo_encoder; | extern AVCodec rawvideo_encoder; | ||||
| /* the following codecs use external GPL libs */ | /* the following codecs use external GPL libs */ | ||||
| extern AVCodec ac3_decoder; | |||||
| extern AVCodec dts_decoder; | extern AVCodec dts_decoder; | ||||
| extern AVCodec liba52_decoder; | |||||
| /* subtitles */ | /* subtitles */ | ||||
| extern AVCodec dvbsub_decoder; | extern AVCodec dvbsub_decoder; | ||||