summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-17 16:50:59 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-17 16:50:59 +0100
commit35b16971490c92f53cb5264e68ba67fb7352629a (patch)
tree5a17a0bc2f6abfae1d802e094c07b5b72aaa6d00 /ChangeLog
parentb70e34352e304cf03da32b688d84eec3c3ffacec (diff)
parentf1382ea01b368dc1d8044b368f602aad87f6468e (diff)
downloadxine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.gz
xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.bz2
Merge from 1.1.
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6596cc45a..daaede4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,7 +69,10 @@ xine-lib (1.1.90) (Unreleased)
colour controls, zooming, colour keying.
xine-lib (1.1.15) 2008-??-??
+ * Use external ffmpeg by default.
* V4L: Don't segfault if asked for an input that doesn't exist
+ * Recognise AMR audio (normally found in 3GP files).
+ * Recognise Snow video.
xine-lib (1.1.14) 2008-06-29
* DVB changes: