Merge commit 'd4d186d1'

* commit 'd4d186d1':
  dsputil: Remove non-8bpp draw_edge

Conflicts:
	libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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: