Merge commit 'f637046d3134a331e4b5a7243ac3dfb92735b8a5'

* commit 'f637046d3134a331e4b5a7243ac3dfb92735b8a5':
  libavutil: Always use some GCC style attributes on clang

Merged-by: Clément Bœsch <cboesch@gopro.com>

diff --cc libavutil/attributes.h
index 5c6b9deecb7b0535b93cb530073986ce04b4b906,c770f52a432deec0e40be7d0a058057668cb1563..54d1901116912bd95de74918e1cfe47b9bd47610
--- 1/libavutil/attributes.h
--- 2/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@@ -98,31 -80,7 +98,30 @@@
  #    define attribute_deprecated
  #endif
  
- 
- #if defined(__GNUC__)
 +/**
 + * Disable warnings about deprecated features
 + * This is useful for sections of code kept for backward compatibility and
 + * scheduled for removal.
 + */
 +#ifndef AV_NOWARN_DEPRECATED
 +#if AV_GCC_VERSION_AT_LEAST(4,6)
 +#    define AV_NOWARN_DEPRECATED(code) \
 +        _Pragma("GCC diagnostic push") \
 +        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
 +        code \
 +        _Pragma("GCC diagnostic pop")
 +#elif defined(_MSC_VER)
 +#    define AV_NOWARN_DEPRECATED(code) \
 +        __pragma(warning(push)) \
 +        __pragma(warning(disable : 4996)) \
 +        code; \
 +        __pragma(warning(pop))
 +#else
 +#    define AV_NOWARN_DEPRECATED(code) code
 +#endif
 +#endif
 +
+ #if defined(__GNUC__) || defined(__clang__)
  #    define av_unused __attribute__((unused))
  #else
  #    define av_unused

diff --cc libavutil/mem.h
Simple merge