From e920a00ebad645cd14d341f4dabd4c5c077d2e0c Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 12 Feb 2015 17:28:22 +0100 Subject: 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.) --- common/av_log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') 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. -- cgit v1.2.3