[MPlayer-cvslog] r30608 - in trunk/libmpcodecs: ad_faad.c ad_qtaudio.c dec_teletext.c vd_vfw.c ve_vfw.c vf_expand.c
diego
subversion at mplayerhq.hu
Wed Feb 17 22:36:00 CET 2010
Author: diego
Date: Wed Feb 17 22:36:00 2010
New Revision: 30608
Log:
Remove pointless leftover '#if 1' preprocessor instructions.
Modified:
trunk/libmpcodecs/ad_faad.c
trunk/libmpcodecs/ad_qtaudio.c
trunk/libmpcodecs/dec_teletext.c
trunk/libmpcodecs/vd_vfw.c
trunk/libmpcodecs/ve_vfw.c
trunk/libmpcodecs/vf_expand.c
Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/ad_faad.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -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);
Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/ad_qtaudio.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -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
Modified: trunk/libmpcodecs/dec_teletext.c
==============================================================================
--- trunk/libmpcodecs/dec_teletext.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/dec_teletext.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -952,7 +952,6 @@ static void render2text(tt_page* pt,FILE
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 @@ static void render2text(tt_page* pt,FILE
fprintf(f,"%02x ",dp[i*VBI_COLUMNS+j].lng);
fprintf(f,"\n");
}
-#endif
fprintf(f,"+========================================+\n");
}
Modified: trunk/libmpcodecs/vd_vfw.c
==============================================================================
--- trunk/libmpcodecs/vd_vfw.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/vd_vfw.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -127,7 +127,6 @@ static int control(sh_video_t *sh,int cm
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 @@ static int control(sh_video_t *sh,int cm
}
return CONTROL_TRUE;
}
-#endif
}
return CONTROL_UNKNOWN;
}
@@ -230,7 +228,6 @@ static int init(sh_video_t *sh){
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 @@ 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);
Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/ve_vfw.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -96,7 +96,6 @@ static BITMAPINFOHEADER* vfw_open_encode
}
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)){
Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c Wed Feb 17 22:29:05 2010 (r30607)
+++ trunk/libmpcodecs/vf_expand.c Wed Feb 17 22:36:00 2010 (r30608)
@@ -285,13 +285,11 @@ static void get_image(struct vf_instance
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]+
More information about the MPlayer-cvslog
mailing list