summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-12 17:28:22 +0100
committerwm4 <wm4@nowhere>2015-02-12 17:28:22 +0100
commite920a00ebad645cd14d341f4dabd4c5c077d2e0c (patch)
tree021bfa61f679d0578ebae6867f4e17fc4a62cc74 /common
parente01750020dcc9d49e6f32d513f1b40cd30148d91 (diff)
downloadmpv-e920a00ebad645cd14d341f4dabd4c5c077d2e0c.tar.bz2
mpv-e920a00ebad645cd14d341f4dabd4c5c077d2e0c.tar.xz
player: drop explicit exit() calls
The code in main.c calls exit() explicitly, but the code is actually easier to follow by simply exiting from main() instead. The exit() call in av_log.c happens only on severely broken builds, so replace it with abort(). (Shuts up rpmlint warnings.)
Diffstat (limited to 'common')
-rw-r--r--common/av_log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/av_log.c b/common/av_log.c
index 5599ca0584..b11289ff11 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -224,8 +224,8 @@ void print_libav_versions(struct mp_log *log, int v)
if (broken) {
mp_fatal(log, "mpv was compiled and linked against a mixture of Libav "
"and FFmpeg versions. This won't work and will most likely "
- "crash at some point. Exiting.\n");
- exit(42);
+ "crash at some point. Aborting.\n");
+ abort();
}
// We don't "really" support mismatched libraries, but if you like to
// suffer, you're free to enjoy the terrible aspects of dynamic linking.