summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:08:00 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-06 16:08:00 +0000
commite83addcbfa94015783d80f2979acce7aae512df8 (patch)
treea733f8fcc4ea7baba42434c6ce68b49691e4c680 /mplayer.c
parentbf80f3595889328ce777792531f092673853e931 (diff)
downloadmpv-e83addcbfa94015783d80f2979acce7aae512df8.tar.bz2
mpv-e83addcbfa94015783d80f2979acce7aae512df8.tar.xz
Reuse the init_error exit path also for init_best_audio_codec errors.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29840 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index be05ddd420..6768d2ec28 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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");