summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac11
-rw-r--r--src/Makefile.am1
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c3845bfe8..b3e8baaf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+xine-lib (1.1.17) 2009-??-??
+ * Enable libmpeg2new. This is not yet production code; the old mpeg2
+ decoder remains the default.
+
xine-lib (1.1.16.2) 2009-02-10
* Build fixes related to ImageMagick 6.4 & later.
* Fix an error in Matroska PTS calculation.
diff --git a/configure.ac b/configure.ac
index 8a04af5e4..55450c780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,9 +17,9 @@ dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below
dnl
XINE_MAJOR=1
XINE_MINOR=1
-XINE_SUB=16
+XINE_SUB=17
dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar
-XINE_PATCH=.2
+XINE_PATCH=
dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR)
XINE_SERIES=1.1
@@ -54,9 +54,9 @@ dnl are platform dependent
dnl * in Linux, the library will be named
dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION
-XINE_LT_CURRENT=26
+XINE_LT_CURRENT=27
XINE_LT_REVISION=0
-XINE_LT_AGE=25
+XINE_LT_AGE=26
dnl for a release tarball do "rm .cvsversion" before "make dist"
if test -f "${srcdir-.}/.cvsversion"; then
@@ -2731,6 +2731,9 @@ src/libffmpeg/libavcodec/libpostproc/Makefile
src/libffmpeg/libavutil/Makefile
src/libmad/Makefile
src/libmpeg2/Makefile
+src/libmpeg2new/Makefile
+src/libmpeg2new/libmpeg2/Makefile
+src/libmpeg2new/include/Makefile
src/libmusepack/Makefile
src/libmusepack/musepack/Makefile
src/libspudec/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6718b4805..249bbc2b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = \
demuxers \
libffmpeg \
libmpeg2 \
+ libmpeg2new \
liba52 \
libspudec \
libspucc \