summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-26 02:34:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-26 02:34:51 +0200
commit8b395315a5e7eba743d815f0b9c3a42aaeefd297 (patch)
tree577bc6c2b44ab722e101f03d653288b19351a831 /libavcodec/mpegvideo.h
parent0a9bab5be64ffb85b2597bfd6e506a7fce512c0b (diff)
parent4fbb62a21bd04bf261da2382d5ba6c249c702af8 (diff)
Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'
* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8': mpegvideo: Move ME_MAP_* defines to the only place they are used Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r--libavcodec/mpegvideo.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 9517a3b06a..5c601dd87b 100644
--- 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)