Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'

* commit 'd4d186d185df98492d8935a87c5b5cf369db9748': dsputil: Remove non-8bpp draw_edge Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 9ae56b85b6
parent bf66016e4c d4d186d185
commit 9ae56b85b6
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@ -2890,13 +2890,13 @@ 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) \
-    c->get_pixels                    = FUNCC(get_pixels,   depth);
-
    c->draw_edges                    = FUNCC(draw_edges, 8);
    c->clear_block                   = FUNCC(clear_block, 8);
    c->clear_blocks                  = FUNCC(clear_blocks, 8);

+#define BIT_DEPTH_FUNCS(depth) \
+    c->get_pixels                    = FUNCC(get_pixels,   depth);
+
    switch (avctx->bits_per_raw_sample) {
    case 9:
    case 10: