diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 7c283641e4..4f62765257 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -96,7 +96,6 @@ static int init(sh_audio_t *sh) 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 @@ static int init(sh_audio_t *sh) //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); diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 25775afe11..188238233c 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -118,7 +118,6 @@ static int loader_init(void) 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 @@ static int loader_init(void) 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 @@ static int preinit(sh_audio_t *sh){ } #endif -#if 1 OutputFormatInfo.flags = InputFormatInfo.flags = 0; OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0; OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL; @@ -257,8 +254,6 @@ static int preinit(sh_audio_t *sh){ 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 diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c index 5be9812086..c2f125439d 100644 --- a/libmpcodecs/dec_teletext.c +++ b/libmpcodecs/dec_teletext.c @@ -952,7 +952,6 @@ static void render2text(tt_page* pt,FILE* f,int colored){ color=-1;bkg=-1; fprintf(f,"|\n"); } -#if 1 //for debug fprintf(f,"+====================raw=================+\n"); for(i=0;io_bih->biCompression = 0; // sanity check: -#if 1 #ifdef BUILD_VFWEX ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih); #else @@ -242,7 +239,6 @@ static int init(sh_video_t *sh){ // 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); diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 44e27025fd..ed8c7cebe0 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -96,7 +96,6 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, char *compdatafile, BI } mp_msg(MSGT_WIN32,MSGL_INFO,"HIC: %x\n", encoder_hic); -#if 1 { ICINFO icinfo; @@ -118,7 +117,6 @@ if (icinfo.dwFlags & VIDCF_QUALITYTIME) mp_msg(MSGT_WIN32,MSGL_INFO," temp-quality"); mp_msg(MSGT_WIN32,MSGL_INFO,"\n"); } -#endif if(compdatafile){ if (!strncmp(compdatafile, "dialog", 6)){ diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index f8d21fb762..c595a0d2f5 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -285,13 +285,11 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ 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]+