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

4fbb62a2 · Diego Biurrun · ff853343 · 4fbb62a2 · 4fbb62a2
Commit 4fbb62a2 authored Jul 23, 2014 by Diego Biurrun
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

motion_est.c libavcodec/motion_est.c +3 -0

mpegvideo.h libavcodec/mpegvideo.h +0 -2

No files found.
--- 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
@@ -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)