diff options
| author | wm4 <wm4@nowhere> | 2015-02-12 17:28:22 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-16 18:08:38 +0900 |
| commit | 50a7aac4d796a6fdcc73a502616601ecf3da3425 (patch) | |
| tree | 70bfc09099e3e5d46dc211a6584d6d376d870858 /common | |
| parent | 2051243a0fdc4bc2542583d37342c32a93fc3468 (diff) | |
| download | mpv-50a7aac4d796a6fdcc73a502616601ecf3da3425.tar.bz2 mpv-50a7aac4d796a6fdcc73a502616601ecf3da3425.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.)
(cherry picked from commit e920a00ebad645cd14d341f4dabd4c5c077d2e0c)
Diffstat (limited to 'common')
| -rw-r--r-- | common/av_log.c | 4 |
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. |