[Ffmpeg-cvslog] r7939 - in trunk: configure libavcodec/a52dec.c libavcodec/allcodecs.c libavcodec/avcodec.h

[diego]

Author: diego
Date: Sun Feb 11 20:02:59 2007
New Revision: 7939

Modified:
   trunk/configure
   trunk/libavcodec/a52dec.c
   trunk/libavcodec/allcodecs.c
   trunk/libavcodec/avcodec.h

Log:
Rename ac3 decoder to liba52 to prepare for native decoder.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Feb 11 20:02:59 2007
@@ -575,13 +575,13 @@
 
 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"

Modified: trunk/libavcodec/a52dec.c
==============================================================================
--- trunk/libavcodec/a52dec.c	(original)
+++ trunk/libavcodec/a52dec.c	Sun Feb 11 20:02:59 2007
@@ -230,7 +230,7 @@
     return 0;
 }
 
-AVCodec ac3_decoder = {
+AVCodec liba52_decoder = {
     "ac3",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AC3,

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	(original)
+++ trunk/libavcodec/allcodecs.c	Sun Feb 11 20:02:59 2007
@@ -152,7 +152,6 @@
     /* 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 @@
     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);

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Sun Feb 11 20:02:59 2007
@@ -2378,8 +2378,8 @@
 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;