From 93866c2aa2514649622ae32b6cacaf62473a9e20 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Sun, 11 Oct 2015 17:43:29 -0400
Subject: [PATCH] intmath: remove av_ctz.

It's a non-installed header and only used in one place (flacenc).
Since ff_ctz is static inline, it's fine to use that instead.
---
 doc/APIchanges       |  3 ---
 libavcodec/flacenc.c |  2 +-
 libavutil/intmath.c  |  5 -----
 libavutil/intmath.h  | 14 ++++++--------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 03ffda8c37..67605dca75 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -1052,9 +1052,6 @@ lavd 54.4.100 / 54.0.0, lavfi 3.5.0
 2012-11-11 - 03b0787 / 5980f5d - lavu 52.6.100 / 52.2.0 - audioconvert.h
   Rename audioconvert.h to channel_layout.h. audioconvert.h is now deprecated.
 
-2012-11-05 - 7d26be6 / dfde8a3 - lavu 52.5.100 / 52.1.0 - intmath.h
-  Add av_ctz() for trailing zero bit count
-
 2012-10-21 - e3a91c5 / a893655 - lavu 51.77.100 / 51.45.0 - error.h
   Add AVERROR_EXPERIMENTAL
 
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index f849ffcca4..e87fdc1870 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1065,7 +1065,7 @@ static void remove_wasted_bits(FlacEncodeContext *s)
         }
 
         if (v && !(v & 1)) {
-            v = av_ctz(v);
+            v = ff_ctz(v);
 
             for (i = 0; i < s->frame.blocksize; i++)
                 sub->samples[i] >>= v;
diff --git a/libavutil/intmath.c b/libavutil/intmath.c
index 1f725c741f..b0c00e1cad 100644
--- a/libavutil/intmath.c
+++ b/libavutil/intmath.c
@@ -32,8 +32,3 @@ int av_log2_16bit(unsigned v)
 {
     return ff_log2_16bit(v);
 }
-
-int av_ctz(int v)
-{
-    return ff_ctz(v);
-}
diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index ec7286a539..802abe32b0 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -122,6 +122,12 @@ static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
 
 #ifndef ff_ctz
 #define ff_ctz ff_ctz_c
+/**
+ * Trailing zero bit count.
+ *
+ * @param v  input value. If v is 0, the result is undefined.
+ * @return   the number of trailing 0-bits
+ */
 #if !defined( _MSC_VER )
 static av_always_inline av_const int ff_ctz_c(int v)
 {
@@ -177,14 +183,6 @@ static av_always_inline av_const int ff_ctzll_c(long long v)
 }
 #endif
 
-/**
- * Trailing zero bit count.
- *
- * @param v  input value. If v is 0, the result is undefined.
- * @return   the number of trailing 0-bits
- */
-int av_ctz(int v);
-
 /**
  * @}
  */