[SCM] libav/experimental: mpegvideo: Move ME_MAP_* defines to the only place they are used

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4fbb62a21bd04bf261da2382d5ba6c249c702af8
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jul 23 13:50:35 2014 -0700

    mpegvideo: Move ME_MAP_* defines to the only place they are used

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index dee28f0..26cde77 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -45,6 +45,9 @@
 #define P_MEDIAN P[4]
 #define P_MV1 P[9]
 
+#define ME_MAP_SHIFT 3
+#define ME_MAP_MV_BITS 11
+
 static int sad_hpel_motion_search(MpegEncContext * s,
                                   int *mx_ptr, int *my_ptr, int dmin,
                                   int src_index, int ref_index,
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 8233d6f..04728b2 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -73,8 +73,6 @@ enum OutputFormat {
 #define MAX_B_FRAMES 16
 
 #define ME_MAP_SIZE 64
-#define ME_MAP_SHIFT 3
-#define ME_MAP_MV_BITS 11
 
 #define MAX_MB_BYTES (30*16*16*3/8 + 120)
 

-- 
Libav/FFmpeg packaging