Merge

6 files changed, 19 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index f7e8b3243..ec47096eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+xine-lib (1.1.10) (unreleased)
+  * Update Ogg and Annodex mimetypes and extensions.
+  * Change the default v4l device paths to /dev/video0 and /dev/radio0.
+
 xine-lib (1.1.9.1)
   * Security fixes:
     - Fix a buffer overflow in RTSP header-handling code. (CVE-2008-0225)
diff --git a/configure.ac b/configure.ac
index f92318924..813c5c83a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,9 +16,9 @@ dnl   XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below
 dnl
 XINE_MAJOR=1
 XINE_MINOR=1
-XINE_SUB=9
+XINE_SUB=10
 # XINE_PATCH should be left empty or set to ".1" or ".2" or something similar
-XINE_PATCH=.1
+XINE_PATCH=
 
 #if test $XINE_SUB -eq 0 ; then
 #  XINE_SUBPART="";
diff --git a/debian/changelog b/debian/changelog
index 91999074d..6c3d1ab7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xine-lib (1.1.9~hg-0) unstable; urgency=low
+xine-lib (1.1.10~hg-0) unstable; urgency=low
 
   [ Darren Salt ]
   * Hg snapshot.
@@ -7,7 +7,7 @@ xine-lib (1.1.9~hg-0) unstable; urgency=low
   * remove gs from build-dependencies
   * change the maintainer field to xine-devel@lists.sourceforge.net.
 
- -- Reinhard Tartler <siretart@tauware.de>  Sun, 25 Nov 2007 23:45:52 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Mon, 14 Jan 2008 22:57:42 +0000
 
 xine-lib (1.1.5~cvs-0) unstable; urgency=low
 
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 9743cf361..1176024e0 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -6,7 +6,7 @@
   <title>The xine engine FAQ</title>
   <titleabbrev>xine FAQ</titleabbrev>
   <copyright>
-   <year>2001-2003</year>
+   <year>2001-2008</year>
    <holder>the xine project team</holder>
   </copyright>
  </bookinfo>
@@ -946,7 +946,7 @@
      Latest xine-lib modules (1-beta3 or newer) support external subtitles
      for any media file, not only AVI. In order to use it you can pass a
      special MRL construction like:
-     <screen>&nbsp;&nbsp;&nbsp;<command>xine test.mpg#subtitle:file.sub</command></screen>
+     <screen>&nbsp;&nbsp;&nbsp;<command>xine file://path/to/test.mpg#subtitle:/path/to/file.sub</command></screen>
      The external subtitles support can also be used by any xine frontend.
      Currently xine-ui and kaffeine implement this feature with a subtitle
      selection dialog.
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 9ed39f12d..d1b522727 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -2118,7 +2118,9 @@ static const char *anx_get_extensions (demux_class_t *this_gen) {
 }
 
 static const char *anx_get_mimetypes (demux_class_t *this_gen) {
-  return "application/x-annodex: ogg: Annodex media;";
+  return "application/annodex: anx: Annodex media;"
+         "audio/annodex: axa: Annodex audio;"
+         "video/annodex: axv: Annodex video;";
 }
 
 static void anx_class_dispose (demux_class_t *this_gen) {
@@ -2155,14 +2157,13 @@ static const char *ogg_get_identifier (demux_class_t *this_gen) {
 }
 
 static const char *ogg_get_extensions (demux_class_t *this_gen) {
-  return "ogg ogm spx";
+  return "ogx ogv oga ogg spx ogm";
 }
 
 static const char *ogg_get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-ogg: ogg: OggVorbis Audio;"
-         "audio/x-speex: ogg: Speex Audio;"
-         "application/x-ogg: ogg: Ogg Stream;"
-         "application/ogg: ogg: Ogg Stream;";
+  return "application/ogg: ogx: Ogg Stream;"
+         "audio/ogg: oga: Ogg Audio;"
+         "video/ogg: ogv: Ogg Video;";
 }
 
 static void ogg_class_dispose (demux_class_t *this_gen) {
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index b43a2684a..34f6a0684 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -91,8 +91,8 @@ static const resolution_t resolutions[] = {
 };
 
 #define NUM_RESOLUTIONS  (sizeof(resolutions)/sizeof(resolutions[0]))
-#define RADIO_DEV        "/dev/v4l/radio0"
-#define VIDEO_DEV        "/dev/v4l/video0"
+#define RADIO_DEV        "/dev/radio0"
+#define VIDEO_DEV        "/dev/video0"
 
 #if !defined(NDELAY) && defined(O_NDELAY)
 #define FNDELAY O_NDELAY