[SCM] libav/experimental: mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:04:00 UTC 2014


The following commit has been merged in the experimental branch:
commit 2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Jul 22 11:10:13 2014 -0700

    mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 3bd87df..1a7c1b1 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -430,7 +430,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 ea24902..fa4840e 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -58,6 +58,8 @@
 #include "bytestream.h"
 #include <limits.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);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list