Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'

* commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3':
  mpegvideo: Move QMAT_SHIFT* defines to the only place they are used

Conflicts:
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpegvideo.h

@@ -62,9 +62,6 @@ enum OutputFormat {
     FMT_MJPEG,
 };
 
-#define QMAT_SHIFT_MMX 16
-#define QMAT_SHIFT 21
-
 #define MAX_FCODE 7
 #define MAX_MV 4096
 

libavcodec/mpegvideo_enc.c

@@ -61,6 +61,9 @@
 
 #define QUANT_BIAS_SHIFT 8
 
+#define QMAT_SHIFT_MMX 16
+#define QMAT_SHIFT 21
+
 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);