summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-19 19:41:17 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-19 19:41:17 +0000
commit278d783cc7f9c720e85b9e8786be79122d32554a (patch)
tree6c551da5cb4ad8f2b621b881ee342b566d079fd1 /mplayer.c
parentca81202840dcc690142913183b982ab474bd12ee (diff)
downloadmpv-278d783cc7f9c720e85b9e8786be79122d32554a.tar.bz2
mpv-278d783cc7f9c720e85b9e8786be79122d32554a.tar.xz
Remove some pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30658 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index 566f955220..29f4e42d48 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1650,7 +1650,6 @@ void reinit_audio_chain(void) {
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 @@ void reinit_audio_chain(void) {
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 @@ void reinit_audio_chain(void) {
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;