diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-11 19:02:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-11 19:02:59 +0000 |
| commit | f4ca50798037e3a512ebd3a357f29c40585c76b2 (patch) | |
| tree | 2d17526d7ef968187711906456b69570e8fc1c9d | |
| parent | 51e8750a9c33daf684de0a69f2bf5756a8ac0daa (diff) | |
| download | ffmpeg-f4ca50798037e3a512ebd3a357f29c40585c76b2.tar.gz | |
Rename ac3 decoder to liba52 to prepare for native decoder.
Originally committed as revision 7939 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/a52dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -575,13 +575,13 @@ zmbv_encoder_deps="zlib" aac_decoder_deps="libfaad" mpeg4aac_decoder_deps="libfaad" -ac3_decoder_deps="liba52bin" amr_nb_decoder_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_encoder_deps="amr_wb" dts_decoder_deps="libdts" faac_encoder_deps="libfaac" +liba52bin_decoder_deps="liba52" libgsm_decoder_deps="libgsm" libgsm_encoder_deps="libgsm" libtheora_encoder_deps="libtheora" diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c index ae67101dda..9f3948eb43 100644 --- a/libavcodec/a52dec.c +++ b/libavcodec/a52dec.c @@ -230,7 +230,7 @@ static int a52_decode_end(AVCodecContext *avctx) return 0; } -AVCodec ac3_decoder = { +AVCodec liba52_decoder = { "ac3", CODEC_TYPE_AUDIO, CODEC_ID_AC3, diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3c1d67c5d5..079120c7d6 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -152,7 +152,6 @@ void avcodec_register_all(void) /* audio codecs */ REGISTER_DECODER(AAC, aac); REGISTER_DECODER(MPEG4AAC, mpeg4aac); - REGISTER_DECODER(AC3, ac3); REGISTER_ENCODER(AC3, ac3); REGISTER_DECODER(ALAC, alac); REGISTER_ENCDEC (AMR_NB, amr_nb); @@ -163,6 +162,7 @@ void avcodec_register_all(void) REGISTER_ENCODER(FAAC, faac); REGISTER_ENCDEC (FLAC, flac); REGISTER_DECODER(IMC, imc); + REGISTER_DECODER(LIBA52, liba52); REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCODER(LIBTHEORA, libtheora); REGISTER_DECODER(MACE3, mace3); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a340fd7dc3..2773c50ac9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2378,8 +2378,8 @@ extern AVCodec rawvideo_decoder; extern AVCodec rawvideo_encoder; /* the following codecs use external GPL libs */ -extern AVCodec ac3_decoder; extern AVCodec dts_decoder; +extern AVCodec liba52_decoder; /* subtitles */ extern AVCodec dvbsub_decoder; |