[MPlayer-cvslog] r29841 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Fri Nov  6 17:10:19 2009
New Revision: 29841

Log:
Split assignment from error value check to avoid overcomplicated if () condition.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Fri Nov  6 17:08:00 2009	(r29840)
+++ trunk/mplayer.c	Fri Nov  6 17:10:19 2009	(r29841)
@@ -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;