Merge 1.1.15 release.

2 files changed, 7 insertions, 1 deletions

diff --git a/.hgtags b/.hgtags
index 3cd170e68..c6dc8b93b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -76,3 +76,4 @@ ffe7962edb79c2ed967b82a82ccfb2ac7eb148a2 vdr-xine-version-802
 66e1654718fb0581846d60c60bc09ae3b6b8c0cf xine-lib-1_1_12-release
 492f87e6963a8d244df32c40d66a6349aabc4420 xine-lib-1_1_13-release
 9b383441a18fb49ccd5a07465d3e3db8821cccf6 xine-lib-1_1_14-release
+17f8ed16524ba779af42913e51667e89b83a1887 xine-lib-1_1_15-release
diff --git a/ChangeLog b/ChangeLog
index c93e19af5..09371a8af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,12 +68,16 @@ xine-lib (1.1.90) (Unreleased)
   * Report more video output capabilities via (port)->get_capabilities():
     colour controls, zooming, colour keying.
 
-xine-lib (1.1.15) 2008-??-??
+xine-lib (1.1.15) 2008-08-14
   * Security fixes:
     - Fix crashes with various corrupted media files, including Ogg.
       (CVE-2008-3231)
       This includes a libfaad update from the 1.2 branch.
     - Delay V4L video frame preallocation until we know how large they'll be.
+    - Fix an exploitable ID3 heap buffer overflow.
+    - Check for possible buffer overflow attempts in the Real demuxer.
+    - Use size_t for data length variables where there may be int overflows.
+    - Add some checks for memory allocation failures.
   * Use external ffmpeg and libfaad by default.
   * V4L: Don't segfault if asked for an input that doesn't exist.
   * Recognise AMR audio (normally found in 3GP files).
@@ -108,6 +112,7 @@ xine-lib (1.1.14) 2008-06-29
     XvMC does not support port selection at present.
     (Backported from the 1.2 branch.)
   * Fix MPEG TS audio stream problems introduced in 1.1.13.
+  * Add basic aspect ratio detection for Windows Media Video streams.
 
 xine-lib (1.1.13) 2008-06-15
   * Security fixes: