summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-11-29 17:16:22 +0100
committerwm4 <wm4@nowhere>2016-11-29 17:16:22 +0100
commit20f02229cd4263b350897bed1d4d2b18b6a51a25 (patch)
tree570e8a67b103355bdff8c8b4b5e20e61e9461faa /player
parent4958c1a556fa4f3bc4e4b3b36e04a056d90f69e1 (diff)
downloadmpv-20f02229cd4263b350897bed1d4d2b18b6a51a25.tar.bz2
mpv-20f02229cd4263b350897bed1d4d2b18b6a51a25.tar.xz
player: don't print format detection error when aborting loading
The way playback/loading is stopped on the demuxer layer makes it report an error to the higher levels of the player. But if playback/loading was explicitly aborted, printing such an error is confusing and misleading. This was probably just an oversight anyway. Fix it by using the libmpv API reported error field instead, which handles this better.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 6ea4479d7a..b94ce8af43 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1231,7 +1231,7 @@ terminate_playback:
MP_VERBOSE(mpctx, "finished playback, %s (reason %d)\n",
mpv_error_string(end_event.error), end_event.reason);
- if (mpctx->error_playing == MPV_ERROR_UNKNOWN_FORMAT)
+ if (end_event.error == MPV_ERROR_UNKNOWN_FORMAT)
MP_ERR(mpctx, "Failed to recognize file format.\n");
MP_INFO(mpctx, "\n");