Mercurial > mplayer.hg

changeset 30616:c104d493d690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some pointless '#if 1' preprocessor directives.
author diego
date Fri, 19 Feb 2010 19:41:17 +0000
parents 01c447d8cc30
children 22aef54d8833
files mplayer.c
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Feb 19 19:38:53 2010 +0000
+++ b/mplayer.c	Fri Feb 19 19:41:17 2010 +0000
@@ -1650,7 +1650,6 @@
     ao_data.samplerate=force_srate;
     ao_data.channels=0;
     ao_data.format=audio_output_format;
-#if 1
     // first init to detect best values
     if(!init_audio_filters(mpctx->sh_audio,   // preliminary init
                            // input:
@@ -1660,7 +1659,6 @@
         mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
         exit_player(EXIT_ERROR);
     }
-#endif
     current_module="ao2_init";
     mpctx->audio_out = init_best_audio_out(audio_driver_list,
                                            0, // plugin flag
@@ -1682,13 +1680,11 @@
     if(strlen(mpctx->audio_out->info->comment) > 0)
         mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", mpctx->audio_out->info->comment);
     // init audio filters:
-#if 1
     current_module="af_init";
     if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
         mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
         goto init_error;
     }
-#endif
     mpctx->mixer.audio_out = mpctx->audio_out;
     mpctx->mixer.volstep = volstep;
     return;