changeset 30566:ac4bcd2064ce

libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions.

--- a/libmpcodecs/ad_faad.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/ad_faad.c	Wed Feb 17 21:36:00 2010 +0000
@@ -96,7 +96,6 @@
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n");
   }
   if(!sh->codecdata_len) {
-#if 1
     faacDecConfigurationPtr faac_conf;
     /* Set the default object type and samplerate */
     /* This is useful for RAW AAC files */
@@ -125,7 +124,6 @@
     //faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available.
 
     faacDecSetConfiguration(faac_hdec, faac_conf);
-#endif
 
     sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size);
     pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);

--- a/libmpcodecs/ad_qtaudio.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/ad_qtaudio.c	Wed Feb 17 21:36:00 2010 +0000
@@ -118,7 +118,6 @@
         mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" );
 	return 1;
     }
-#if 1
     InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML");
 	if ( InitializeQTML == NULL )
     {
@@ -173,7 +172,6 @@
         mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n");
 		return 1;
     }
-#endif
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
 	return 0;
 }
@@ -207,7 +205,6 @@
     }
 #endif
 
-#if 1
 	OutputFormatInfo.flags = InputFormatInfo.flags = 0;
 	OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0;
 	OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL;
@@ -257,8 +254,6 @@
     sh->i_bps=sh->wf->nAvgBytesPerSec;
 //InputBufferSize*WantedBufferSize/OutputBufferSize;
 
-#endif
-
    if(sh->format==0x3343414D){
        // MACE 3:1
        sh->ds->ss_div = 2*3; // 1 samples/packet

--- a/libmpcodecs/dec_teletext.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/dec_teletext.c	Wed Feb 17 21:36:00 2010 +0000
@@ -952,7 +952,6 @@
         color=-1;bkg=-1;
         fprintf(f,"|\n");
     }
-#if 1
     //for debug
     fprintf(f,"+====================raw=================+\n");
     for(i=0;i<VBI_ROWS;i++){
@@ -966,7 +965,6 @@
             fprintf(f,"%02x ",dp[i*VBI_COLUMNS+j].lng);
         fprintf(f,"\n");
     }
-#endif
     fprintf(f,"+========================================+\n");
 }
 

--- a/libmpcodecs/vd_vfw.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/vd_vfw.c	Wed Feb 17 21:36:00 2010 +0000
@@ -127,7 +127,6 @@
     case VDCTRL_SET_PP_LEVEL:
 	vfw_set_postproc(sh,10*(*((int*)arg)));
 	return CONTROL_OK;
-#if 1
     // FIXME: make this optional...
     case VDCTRL_QUERY_FORMAT:
       {
@@ -147,7 +146,6 @@
 	}
 	return CONTROL_TRUE;
       }
-#endif
     }
     return CONTROL_UNKNOWN;
 }
@@ -230,7 +228,6 @@
 	priv->o_bih->biCompression = 0;
 
     // sanity check:
-#if 1
 #ifdef BUILD_VFWEX
     ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih);
 #else
@@ -242,7 +239,6 @@
 //	return 0;
     } else
 	mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n");
-#endif
 
 #ifdef BUILD_VFWEX
     ret = ICDecompressBeginEx(priv->handle, sh->bih, priv->o_bih);

--- a/libmpcodecs/ve_vfw.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/ve_vfw.c	Wed Feb 17 21:36:00 2010 +0000
@@ -96,7 +96,6 @@
   }
   mp_msg(MSGT_WIN32,MSGL_INFO,"HIC: %x\n", encoder_hic);
 
-#if 1
 {
   ICINFO icinfo;
 
@@ -118,7 +117,6 @@
     mp_msg(MSGT_WIN32,MSGL_INFO," temp-quality");
 mp_msg(MSGT_WIN32,MSGL_INFO,"\n");
 }
-#endif
 
   if(compdatafile){
     if (!strncmp(compdatafile, "dialog", 6)){

--- a/libmpcodecs/vf_expand.c	Wed Feb 17 21:29:05 2010 +0000
+++ b/libmpcodecs/vf_expand.c	Wed Feb 17 21:36:00 2010 +0000
@@ -285,13 +285,11 @@
 	    mpi->type, mpi->flags,
             FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
             FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
-#if 1
 	if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
 	  !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){
 	    mp_msg(MSGT_VFILTER, MSGL_INFO, MSGTR_MPCODECS_FullDRNotPossible);
 	    return;
 	}
-#endif
 	// set up mpi as a cropped-down image of dmpi:
 	if(mpi->flags&MP_IMGFLAG_PLANAR){
 	    mpi->planes[0]=vf->dmpi->planes[0]+