[FFmpeg-cvslog] bitdepth: simplify FUNC/FUNCC macros

Mans Rullgard git at videolan.org
Mon Jul 11 05:52:41 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sat Jul  9 11:44:07 2011 +0100| [39c2a6bf44b25534fdbc9b6ac3844dab28ba5b0e] | committer: Mans Rullgard

bitdepth: simplify FUNC/FUNCC macros

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 libavcodec/bit_depth_template.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 4da0a6e..9071ec2 100644
--- a/libavcodec/bit_depth_template.c
+++ b/libavcodec/bit_depth_template.c
@@ -85,13 +85,7 @@
 #   define CLIP(a) cm[a]
 #endif
 
-#if BIT_DEPTH == 8
-#   define FUNC(a)  a ## _8
-#   define FUNCC(a) a ## _8_c
-#elif BIT_DEPTH == 9
-#   define FUNC(a)  a ## _9
-#   define FUNCC(a) a ## _9_c
-#elif BIT_DEPTH == 10
-#   define FUNC(a)  a ## _10
-#   define FUNCC(a) a ## _10_c
-#endif
+#define FUNC3(a, b, c)  a ## _ ## b ## c
+#define FUNC2(a, b, c)  FUNC3(a, b, c)
+#define FUNC(a)  FUNC2(a, BIT_DEPTH,)
+#define FUNCC(a) FUNC2(a, BIT_DEPTH, _c)



More information about the ffmpeg-cvslog mailing list