From d8520d3ee032bf18f28897e0109f44b405caf5e3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 23 Jul 2014 13:53:54 -0700 Subject: [PATCH] mpegvideo: Move QMAT_SHIFT* defines to the only place they are used --- libavcodec/mpegvideo.h | 3 --- libavcodec/mpegvideo_enc.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 04728b2..49774bc 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -60,9 +60,6 @@ enum OutputFormat { FMT_MJPEG, }; -#define QMAT_SHIFT_MMX 16 -#define QMAT_SHIFT 22 - #define MAX_FCODE 7 #define MAX_MV 2048 diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index fa4840e..2d0cd83 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -60,6 +60,9 @@ #define QUANT_BIAS_SHIFT 8 +#define QMAT_SHIFT_MMX 16 +#define QMAT_SHIFT 22 + static int encode_picture(MpegEncContext *s, int picture_number); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int sse_mb(MpegEncContext *s); -- 2.7.4