summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-15 20:12:51 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:09 +0900
commit9af1ff9817bf2ac01f99e64fe4607dcb3d30e60c (patch)
tree963a70c9a593f9a25f52b8e3e6a2818bb8cd47e3
parentca34fd569d5cf57939d1ef04c8d0715d683600cf (diff)
downloadmpv-9af1ff9817bf2ac01f99e64fe4607dcb3d30e60c.tar.bz2
mpv-9af1ff9817bf2ac01f99e64fe4607dcb3d30e60c.tar.xz
player: fix --stop-playback-on-init-failure on audio init failure
This was forgotten when the option was implemented, and makes this option work as advertised. Fixes #1473 (though the default behavior is probably still stupid).
-rw-r--r--player/audio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c
index dc1d305525..15dfc2c2d8 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -460,8 +460,7 @@ static void do_fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
mpctx->d_audio->init_retries += 1;
if (mpctx->d_audio->init_retries >= 50) {
MP_ERR(mpctx, "Error initializing audio.\n");
- struct track *track = mpctx->current_track[0][STREAM_AUDIO];
- mp_deselect_track(mpctx, track);
+ error_on_track(mpctx, mpctx->current_track[0][STREAM_AUDIO]);
return;
}
}