# HG changeset patch # User reimar # Date 1257523819 0 # Node ID 8867109cf6f6312390aae4ddaa2dfa3d5da2914f # Parent 93289dea4d15011e8639404e4bd198c795fc8bee Split assignment from error value check to avoid overcomplicated if () condition. diff -r 93289dea4d15 -r 8867109cf6f6 mplayer.c --- 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;