diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 03:16:38 +0100 |
commit | cdbebae44440bea97f300f256d722c1495753bc2 (patch) | |
tree | b9fc7a0e480d3c10bd950cd8495b48982f78de78 /libavcodec/internal.h | |
parent | 8426edef4cf521104bb9288ac46a48dc4bdaee53 (diff) | |
parent | 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa (diff) |
Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa':
lavc: fix bitshifts amount bigger than the type
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index dcb2113f6f..b8ceb2e9f1 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -35,6 +35,8 @@ #define FF_SANE_NB_CHANNELS 63U +#define FF_SIGNBIT(x) (x >> CHAR_BIT * sizeof(x) - 1) + #if HAVE_AVX # define STRIDE_ALIGN 32 #elif HAVE_SIMD_ALIGN_16 |