Merge with 1.2 branch.

1 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e7d334612..27fbf97b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ xine-lib (1.1.90) (Unreleased)
   * Use FFmpeg's own buildsystem, rather than wrapping automake around its
     sources; this allows to enable/disable FFmpeg features easily, and allow
     to properly support --disable-ffmpeg-(uncommon|popular)-codecs.
-  * Update libmpcdec (formerly libmusepack) to version 1.2.5 (newer than the
+  * Update libmpcdec (formerly libmusepack) to version 1.2.6 (newer than the
     previous Subversion snapshot) and contestually move it to contrib/libmpcdec
     to separate from xine's own code.
   * Save plugins' cache in the defined cache home directory as per XDG Base
@@ -28,8 +28,12 @@ xine-lib (1.1.90) (Unreleased)
     initialisation, even for audio files that nothing have to do with modplug.
   * Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the
     same 'xiph' plugin.
+  * Remove aRTs output plugin; ALSA's DMix can allow to run both xine and aRTs
+    at the same time for Linux, and if other operating systems lacks a proper
+    software mixing facility you can consider alternative daemons. Note: aRTs
+    will not be present in KDE 4.
 
-xine-lib (1.1.7) (unreleased)
+xine-lib (1.1.7)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.
   * Add support for MDHD version 1 atom in demux_qt. [bug #1679398]
   * Handle single-quoted attribute values in XML.
@@ -49,6 +53,16 @@ xine-lib (1.1.7) (unreleased)
   * Use the integer versions of Speex decoding functions, this avoids an
     iteration over the decoded frames to transform them to integers, and
     also avoids an improper saturation.
+  * Prioritize the musepack demuxer over mpgaudio, as sometimes the latter can
+    misfire and report a good file as unplayable.
+  * Fix an mmap problem with huge files on 32-bit systems.
+  * Improved MPEG PES stream handling: specifically, misdetection of data
+    streams as PES streams.
+  * Handle unplugged ALSA device (fixes crashes) and if the frontend does not
+    handle the event continue playback to the none output.
+  * Disable aRTs output plugin by default, it's deprecated and will be removed
+    in 1.2 series.
+  * Fix a colour format conversion crash in the fb video output driver.
 
 xine-lib (1.1.6)
   * Split the DirectFB plugin into X11 and non-X versions.