summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:10:19 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:10:19 +0000
commit477057dbb5c2b3e395f52be95e2182eaa368cfdd (patch)
tree23cafb46f01a1e6ce93058cc5aaffb8a0bc29935 /mplayer.c
parente83addcbfa94015783d80f2979acce7aae512df8 (diff)
downloadmpv-477057dbb5c2b3e395f52be95e2182eaa368cfdd.tar.bz2
mpv-477057dbb5c2b3e395f52be95e2182eaa368cfdd.tar.xz
Split assignment from error value check to avoid overcomplicated if () condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29841 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 6768d2ec28..48d76f43a7 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1634,11 +1634,12 @@ void reinit_audio_chain(void) {
}
#endif
current_module="ao2_init";
- if(!(mpctx->audio_out=init_best_audio_out(audio_driver_list,
+ mpctx->audio_out = init_best_audio_out(audio_driver_list,
0, // plugin flag
ao_data.samplerate,
ao_data.channels,
- ao_data.format,0))){
+ ao_data.format,0);
+ if(!mpctx->audio_out){
// FAILED:
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
goto init_error;