Commit ae52eb7f authored by Michael Niedermayer's avatar Michael Niedermayer

lavu: add av_clip64()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5f0105b8
...@@ -102,6 +102,20 @@ static av_always_inline av_const int av_clip_c(int a, int amin, int amax) ...@@ -102,6 +102,20 @@ static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
else return a; else return a;
} }
/**
* Clip a signed 64bit integer value into the amin-amax range.
* @param a value to clip
* @param amin minimum value of the clip range
* @param amax maximum value of the clip range
* @return clipped value
*/
static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
{
if (a < amin) return amin;
else if (a > amax) return amax;
else return a;
}
/** /**
* Clip a signed integer value into the 0-255 range. * Clip a signed integer value into the 0-255 range.
* @param a value to clip * @param a value to clip
...@@ -375,6 +389,9 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x) ...@@ -375,6 +389,9 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
#ifndef av_clip #ifndef av_clip
# define av_clip av_clip_c # define av_clip av_clip_c
#endif #endif
#ifndef av_clip64
# define av_clip64 av_clip64_c
#endif
#ifndef av_clip_uint8 #ifndef av_clip_uint8
# define av_clip_uint8 av_clip_uint8_c # define av_clip_uint8 av_clip_uint8_c
#endif #endif
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MINOR 1
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment