[SCM] libav/experimental: move EDGE_WIDTH definition allong with draw_edges where it belongs

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cbcd6c8ca9bc9a36d990589c3a2bb7100b90ec3b
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Wed Mar 5 00:38:14 2008 +0000

    move EDGE_WIDTH definition allong with draw_edges where it belongs
    
    Originally committed as revision 12322 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 8135688..07ac23f 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -412,6 +412,7 @@ typedef struct DSPContext {
 #define RECON_SHIFT 6
 
     void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w);
+#define EDGE_WIDTH 16
 
     /* h264 functions */
     void (*h264_idct_add)(uint8_t *dst, DCTELEM *block, int stride);
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 69fee86..fa7420a 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -45,8 +45,6 @@ enum OutputFormat {
     FMT_H264,
 };
 
-#define EDGE_WIDTH 16
-
 #define MPEG_BUF_SIZE (16 * 1024)
 
 #define QMAT_SHIFT_MMX 16

-- 
Libav/FFmpeg packaging