Mercurial > mplayer.hg

changeset 29799:8867109cf6f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split assignment from error value check to avoid overcomplicated if () condition.
author reimar
date Fri, 06 Nov 2009 16:10:19 +0000
parents 93289dea4d15
children 606c9da862b7
files mplayer.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Fri Nov 06 16:08:00 2009 +0000
+++ b/mplayer.c	Fri Nov 06 16:10:19 2009 +0000
@@ -1634,11 +1634,12 @@
   }
 #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;