[FFmpeg-cvslog] lavu: add av_clip64()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 26 19:37:43 2012 +0200| [ae52eb7fc74273a7472f93241943a0887f0db503] | committer: Michael Niedermayer

lavu: add av_clip64()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae52eb7fc74273a7472f93241943a0887f0db503
---

 libavutil/common.h  |   17 +++++++++++++++++
 libavutil/version.h |    2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index c2a54c4..03a2354 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -103,6 +103,20 @@ static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
 }
 
 /**
+ * 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.
  * @param a value to clip
  * @return clipped value
@@ -375,6 +389,9 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
 #ifndef av_clip
 #   define av_clip          av_clip_c
 #endif
+#ifndef av_clip64
+#   define av_clip64        av_clip64_c
+#endif
 #ifndef av_clip_uint8
 #   define av_clip_uint8    av_clip_uint8_c
 #endif
diff --git a/libavutil/version.h b/libavutil/version.h
index 8e94c6e..94a4a47 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -75,7 +75,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR   0
+#define LIBAVUTIL_VERSION_MINOR   1
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \