Merge remote-tracking branch 'upstream/tags/release-1_3_7'

ShiftMediaProject · Dec 30, 2019 · 1b8b731 · 1b8b731
2 parents 24a3480 + ee75d54
commit 1b8b731
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 # Note that this ChangeLog covers only main changes to the release branch
 
+2019-12-28 09:43 Isibaar
+	* xvidcore/src/quant/quant_matrix.c: Fix stupid regression due 
+	to wrong brackets...
+
 2019-11-12 14:48 Isibaar
 	* xvidcore/src/bitstream/bitstream.c
 	* xvidcore/src/bitstream/bitstream.h

diff --git a/build/generic/configure.in b/build/generic/configure.in
@@ -8,7 +8,7 @@ dnl ==========================================================================
 
 AC_PREREQ([2.50])
 
-AC_INIT([Xvid], [1.3.6], [[email protected]])
+AC_INIT([Xvid], [1.3.7], [[email protected]])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.

diff --git a/src/quant/quant_matrix.c b/src/quant/quant_matrix.c
@@ -142,7 +142,7 @@ set_inter_matrix(uint16_t * mpeg_quant_matrices, const uint8_t * matrix)
 	uint16_t *inter_matrix_fixl = mpeg_quant_matrices + 7*64;
 
 	for (i = 0; i < 64; i++) {
-		inter_matrix1[i] = ((inter_matrix[i] = (int16_t)MAX(1, (matrix[i])>>1)));
+		inter_matrix1[i] = ((inter_matrix[i] = (int16_t)MAX(1, matrix[i])) >> 1);
 		inter_matrix1[i] += ((inter_matrix[i] == 1) ? 1: 0);
 		inter_matrix_fix[i] = (uint16_t) FIX(inter_matrix[i]);
 		inter_matrix_fixl[i] = (uint16_t) FIXL(inter_matrix[i]);

diff --git a/src/xvid.c b/src/xvid.c
@@ -699,7 +699,7 @@ xvid_gbl_info(xvid_gbl_info_t * info)
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.3.6";
+	info->build = "xvid-1.3.7";
 	info->cpu_flags = detect_cpu_flags();
 	info->num_threads = 0; /* single-thread */
 

diff --git a/src/xvid.h b/src/xvid.h
@@ -57,7 +57,7 @@ extern "C" {
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,3,6)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,3,7)
 #define XVID_API                 XVID_MAKE_API(4, 3)
 
 /* Bitstream Version
@@ -71,7 +71,7 @@ extern "C" {
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 68 
+#define XVID_BS_VERSION 69 
 
 /*****************************************************************************
  * error codes