diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 14:15:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 14:15:48 +0200 |
| commit | d0cb6caf691ccd52fae1b3000691108cfacd327c (patch) | |
| tree | 0d3dcf508732ff83e165aacb4be5224deeeb2ce5 | |
| parent | c75fdee747179e21e3cc137b2565ba911b17f9c5 (diff) | |
| parent | 2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb (diff) | |
| download | ffmpeg-d0cb6caf691ccd52fae1b3000691108cfacd327c.tar.gz | |
Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'
* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 3f57ca0110..4334f9a7a7 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -440,7 +440,7 @@ typedef struct MpegEncContext { uint16_t chroma_intra_matrix[64]; uint16_t inter_matrix[64]; uint16_t chroma_inter_matrix[64]; -#define QUANT_BIAS_SHIFT 8 + int intra_quant_bias; ///< bias for the quantizer int inter_quant_bias; ///< bias for the quantizer int min_qcoeff; ///< minimum encodable coefficient diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7fa568792d..4707e52130 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -59,6 +59,8 @@ #include <limits.h> #include "sp5x.h" +#define QUANT_BIAS_SHIFT 8 + 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); |