summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-02 03:12:45 +0200
committerwm4 <wm4@nowhere>2014-10-02 03:12:45 +0200
commitf62f984404b860e5e94973d9250aae67d55162de (patch)
tree35b7c4478c977f0fca8d521e215cc00014c23add /player
parentae2e2b974077f13c48007635c399918125822286 (diff)
downloadmpv-f62f984404b860e5e94973d9250aae67d55162de.tar.bz2
mpv-f62f984404b860e5e94973d9250aae67d55162de.tar.xz
player: don't print audio/video init failure message twice
The messages "Audio: no audio" and "Video: no video" could be printed twice each if initializing them failed. Prevent his silliness. CC: @mpv-player/stable
Diffstat (limited to 'player')
-rw-r--r--player/audio.c3
-rw-r--r--player/video.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/player/audio.c b/player/audio.c
index 969b0ca816..69510ae205 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -263,7 +263,8 @@ init_error:
uninit_player(mpctx, INITIALIZED_ACODEC | INITIALIZED_AO);
no_audio:
mp_deselect_track(mpctx, track);
- MP_INFO(mpctx, "Audio: no audio\n");
+ if (track)
+ MP_INFO(mpctx, "Audio: no audio\n");
}
// Return pts value corresponding to the end point of audio written to the
diff --git a/player/video.c b/player/video.c
index 3d308ae955..80acbf7b72 100644
--- a/player/video.c
+++ b/player/video.c
@@ -308,9 +308,9 @@ int reinit_video_chain(struct MPContext *mpctx)
err_out:
no_video:
uninit_player(mpctx, INITIALIZED_VCODEC | (opts->force_vo ? 0 : INITIALIZED_VO));
- mp_deselect_track(mpctx, track);
+ if (track)
+ mp_deselect_track(mpctx, track);
handle_force_window(mpctx, true);
- MP_INFO(mpctx, "Video: no video\n");
return 0;
}