[FFmpeg-devel] [PATCH] intmath: remove av_ctz.
Ronald S. Bultje
rsbultje at gmail.com
Sun Oct 11 20:28:53 CEST 2015
It's an a non-installed header and only used in one place (flacenc).
Since ff_ctz is static inline, it's fine to use that instead.
---
libavcodec/flacenc.c | 2 +-
libavutil/intmath.c | 5 -----
libavutil/intmath.h | 8 --------
3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index f849ffc..e87fdc1 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 1f725c7..b0c00e1 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 08d54a6..78db28c 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -159,14 +159,6 @@ static av_always_inline av_const int ff_ctz_c( int 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);
-
-/**
* @}
*/
#endif /* AVUTIL_INTMATH_H */
--
2.1.2
More information about the ffmpeg-devel
mailing list