[FFmpeg-cvslog] Merge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:21:12 2017 -0300| [1ba5e456dd6ecb016746074eb3190842087fb43e] | committer: James Almer

Merge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'

* commit '3aa9c523e9cf4f4a5e239ac737281e096c884907':
  libavutil: Define the noreturn attribute for clang in MSVC mode as well

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ba5e456dd6ecb016746074eb3190842087fb43e
---

 libavutil/attributes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 54d1901116..e840ce8f79 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -158,7 +158,7 @@
 #    define av_printf_format(fmtpos, attrpos)
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(2,5)
+#if AV_GCC_VERSION_AT_LEAST(2,5) || defined(__clang__)
 #    define av_noreturn __attribute__((noreturn))
 #else
 #    define av_noreturn


======================================================================