summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <devspam@moreofthesa.me.uk>2012-06-09 18:43:27 +0100
committerDarren Salt <devspam@moreofthesa.me.uk>2012-06-09 18:43:27 +0100
commitc6e166f4f7eb44cd462a6bbbe9544b9aa4e4a2b0 (patch)
tree67ac5f33877833dd47953a6aa571fe2687b88d6e
parentf78bedc5da5b9bfb72383726c48e1f3287c5b956 (diff)
downloadxine-lib-c6e166f4f7eb44cd462a6bbbe9544b9aa4e4a2b0.tar.gz
xine-lib-c6e166f4f7eb44cd462a6bbbe9544b9aa4e4a2b0.tar.bz2
Changelog updates; release.1.2.2
-rw-r--r--ChangeLog7
-rwxr-xr-xversion.sh6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 105e30d0d..795cb2ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-xine-lib (1.2.1.1) 2012-??-??
+xine-lib (1.2.2) 2012-06-09
* Fix musepack decoder compilation if libmpcdec headers aren't available.
* Configure tests for xinerama & VideoCD support now soft-fail properly.
* The DVB plugin is working again.
+ * OpenGL OSD fix.
+ * YUV conversion MMX/SSE optimisations.
+ * YUV420 H.264 is playable now; YUVJ444P is correctly handled.
+ * Support FLAC in Matroska; support BMP.
+ * Various build fixes for Windows.
xine-lib (1.2.1) 2012-02-04
* The "I'm at Tyneside LUG" release.
diff --git a/version.sh b/version.sh
index 09a958e40..6a023a69b 100755
--- a/version.sh
+++ b/version.sh
@@ -30,14 +30,14 @@
XINE_VERSION_MAJOR=1
XINE_VERSION_MINOR=2
-XINE_VERSION_SUB=1
+XINE_VERSION_SUB=2
XINE_VERSION_PATCH=
# Release series number (usually $XINE_MAJOR.$XINE_MINOR)
XINE_VERSION_SERIES=1.2
-XINE_LT_CURRENT=3
+XINE_LT_CURRENT=4
XINE_LT_REVISION=0
-XINE_LT_AGE=1
+XINE_LT_AGE=2
test -f "`dirname $0`/.cvsversion" && XINE_VERSION_SUFFIX="hg"
XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_PATCH}${XINE_VERSION_SUFFIX}"