[FFmpeg-cvslog] lavu: add av_clipd_c

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Apr 18 13:26:23 2013 +0000| [3e9c0217fdd3f7a668c48b89361e0b970c29db56] | committer: Paul B Mahol

lavu: add av_clipd_c

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

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

diff --git a/libavutil/common.h b/libavutil/common.h
index beaf9f7..e303c25 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -229,6 +229,23 @@ static av_always_inline av_const float av_clipf_c(float a, float amin, float ama
     else               return a;
 }
 
+/**
+ * Clip a double 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 double av_clipd_c(double a, double amin, double amax)
+{
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+    if (amin > amax) abort();
+#endif
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
 /** Compute ceil(log2(x)).
  * @param x value used to compute ceil(log2(x))
  * @return computed ceiling of log2(x)
@@ -428,6 +445,9 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
 #ifndef av_clipf
 #   define av_clipf         av_clipf_c
 #endif
+#ifndef av_clipd
+#   define av_clipd         av_clipd_c
+#endif
 #ifndef av_popcount
 #   define av_popcount      av_popcount_c
 #endif
diff --git a/libavutil/version.h b/libavutil/version.h
index 6531397..e46e97c 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -75,7 +75,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  26
+#define LIBAVUTIL_VERSION_MINOR  27
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \