RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-07-26 02:47:04 +02:00
parent 8b395315a5 d8520d3ee0
commit 7295ee7f51
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.h
View File

@ -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

3
libavcodec/mpegvideo_enc.c
View File

@ -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);