generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'

Browse Source 
* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-23 14:15:20 +02:00
commit d0cb6caf69
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegvideo.h
View File

@ -440,7 +440,7 @@ typedef struct MpegEncContext {
uint16_t chroma_intra_matrix[64]; uint16_t chroma_intra_matrix[64];
uint16_t inter_matrix[64]; uint16_t inter_matrix[64];
uint16_t chroma_inter_matrix[64]; uint16_t chroma_inter_matrix[64];
#define QUANT_BIAS_SHIFT 8
int intra_quant_bias; ///< bias for the quantizer int intra_quant_bias; ///< bias for the quantizer
int inter_quant_bias; ///< bias for the quantizer int inter_quant_bias; ///< bias for the quantizer
int min_qcoeff; ///< minimum encodable coefficient int min_qcoeff; ///< minimum encodable coefficient

2
libavcodec/mpegvideo_enc.c
View File

@ -59,6 +59,8 @@
#include <limits.h> #include <limits.h>
#include "sp5x.h" #include "sp5x.h"
#define QUANT_BIAS_SHIFT 8
static int encode_picture(MpegEncContext *s, int picture_number); 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 dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
static int sse_mb(MpegEncContext *s); static int sse_mb(MpegEncContext *s);