changeset 4898:3df69e140c33 libavcodec

Give libamr decoders/encoders a lib prefix in the name.

--- a/Makefile	Thu May 03 09:35:54 2007 +0000
+++ b/Makefile	Thu May 03 10:38:03 2007 +0000
@@ -260,7 +260,7 @@
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 
 # external codec libraries
-OBJS-$(CONFIG_AMR)                     += amr.o
+OBJS-$(CONFIG_LIBAMR)                  += amr.o
 OBJS-$(CONFIG_LIBA52)                  += a52dec.o
 OBJS-$(CONFIG_LIBDTS)                  += dtsdec.o
 OBJS-$(CONFIG_LIBFAAC)                 += faac.o

--- a/allcodecs.c	Thu May 03 09:35:54 2007 +0000
+++ b/allcodecs.c	Thu May 03 10:38:03 2007 +0000
@@ -165,8 +165,6 @@
     REGISTER_DECODER(MPEG4AAC, mpeg4aac);
     REGISTER_ENCODER(AC3, ac3);
     REGISTER_DECODER(ALAC, alac);
-    REGISTER_ENCDEC (AMR_NB, amr_nb);
-    REGISTER_ENCDEC (AMR_WB, amr_wb);
     REGISTER_DECODER(ATRAC3, atrac3);
     REGISTER_DECODER(COOK, cook);
     REGISTER_DECODER(DCA, dca);
@@ -174,6 +172,8 @@
     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_DECODER(LIBDTS, libdts);
     REGISTER_ENCDEC (LIBGSM, libgsm);

--- a/amr.c	Thu May 03 09:35:54 2007 +0000
+++ b/amr.c	Thu May 03 10:38:03 2007 +0000
@@ -65,7 +65,7 @@
 
 #include "avcodec.h"
 
-#ifdef CONFIG_AMR_NB_FIXED
+#ifdef CONFIG_LIBAMR_NB_FIXED
 
 #define MMS_IO
 
@@ -136,7 +136,7 @@
     avctx->frame_size = 160 * is_amr_wb;
 }
 
-#ifdef CONFIG_AMR_NB_FIXED
+#ifdef CONFIG_LIBAMR_NB_FIXED
 /* fixed point version*/
 /* frame size in serial bitstream file (frame type + serial stream + flags) */
 #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
@@ -352,7 +352,7 @@
 }
 
 
-#elif defined(CONFIG_AMR_NB) /* Float point version*/
+#elif defined(CONFIG_LIBAMR_NB) /* Float point version*/
 
 typedef struct AMRContext {
     int frameCount;
@@ -491,11 +491,11 @@
 
 #endif
 
-#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
+#if defined(CONFIG_LIBAMR_NB) || defined(CONFIG_LIBAMR_NB_FIXED)
 
-AVCodec amr_nb_decoder =
+AVCodec libamr_nb_decoder =
 {
-    "amr_nb",
+    "libamr_nb",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AMR_NB,
     sizeof(AMRContext),
@@ -505,9 +505,9 @@
     amr_nb_decode_frame,
 };
 
-AVCodec amr_nb_encoder =
+AVCodec libamr_nb_encoder =
 {
-    "amr_nb",
+    "libamr_nb",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AMR_NB,
     sizeof(AMRContext),
@@ -520,7 +520,7 @@
 #endif
 
 /* -----------AMR wideband ------------*/
-#ifdef CONFIG_AMR_WB
+#ifdef CONFIG_LIBAMR_WB
 
 #ifdef _TYPEDEF_H
 //To avoid duplicate typedefs from typdef in amr-nb
@@ -684,9 +684,9 @@
     return 0;
 }
 
-AVCodec amr_wb_decoder =
+AVCodec libamr_wb_decoder =
 {
-    "amr_wb",
+    "libamr_wb",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AMR_WB,
     sizeof(AMRWBContext),
@@ -696,9 +696,9 @@
     amr_wb_decode_frame,
 };
 
-AVCodec amr_wb_encoder =
+AVCodec libamr_wb_encoder =
 {
-    "amr_wb",
+    "libamr_wb",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AMR_WB,
     sizeof(AMRWBContext),
@@ -708,4 +708,4 @@
     NULL,
 };
 
-#endif //CONFIG_AMR_WB
+#endif //CONFIG_LIBAMR_WB

--- a/avcodec.h	Thu May 03 09:35:54 2007 +0000
+++ b/avcodec.h	Thu May 03 10:38:03 2007 +0000
@@ -2423,12 +2423,12 @@
 
 /* the following codecs use external libs */
 extern AVCodec aac_decoder;
-extern AVCodec amr_nb_decoder;
-extern AVCodec amr_nb_encoder;
-extern AVCodec amr_wb_decoder;
-extern AVCodec amr_wb_encoder;
 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 libdts_decoder;
 extern AVCodec libgsm_decoder;
 extern AVCodec libgsm_encoder;