diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
| commit | 64b25938e90253432d28ffd7d971f085c560a523 (patch) | |
| tree | 56ba6a39d7e8f14ebccdcc4db935164b5da624a2 /libavutil | |
| parent | be24f85176d8e46c3154f1f51013f235b273183e (diff) | |
| parent | ceabc13f129cd6344b1eebdbe10119083fe5520e (diff) | |
| download | ffmpeg-64b25938e90253432d28ffd7d971f085c560a523.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
dnxhdenc: add space between function argument type and comment.
x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
attributes: Add a definition of av_always_inline for MSVC
cmdutils: Pass the actual chosen encoder to filter_codec_opts
os_support: Add fallback definitions for stat flags
os_support: Rename the poll fallback function to ff_poll
network: Check for struct pollfd
os_support: Don't compare a negative number against socket descriptors
os_support: Include all the necessary headers for the win32 open function
x86: vc1: fix and enable optimised loop filter
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/attributes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index 75d0cec8f1..9a837a7d15 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -35,6 +35,8 @@ #ifndef av_always_inline #if AV_GCC_VERSION_AT_LEAST(3,1) # define av_always_inline __attribute__((always_inline)) inline +#elif defined(_MSC_VER) +# define av_always_inline __forceinline #else # define av_always_inline inline #endif |