diff --git a/ext_includes/libavformat/version.h b/ext_includes/libavformat/version.h index edd666be..ff3f06db 100644 --- a/ext_includes/libavformat/version.h +++ b/ext_includes/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 65 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MINOR 66 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/ext_includes/libavutil/attributes.h b/ext_includes/libavutil/attributes.h index 5c6b9dee..54d19011 100644 --- a/ext_includes/libavutil/attributes.h +++ b/ext_includes/libavutil/attributes.h @@ -121,8 +121,7 @@ #endif #endif - -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) # define av_unused __attribute__((unused)) #else # define av_unused @@ -133,7 +132,7 @@ * away. This is useful for variables accessed only from inline * assembler without the compiler being aware. */ -#if AV_GCC_VERSION_AT_LEAST(3,1) +#if AV_GCC_VERSION_AT_LEAST(3,1) || defined(__clang__) # define av_used __attribute__((used)) #else # define av_used diff --git a/ext_includes/libavutil/cpu.h b/ext_includes/libavutil/cpu.h index 8499f0ea..de055934 100644 --- a/ext_includes/libavutil/cpu.h +++ b/ext_includes/libavutil/cpu.h @@ -39,6 +39,7 @@ #define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster ///< than regular MMX/SSE (e.g. Core1) #define AV_CPU_FLAG_SSSE3 0x0080 ///< Conroe SSSE3 functions +#define AV_CPU_FLAG_SSSE3SLOW 0x4000000 ///< SSSE3 supported, but usually not faster #define AV_CPU_FLAG_ATOM 0x10000000 ///< Atom processor, some SSSE3 instructions are slower #define AV_CPU_FLAG_SSE4 0x0100 ///< Penryn SSE4.1 functions #define AV_CPU_FLAG_SSE42 0x0200 ///< Nehalem SSE4.2 functions diff --git a/ext_includes/libavutil/ffversion.h b/ext_includes/libavutil/ffversion.h index 67361460..02c7a596 100644 --- a/ext_includes/libavutil/ffversion.h +++ b/ext_includes/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "N-83254-gf28299da8d" +#define FFMPEG_VERSION "N-83421-gc6b447e4e5" #endif /* AVUTIL_FFVERSION_H */ diff --git a/ext_includes/libavutil/mem.h b/ext_includes/libavutil/mem.h index f9d88847..718a143c 100644 --- a/ext_includes/libavutil/mem.h +++ b/ext_includes/libavutil/mem.h @@ -97,7 +97,7 @@ #define DECLARE_ASM_CONST(n,t,v) \ AV_PRAGMA(DATA_ALIGN(v,n)) \ static const t __attribute__((aligned(n))) v -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) diff --git a/ext_includes/libavutil/version.h b/ext_includes/libavutil/version.h index 9d95086a..8866064a 100644 --- a/ext_includes/libavutil/version.h +++ b/ext_includes/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 45 +#define LIBAVUTIL_VERSION_MINOR 46 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/ext_libs/avcodec-vgmstream-57.dll b/ext_libs/avcodec-vgmstream-57.dll index 438eccd0..5d9b477f 100644 Binary files a/ext_libs/avcodec-vgmstream-57.dll and b/ext_libs/avcodec-vgmstream-57.dll differ diff --git a/ext_libs/avformat-vgmstream-57.dll b/ext_libs/avformat-vgmstream-57.dll index 2418e0b7..f23f985d 100644 Binary files a/ext_libs/avformat-vgmstream-57.dll and b/ext_libs/avformat-vgmstream-57.dll differ diff --git a/ext_libs/avutil-vgmstream-55.dll b/ext_libs/avutil-vgmstream-55.dll index b7d557cd..91c41d53 100644 Binary files a/ext_libs/avutil-vgmstream-55.dll and b/ext_libs/avutil-vgmstream-55.dll differ