Fully back out the "defer-detect" patch.

Submitted by:	marius@alchemy.franken.de
PR:		33617, 35565

audio/mpg123/files/patch-ab

@@ -41,17 +41,7 @@ $FreeBSD$
      }
  
      return newfile;
-@@ -605,6 +609,9 @@
- 		}
- 
- 		if(fr->header_change > 1 || init) {
-+
-+			init_output();
-+
- 			old_rate = ai.rate;
- 			old_format = ai.format;
- 			old_channels = ai.channels;
-@@ -787,6 +794,10 @@
+@@ -784,6 +788,10 @@
          _wildcard(&argc,&argv);
  #endif
  
@@ -62,7 +52,7 @@ $FreeBSD$
  	if(sizeof(short) != 2) {
  		fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short));
  		exit(1);
-@@ -923,17 +933,6 @@
+@@ -917,17 +925,6 @@
  				&dirname, &filename))
  				fprintf(stderr, "\nDirectory: %s", dirname);
  			fprintf(stderr, "\nPlaying MPEG stream from %s ...\n", filename);