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

[reimar]

Author: reimar
Date: Fri Nov  6 17:08:00 2009
New Revision: 29840

Log:
Reuse the init_error exit path also for init_best_audio_codec errors.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Fri Nov  6 17:06:33 2009	(r29839)
+++ trunk/mplayer.c	Fri Nov  6 17:08:00 2009	(r29840)
@@ -1611,9 +1611,7 @@ void reinit_audio_chain(void) {
   current_module="init_audio_codec";
   mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
   if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){
-    mpctx->sh_audio=mpctx->d_audio->sh=NULL; // failed to init :(
-    mpctx->d_audio->id = -2;
-    return;
+    goto init_error;
   }
     initialized_flags|=INITIALIZED_ACODEC;
   mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");