diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-07-23 13:50:35 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-25 12:00:53 -0700 |
| commit | 4fbb62a21bd04bf261da2382d5ba6c249c702af8 (patch) | |
| tree | 7752fe2b56218e2f6f1a1a00939156af1c410d11 /libavcodec | |
| parent | ff85334375c6733c6116ea3686f128b4a11f33e7 (diff) | |
| download | ffmpeg-4fbb62a21bd04bf261da2382d5ba6c249c702af8.tar.gz | |
mpegvideo: Move ME_MAP_* defines to the only place they are used
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/motion_est.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index dee28f05ab..26cde77d3c 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 8233d6f3ab..04728b25bc 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) |