On Wed, 10 Apr 2013, Diego Biurrun wrote:
On Wed, Apr 10, 2013 at 11:52:52AM +0300, Martin Storsjö wrote:
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2728,21 +2728,22 @@ av_cold void ff_dsputil_init(DSPContext* c,
AVCodecContext *avctx)
#define FUNC(f, depth) f ## _ ## depth
#define FUNCC(f, depth) f ## _ ## depth ## _c
-#define BIT_DEPTH_FUNCS(depth, dct)\
- c->get_pixels = FUNCC(get_pixels ## dct , depth);\
- c->draw_edges = FUNCC(draw_edges , depth);\
- c->clear_block = FUNCC(clear_block ## dct , depth);\
- c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\
+#define BIT_DEPTH_FUNCS(depth) \
+ c->get_pixels = FUNCC(get_pixels, depth);\
+ c->draw_edges = FUNCC(draw_edges, depth);
+
+ c->clear_block = FUNCC(clear_block, 8);
+ c->clear_blocks = FUNCC(clear_blocks, 8);
The last two lines would fit better before the #define.
Changed locally
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@ -65,46 +65,41 @@ static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int
width, int height, i
+#if BIT_DEPTH == 8
+static void FUNCC(clear_block)(int16_t *block)
+{
+ memset(block, 0, sizeof(int16_t)*64);
+}
+
+/**
+ * memset(blocks, 0, sizeof(int16_t)*6*64)
+ */
+static void FUNCC(clear_blocks)(int16_t *blocks)
+{
+ memset(blocks, 0, sizeof(int16_t)*6*64);
+}
#endif
What's with the doxygen comment?
It's an old comment that has been brought along for quite some time.
Dropped at this point though when it exactly matches the function content.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
