Merge from 1.1.8.

3 files changed, 5 insertions, 1 deletions

diff --git a/.hgsigs b/.hgsigs
index a1901b37f..bcd9cb88d 100644
--- a/.hgsigs
+++ b/.hgsigs
@@ -1 +1,2 @@
 5e6d0656ac4efdc1a89ed0fc32f11050f4a22970 0 iD8DBQBGZ207sBKtjPGfWZ8RAhdEAKCrkwiBT6bTof7ro5QQwewRfF/dMACffsvfK42+ahQrjpSfQxEp6k7RpCI=
+42358e16442fe54fa554006e0b0bafd51e065c32 0 iD8DBQBG0xz0zbwfTn7RbcARAoD3AJ4012pabmpQvCKKDokZNyZzfPIbWgCfRk5FRly/Eei/xXnSaT54XHAT5KM=
diff --git a/.hgtags b/.hgtags
index 1c20ea2b0..9000dcadc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -61,3 +61,4 @@ fd12068ebd3fab2438f77b06e312c4244e97950a DXR3_095
 204b8e92463b592e5c220b56f186a6d4d1007cf9 xine-lib-1_1_5-release
 7b60f85a95345c41fb074dc5e3f7355d9e72968e xine-lib-1_1_6-release
 ab1531337553ad5eac24a69ac665eae33916b423 xine-lib-1_1_7-release
+e0a332b9d3e8bb3fad4d7feac1e519292b062056 xine-lib-1_1_8-release
diff --git a/ChangeLog b/ChangeLog
index 892154b51..c6455a382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,7 @@ xine-lib (1.1.90) (Unreleased)
     Such elements are handled as if they were after the XML content for
     compatibility reasons, though they must appear before it.
 
-xine-lib (1.1.8) (Unreleased)
+xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
     string from last.fm streaming server.
   * Disable mediaLib support by default (the licenses probably disallow the
@@ -61,6 +61,8 @@ xine-lib (1.1.8) (Unreleased)
   * Add colouring for bold & italic in text subtitles.
   * Simple scaling of subtitles to fit the frame width (intended to cope
     with common DVB resolutions such as 544x576).
+  * Various small video frame-handling bug fixes.
+  * Add options to control bob deinterlacing in the XxMC video output plugin.
 
 xine-lib (1.1.7)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.