summaryrefslogtreecommitdiffstats
path: root/player/audio.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-23 18:31:43 +0200
committerwm4 <wm4@nowhere>2014-10-23 18:31:43 +0200
commitc9234d769df83b7280f68f9dc24445029f84041a (patch)
tree450904d51303eedfec45acdd448fcbd689a54aad /player/audio.c
parent809fbc6fc1e862ab2dfcfcceeb65d7382d8b51e9 (diff)
downloadmpv-c9234d769df83b7280f68f9dc24445029f84041a.tar.bz2
mpv-c9234d769df83b7280f68f9dc24445029f84041a.tar.xz
player: fix exiting if both audio and video fail initializing
The player was supposed to exit playback if both video and audio failed to initialize (or if one of the streams was not selected when the other stream failed). This didn't work; for one this check was missing from one of the failure paths. And more importantly, both checked the current_track array incorrectly. Fix these issues, and move the failure handling code into a common function. CC: @mpv-player/stable
Diffstat (limited to 'player/audio.c')
-rw-r--r--player/audio.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/player/audio.c b/player/audio.c
index 5078e04dee..6774d415c3 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -285,11 +285,8 @@ init_error:
uninit_audio_chain(mpctx);
uninit_audio_out(mpctx);
no_audio:
- mp_deselect_track(mpctx, track);
if (track)
- MP_INFO(mpctx, "Audio: no audio\n");
- if (!mpctx->current_track[STREAM_VIDEO])
- mpctx->stop_play = PT_NEXT_ENTRY;
+ error_on_track(mpctx, track);
}
// Return pts value corresponding to the end point of audio written to the