From 5afacef0e4d80a77518d65d83947b9f7a2630c34 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 10 Nov 2012 16:20:00 +0100
Subject: [PATCH] Add MP_NORETURN and replace av_noreturn uses

av_noreturn is a rather recent addition to libavutil, and defining it
ourselves is trivial and makes playing compatibility games easier.
---
 compat/compiler.h | 3 +++
 core/mplayer.c    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/compat/compiler.h b/compat/compiler.h
index c929573dd1..a507cd02c2 100644
--- a/compat/compiler.h
+++ b/compat/compiler.h
@@ -5,6 +5,8 @@
 
 #ifdef __GNUC__
 
+#define MP_NORETURN __attribute__((noreturn))
+
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
  * the parameter containing the format, and a2 the index of the first
  * argument. **/
@@ -19,6 +21,7 @@
 
 #else
 #define PRINTF_ATTRIBUTE(a1, a2)
+#define MP_NORETURN
 #endif
 
 #endif
diff --git a/core/mplayer.c b/core/mplayer.c
index 180bb2a011..1a9fe04f4c 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -576,7 +576,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
     }
 }
 
-static av_noreturn void exit_player(struct MPContext *mpctx,
+static MP_NORETURN void exit_player(struct MPContext *mpctx,
                                     enum exit_reason how, int rc)
 {
     uninit_player(mpctx, INITIALIZED_ALL);