diff options
| author | wm4 <wm4@nowhere> | 2014-10-23 18:31:43 +0200 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2014-10-23 20:27:32 +0200 |
| commit | 0a40fb00b4acd51adc831334c601a534927b51da (patch) | |
| tree | 6c42bd7eb148e5fad5184e7b5abb528cf9f3e002 /player/audio.c | |
| parent | 3c8aecb711bde4928e13a785527cea6c986a1b75 (diff) | |
| download | mpv-0a40fb00b4acd51adc831334c601a534927b51da.tar.bz2 mpv-0a40fb00b4acd51adc831334c601a534927b51da.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
Conflicts:
player/audio.c
player/video.c
Diffstat (limited to 'player/audio.c')
| -rw-r--r-- | player/audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c index 3b3a06bd69..0fd6f99226 100644 --- a/player/audio.c +++ b/player/audio.c @@ -214,9 +214,8 @@ void reinit_audio_chain(struct MPContext *mpctx) init_error: uninit_player(mpctx, INITIALIZED_ACODEC | INITIALIZED_AO); no_audio: - mp_deselect_track(mpctx, track); if (track) - MP_INFO(mpctx, "Audio: no audio\n"); + error_on_track(mpctx, track); } // Return pts value corresponding to the end point of audio written to the |