diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 02:47:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 02:47:32 +0200 |
| commit | 7295ee7f51d9567526537228f2a0cd47c11db9c3 (patch) | |
| tree | 33624379cd18bdbecfd261d25893b0a374e3b795 | |
| parent | 8b395315a5e7eba743d815f0b9c3a42aaeefd297 (diff) | |
| parent | d8520d3ee032bf18f28897e0109f44b405caf5e3 (diff) | |
| download | ffmpeg-7295ee7f51d9567526537228f2a0cd47c11db9c3.tar.gz | |
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>
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 5c601dd87b..2d37b62bec 100644 --- a/libavcodec/mpegvideo.h +++ b/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 diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4707e52130..eefde7aaa7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/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); |