RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-02-17 21:36:00 +00:00
parent 05ef58b9f7
commit 0c3d44619b
6 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpcodecs/ad_faad.c
View File

@ -96,7 +96,6 @@ static int init(sh_audio_t *sh)
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n"); mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n");
} }
if(!sh->codecdata_len) { if(!sh->codecdata_len) {
#if 1
faacDecConfigurationPtr faac_conf; faacDecConfigurationPtr faac_conf;
/* Set the default object type and samplerate */ /* Set the default object type and samplerate */
/* This is useful for RAW AAC files */ /* 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. //faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available.
faacDecSetConfiguration(faac_hdec, faac_conf); 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); 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); pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);

5
libmpcodecs/ad_qtaudio.c
View File

@ -118,7 +118,6 @@ static int loader_init(void)
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" ); mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" );
return 1; return 1;
} }
#if 1
InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML"); InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML");
if ( InitializeQTML == NULL ) if ( InitializeQTML == NULL )
{ {
@ -173,7 +172,6 @@ static int loader_init(void)
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n"); mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n");
return 1; return 1;
} }
#endif
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
return 0; return 0;
} }
@ -207,7 +205,6 @@ static int preinit(sh_audio_t *sh){
} }
#endif #endif
#if 1
OutputFormatInfo.flags = InputFormatInfo.flags = 0; OutputFormatInfo.flags = InputFormatInfo.flags = 0;
OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0; OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0;
OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL; OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL;
@ -257,8 +254,6 @@ static int preinit(sh_audio_t *sh){
sh->i_bps=sh->wf->nAvgBytesPerSec; sh->i_bps=sh->wf->nAvgBytesPerSec;
//InputBufferSize*WantedBufferSize/OutputBufferSize; //InputBufferSize*WantedBufferSize/OutputBufferSize;
#endif
if(sh->format==0x3343414D){ if(sh->format==0x3343414D){
// MACE 3:1 // MACE 3:1
sh->ds->ss_div = 2*3; // 1 samples/packet sh->ds->ss_div = 2*3; // 1 samples/packet

2
libmpcodecs/dec_teletext.c
View File

@ -952,7 +952,6 @@ static void render2text(tt_page* pt,FILE* f,int colored){
color=-1;bkg=-1; color=-1;bkg=-1;
fprintf(f,"|\n"); fprintf(f,"|\n");
} }
#if 1
//for debug //for debug
fprintf(f,"+====================raw=================+\n"); fprintf(f,"+====================raw=================+\n");
for(i=0;i<VBI_ROWS;i++){ for(i=0;i<VBI_ROWS;i++){
@ -966,7 +965,6 @@ static void render2text(tt_page* pt,FILE* f,int colored){
fprintf(f,"%02x ",dp[i*VBI_COLUMNS+j].lng); fprintf(f,"%02x ",dp[i*VBI_COLUMNS+j].lng);
fprintf(f,"\n"); fprintf(f,"\n");
} }
#endif
fprintf(f,"+========================================+\n"); fprintf(f,"+========================================+\n");
} }

4
libmpcodecs/vd_vfw.c
View File

@ -127,7 +127,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
case VDCTRL_SET_PP_LEVEL: case VDCTRL_SET_PP_LEVEL:
vfw_set_postproc(sh,10*(*((int*)arg))); vfw_set_postproc(sh,10*(*((int*)arg)));
return CONTROL_OK; return CONTROL_OK;
#if 1
// FIXME: make this optional... // FIXME: make this optional...
case VDCTRL_QUERY_FORMAT: case VDCTRL_QUERY_FORMAT:
{ {
@ -147,7 +146,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
} }
return CONTROL_TRUE; return CONTROL_TRUE;
} }
#endif
} }
return CONTROL_UNKNOWN; return CONTROL_UNKNOWN;
} }
@ -230,7 +228,6 @@ static int init(sh_video_t *sh){
priv->o_bih->biCompression = 0; priv->o_bih->biCompression = 0;
// sanity check: // sanity check:
#if 1
#ifdef BUILD_VFWEX #ifdef BUILD_VFWEX
ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih); ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih);
#else #else
@ -242,7 +239,6 @@ static int init(sh_video_t *sh){
// return 0; // return 0;
} else } else
mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n"); mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n");
#endif
#ifdef BUILD_VFWEX #ifdef BUILD_VFWEX
ret = ICDecompressBeginEx(priv->handle, sh->bih, priv->o_bih); ret = ICDecompressBeginEx(priv->handle, sh->bih, priv->o_bih);

2
libmpcodecs/ve_vfw.c
View File

@ -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); mp_msg(MSGT_WIN32,MSGL_INFO,"HIC: %x\n", encoder_hic);
#if 1
{ {
ICINFO icinfo; 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," temp-quality");
mp_msg(MSGT_WIN32,MSGL_INFO,"\n"); mp_msg(MSGT_WIN32,MSGL_INFO,"\n");
} }
#endif
if(compdatafile){ if(compdatafile){
if (!strncmp(compdatafile, "dialog", 6)){ if (!strncmp(compdatafile, "dialog", 6)){

2
libmpcodecs/vf_expand.c
View File

@ -285,13 +285,11 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
mpi->type, mpi->flags, mpi->type, mpi->flags,
FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x), FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y)); FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
#if 1
if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) && if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
!(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){ !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){
mp_msg(MSGT_VFILTER, MSGL_INFO, MSGTR_MPCODECS_FullDRNotPossible); mp_msg(MSGT_VFILTER, MSGL_INFO, MSGTR_MPCODECS_FullDRNotPossible);
return; return;
} }
#endif
// set up mpi as a cropped-down image of dmpi: // set up mpi as a cropped-down image of dmpi:
if(mpi->flags&MP_IMGFLAG_PLANAR){ if(mpi->flags&MP_IMGFLAG_PLANAR){
mpi->planes[0]=vf->dmpi->planes[0]+ mpi->planes[0]=vf->dmpi->planes[0]+