Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'

* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8': mpegvideo: Move ME_MAP_* defines to the only place they are used Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8b395315a5
parent 0a9bab5be6 4fbb62a21b
commit 8b395315a5
2 changed files with 3 additions and 2 deletions
--- 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,
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@ -74,8 +74,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)