From 64ac51446d1df93252e52e3b455f95f79a129de9 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 17 Oct 2014 19:49:30 +0200 Subject: [PATCH] sync version numbers to 0.4.2 release libwebp{,decoder} - 0.4.2 libwebp libtool - 5.2.0 libwebpdecoder libtool - 1.2.0 mux/demux - 0.2.2 libtool - 1.2.0 (cherry picked from commit eec5f5f12179a4d950fc27aef1c70f087beade59) (cherry picked from commit 857578a811ea96abfa3235e4e47dd1ab4726e655) Change-Id: Ie9d10c68e28083674a8865ad8447b1a70dcea95d --- README | 2 +- README.mux | 2 +- configure.ac | 2 +- src/Makefile.am | 4 ++-- src/dec/vp8i.h | 2 +- src/demux/Makefile.am | 2 +- src/demux/demux.c | 2 +- src/enc/vp8enci.h | 2 +- src/mux/Makefile.am | 2 +- src/mux/muxi.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README b/README index 8b7cdf9e..daaf1ca7 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ \__\__/\____/\_____/__/ ____ ___ / _/ / \ \ / _ \/ _/ / \_/ / / \ \ __/ \__ - \____/____/\_____/_____/____/v0.4.1 + \____/____/\_____/_____/____/v0.4.2 Description: ============ diff --git a/README.mux b/README.mux index 437a751c..644b9747 100644 --- a/README.mux +++ b/README.mux @@ -1,7 +1,7 @@  __ __ ____ ____ ____ __ __ _ __ __ / \\/ \/ _ \/ _ \/ _ \/ \ \/ \___/_ / _\ \ / __/ _ \ __/ / / (_/ /__ - \__\__/\_____/_____/__/ \__//_/\_____/__/___/v0.2.1 + \__\__/\_____/_____/__/ \__//_/\_____/__/___/v0.2.2 Description: diff --git a/configure.ac b/configure.ac index a472d270..2d1d2463 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libwebp], [0.4.1], +AC_INIT([libwebp], [0.4.2], [http://code.google.com/p/webp/issues],, [http://developers.google.com/speed/webp]) AC_CANONICAL_HOST diff --git a/src/Makefile.am b/src/Makefile.am index d4bd3caf..daa6688c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,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:1:0 +libwebp_la_LDFLAGS = -no-undefined -version-info 5:2:0 libwebpincludedir = $(includedir)/webp pkgconfig_DATA = libwebp.pc @@ -47,7 +47,7 @@ if BUILD_LIBWEBPDECODER libwebpdecoder_la_LIBADD += dsp/libwebpdspdecode.la libwebpdecoder_la_LIBADD += utils/libwebputilsdecode.la - libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 1:1:0 + libwebpdecoder_la_LDFLAGS = -no-undefined -version-info 1:2:0 pkgconfig_DATA += libwebpdecoder.pc endif diff --git a/src/dec/vp8i.h b/src/dec/vp8i.h index 7cc1840f..29701be7 100644 --- a/src/dec/vp8i.h +++ b/src/dec/vp8i.h @@ -31,7 +31,7 @@ extern "C" { // version numbers #define DEC_MAJ_VERSION 0 #define DEC_MIN_VERSION 4 -#define DEC_REV_VERSION 1 +#define DEC_REV_VERSION 2 // intra prediction modes enum { B_DC_PRED = 0, // 4x4 modes diff --git a/src/demux/Makefile.am b/src/demux/Makefile.am index 8fdc28ea..507bcb2a 100644 --- a/src/demux/Makefile.am +++ b/src/demux/Makefile.am @@ -9,6 +9,6 @@ libwebpdemuxinclude_HEADERS += ../webp/mux_types.h libwebpdemuxinclude_HEADERS += ../webp/types.h libwebpdemux_la_LIBADD = ../libwebp.la -libwebpdemux_la_LDFLAGS = -no-undefined -version-info 1:1:0 +libwebpdemux_la_LDFLAGS = -no-undefined -version-info 1:2:0 libwebpdemuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpdemux.pc diff --git a/src/demux/demux.c b/src/demux/demux.c index 0ab30746..55a7918f 100644 --- a/src/demux/demux.c +++ b/src/demux/demux.c @@ -25,7 +25,7 @@ #define DMUX_MAJ_VERSION 0 #define DMUX_MIN_VERSION 2 -#define DMUX_REV_VERSION 1 +#define DMUX_REV_VERSION 2 typedef struct { size_t start_; // start location of the data diff --git a/src/enc/vp8enci.h b/src/enc/vp8enci.h index d17aa1f6..7194aa6f 100644 --- a/src/enc/vp8enci.h +++ b/src/enc/vp8enci.h @@ -30,7 +30,7 @@ extern "C" { // version numbers #define ENC_MAJ_VERSION 0 #define ENC_MIN_VERSION 4 -#define ENC_REV_VERSION 1 +#define ENC_REV_VERSION 2 // intra prediction modes enum { B_DC_PRED = 0, // 4x4 modes diff --git a/src/mux/Makefile.am b/src/mux/Makefile.am index 37f96726..40c39b43 100644 --- a/src/mux/Makefile.am +++ b/src/mux/Makefile.am @@ -12,6 +12,6 @@ libwebpmuxinclude_HEADERS += ../webp/mux_types.h libwebpmuxinclude_HEADERS += ../webp/types.h libwebpmux_la_LIBADD = ../libwebp.la -libwebpmux_la_LDFLAGS = -no-undefined -version-info 1:1:0 +libwebpmux_la_LDFLAGS = -no-undefined -version-info 1:2:0 libwebpmuxincludedir = $(includedir)/webp pkgconfig_DATA = libwebpmux.pc diff --git a/src/mux/muxi.h b/src/mux/muxi.h index f38d5131..718b2f5d 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -28,7 +28,7 @@ extern "C" { #define MUX_MAJ_VERSION 0 #define MUX_MIN_VERSION 2 -#define MUX_REV_VERSION 1 +#define MUX_REV_VERSION 2 // Chunk object. typedef struct WebPChunk WebPChunk;