Index: codecs/codec_adpcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v
retrieving revision 1.15
diff -u -r1.15 codec_adpcm.c
--- codecs/codec_adpcm.c	17 Mar 2005 21:30:19 -0000	1.15
+++ codecs/codec_adpcm.c	11 Apr 2005 16:39:13 -0000
@@ -569,7 +569,7 @@
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_adpcm: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
Index: codecs/codec_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_alaw.c,v
retrieving revision 1.8
diff -u -r1.8 codec_alaw.c
--- codecs/codec_alaw.c	17 Mar 2005 21:30:19 -0000	1.8
+++ codecs/codec_alaw.c	11 Apr 2005 16:39:13 -0000
@@ -359,7 +359,7 @@
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_alaw: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
Index: codecs/codec_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v
retrieving revision 1.7
diff -u -r1.7 codec_g726.c
--- codecs/codec_g726.c	17 Mar 2005 21:30:19 -0000	1.7
+++ codecs/codec_g726.c	11 Apr 2005 16:39:14 -0000
@@ -1005,7 +1005,7 @@
        if (!strcasecmp(var->name, "genericplc")) {
          useplc = ast_true(var->value) ? 1 : 0;
          if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+           ast_verbose(VERBOSE_PREFIX_3 "codec_g726: %susing generic PLC\n", useplc ? "" : "not ");
        }
        var = var->next;
       }
Index: codecs/codec_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_gsm.c,v
retrieving revision 1.14
diff -u -r1.14 codec_gsm.c
--- codecs/codec_gsm.c	17 Mar 2005 21:30:19 -0000	1.14
+++ codecs/codec_gsm.c	11 Apr 2005 16:39:15 -0000
@@ -14,11 +14,6 @@
  * the GNU General Public License
  */
 
-#define TYPE_SILENCE	 0x2
-#define TYPE_HIGH	 0x0
-#define TYPE_LOW	 0x1
-#define TYPE_MASK	 0x3
-
 #include <asterisk/lock.h>
 #include <asterisk/translate.h>
 #include <asterisk/config.h>
@@ -282,7 +277,7 @@
 			       if (!strcasecmp(var->name, "genericplc")) {
 				       useplc = ast_true(var->value) ? 1 : 0;
 				       if (option_verbose > 2)
-					       ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+					       ast_verbose(VERBOSE_PREFIX_3 "codec_gsm: %susing generic PLC\n", useplc ? "" : "not ");
 			       }
 			       var = var->next;
 			}
Index: codecs/codec_lpc10.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v
retrieving revision 1.12
diff -u -r1.12 codec_lpc10.c
--- codecs/codec_lpc10.c	17 Mar 2005 21:30:19 -0000	1.12
+++ codecs/codec_lpc10.c	11 Apr 2005 16:39:15 -0000
@@ -357,7 +357,7 @@
                                if (!strcasecmp(var->name, "genericplc")) {
                                        useplc = ast_true(var->value) ? 1 : 0;
                                        if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+                                               ast_verbose(VERBOSE_PREFIX_3 "codec_lpc10: %susing generic PLC\n", useplc ? "" : "not ");
                                }
                                var = var->next;
                         }
Index: codecs/codec_ulaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/codec_ulaw.c,v
retrieving revision 1.9
diff -u -r1.9 codec_ulaw.c
--- codecs/codec_ulaw.c	17 Mar 2005 21:30:19 -0000	1.9
+++ codecs/codec_ulaw.c	11 Apr 2005 16:39:15 -0000
@@ -358,7 +358,7 @@
 	if (!strcasecmp(var->name, "genericplc")) {
 	  useplc = ast_true(var->value) ? 1 : 0;
 	  if (option_verbose > 2)
-	    ast_verbose(VERBOSE_PREFIX_3 "CODEC ULAW: %susing generic PLC\n", useplc ? "" : "not ");
+	    ast_verbose(VERBOSE_PREFIX_3 "codec_ulaw: %susing generic PLC\n", useplc ? "" : "not ");
 	}
 	var = var->next;
       }