From 5bd04a087c4ee7edbf806103556af51c2d46deb9 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 15 Oct 2015 19:53:47 -0700 Subject: [PATCH] sync versions with 0.4.4 libwebp{,decoder} - 0.4.4 libwebp libtool - 5.4.0 libwebpdecoder libtool - 1.4.0 mux/demux - 0.2.2 (unchanged) libtool - 1.2.0 (unchanged) (cherry picked from commit 62864042c053da4482a18252c9b7c28e45af9dc4) Change-Id: I7d421dc47ad4d25a17450ce1b04562c5d58c596b --- README | 2 +- configure.ac | 4 ++-- src/Makefile.am | 4 ++-- src/dec/vp8i.h | 2 +- src/enc/vp8enci.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 981112ea..a686d1a1 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ \__\__/\____/\_____/__/ ____ ___ / _/ / \ \ / _ \/ _/ / \_/ / / \ \ __/ \__ - \____/____/\_____/_____/____/v0.4.3 + \____/____/\_____/_____/____/v0.4.4 Description: ============ diff --git a/configure.ac b/configure.ac index c505d05b..2a1f86b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([libwebp], [0.4.3], - [https://bugs.chromium.org/p/webp],, +AC_INIT([libwebp], [0.4.4], + [http://code.google.com/p/webp/issues],, [http://developers.google.com/speed/webp]) AC_CANONICAL_HOST AC_PREREQ([2.60]) diff --git a/src/Makefile.am b/src/Makefile.am index 76e9f991..0bf45d2e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ libwebp_la_LIBADD += utils/libwebputils.la # other than the ones listed on the command line, i.e., after linking, it will # not have unresolved symbols. Some platforms (Windows among them) require all # symbols in shared libraries to be resolved at library creation. -libwebp_la_LDFLAGS = -no-undefined -version-info 5:3:0 +libwebp_la_LDFLAGS = -no-undefined -version-info 5:4:0 libwebpincludedir = $(includedir)/webp pkgconfig_DATA = libwebp.pc @@ -50,7 +50,7 @@ if BUILD_LIBWEBPDECODER libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la - libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 1:3:0 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 1:4:0 pkgconfig_DATA += libwebpdecoder.pc endif diff --git a/src/dec/vp8i.h b/src/dec/vp8i.h index 83a0174f..b5f2b230 100644 --- a/src/dec/vp8i.h +++ b/src/dec/vp8i.h @@ -32,7 +32,7 @@ extern "C" { // version numbers #define DEC_MAJ_VERSION 0 #define DEC_MIN_VERSION 4 -#define DEC_REV_VERSION 3 +#define DEC_REV_VERSION 4 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline). // Constraints are: We need to store one 16x16 block of luma samples (y), diff --git a/src/enc/vp8enci.h b/src/enc/vp8enci.h index 61511af1..1a7ebe57 100644 --- a/src/enc/vp8enci.h +++ b/src/enc/vp8enci.h @@ -36,7 +36,7 @@ extern "C" { // version numbers #define ENC_MAJ_VERSION 0 #define ENC_MIN_VERSION 4 -#define ENC_REV_VERSION 3 +#define ENC_REV_VERSION 4 enum { MAX_LF_LEVELS = 64, // Maximum loop filter level MAX_VARIABLE_LEVEL = 67, // last (inclusive) level with variable cost