summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-03 16:56:44 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-03 16:56:44 +0100
commitb70e34352e304cf03da32b688d84eec3c3ffacec (patch)
tree711ec8d7abc0dd6075d09085634e5a5432e40ee3 /ChangeLog
parent08ad733e0103834bc61831ddce5a75c3f62e0173 (diff)
parent2b0e330c2642081066316ca5ec9965912cd248de (diff)
downloadxine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.gz
xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.bz2
Merge from 1.1.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9f93072c..6596cc45a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,7 +68,10 @@ xine-lib (1.1.90) (Unreleased)
* Report more video output capabilities via (port)->get_capabilities():
colour controls, zooming, colour keying.
-xine-lib (1.1.14) 2008-??-??
+xine-lib (1.1.15) 2008-??-??
+ * V4L: Don't segfault if asked for an input that doesn't exist
+
+xine-lib (1.1.14) 2008-06-29
* DVB changes:
- Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are
changed on a regular basis.)