From d8d66952029c89a0b4ffcedc0c22f56c9c01c0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 25 Jan 2008 22:46:31 +0100
Subject: Advertise proper support for FLAC files.

application/x-flac is not reported anywhere.
Both file(1) and shared-mime-info report audio/x-flac.
Xiph wiki[1] reports audio/flac as being queued for registration.

Report both audio/x-flac and audio/flac for compatibility.

[1] http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
---
 src/combined/demux_flac.c | 3 ++-
 src/demuxers/demux_flac.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/combined/demux_flac.c b/src/combined/demux_flac.c
index 85f98e876..fdc7ab7ea 100644
--- a/src/combined/demux_flac.c
+++ b/src/combined/demux_flac.c
@@ -732,7 +732,8 @@ get_extensions (demux_class_t *this_gen) {
 
 static char *
 get_mimetypes (demux_class_t *this_gen) {
-    return "application/x-flac: flac: FLAC Audio;";
+    return "audio/x-flac: flac: FLAC Audio;"
+	"audio/flac: flac: FLAC Audio;";
 }
 
 static void 
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 3afb5b031..23e2faef9 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -544,7 +544,8 @@ static const char *get_extensions (demux_class_t *this_gen) {
 }
 
 static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
+  return "audio/x-flac: flac: FLAC Audio;"
+    "audio/flac: flac: FLAC Audio;";
 }
 
 static void class_dispose (demux_class_t *this_gen) {
-- 
cgit v1.2.3


From 499a81b162ecb54d061f103b51b33f024cd2eb30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 25 Jan 2008 22:49:26 +0100
Subject: Report unofficial mimetypes (x- variants) for the Ogg demuxer too.

---
 src/demuxers/demux_ogg.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index d1b522727..82eefdf75 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -2119,8 +2119,11 @@ static const char *anx_get_extensions (demux_class_t *this_gen) {
 
 static const char *anx_get_mimetypes (demux_class_t *this_gen) {
   return "application/annodex: anx: Annodex media;"
+         "application/x-annodex: anx: Annodex media;"
          "audio/annodex: axa: Annodex audio;"
+         "audio/x-annodex: axa: Annodex audio;"
          "video/annodex: axv: Annodex video;";
+         "video/x-annodex: axv: Annodex video;";
 }
 
 static void anx_class_dispose (demux_class_t *this_gen) {
@@ -2162,8 +2165,11 @@ static const char *ogg_get_extensions (demux_class_t *this_gen) {
 
 static const char *ogg_get_mimetypes (demux_class_t *this_gen) {
   return "application/ogg: ogx: Ogg Stream;"
+         "application/x-ogg: ogx: Ogg Stream;"
          "audio/ogg: oga: Ogg Audio;"
+         "audio/x-ogg: oga: Ogg Audio;"
          "video/ogg: ogv: Ogg Video;";
+         "video/x-ogg: ogv: Ogg Video;";
 }
 
 static void ogg_class_dispose (demux_class_t *this_gen) {
-- 
cgit v1.2.3


From ef96216c903e38dc3c8b835efc9bf27605179249 Mon Sep 17 00:00:00 2001
From: Claudio Ciccani <klan@directfb.org>
Date: Fri, 25 Jan 2008 12:30:58 +0100
Subject: Fixed parsing of keyframes indices (do not assume a specific order
 betwen "times" and "filepositions"). Parse flv script data only once upon
 send_headers(). Use relative seeking instead of absolute seeking when
 seek_time-current_time is below 5 seconds. (transplanted from
 689daba9823670864eaef213733987196be21acc)

--HG--
extra : transplant_source : %3CA%D9%CBuM%14%DAR%F8%89K%EF%13%83%17%9A%F7%AB%8F
---
 src/demuxers/demux_flv.c | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index bdb33d21d..a1f0b3a7b 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -306,10 +306,12 @@ static int parse_flv_var(demux_flv_t *this,
       num = _X_BE_32(tmp);
       tmp += 4;
       if (key && keylen == 5 && !strncmp(key, "times", 5)) {
-        if (this->index)
-          free (this->index);
-        this->index = xine_xmalloc(num*sizeof(flv_index_entry_t));
-        this->num_indices = num;
+        if (!this->index || this->num_indices != num) {
+          if (this->index)
+            free(this->index);
+          this->index = xine_xmalloc(num*sizeof(flv_index_entry_t));
+          this->num_indices = num;
+        }
         for (num = 0; num < this->num_indices && tmp < end; num++) {
           if (*tmp++ == FLV_DATA_TYPE_NUMBER) {
             lprintf("  got number (%f)\n", BE_F64(tmp));
@@ -320,16 +322,20 @@ static int parse_flv_var(demux_flv_t *this,
         break;
       }
       if (key && keylen == 13 && !strncmp(key, "filepositions", 13)) {
-        if (this->index && this->num_indices == num) {
-          for (num = 0; num < this->num_indices && tmp < end; num++) {
-            if (*tmp++ == FLV_DATA_TYPE_NUMBER) {
-              lprintf("  got number (%f)\n", BE_F64(tmp));
-              this->index[num].offset = BE_F64(tmp);
-              tmp += 8;
-            }
+        if (!this->index || this->num_indices != num) {
+          if (this->index)
+            free(this->index);
+          this->index = xine_xmalloc(num*sizeof(flv_index_entry_t));
+          this->num_indices = num;
+        }
+        for (num = 0; num < this->num_indices && tmp < end; num++) {
+          if (*tmp++ == FLV_DATA_TYPE_NUMBER) {
+            lprintf("  got number (%f)\n", BE_F64(tmp));
+            this->index[num].offset = BE_F64(tmp);
+            tmp += 8;
           }
-          break;
         }
+        break;
       }
       while (num-- && tmp < end) {
         len = parse_flv_var(this, tmp, end-tmp, NULL, 0);
@@ -502,9 +508,9 @@ static int read_flv_packet(demux_flv_t *this, int preview) {
         
       case FLV_TAG_TYPE_SCRIPT:
         lprintf("  got script tag...\n");
-        parse_flv_script(this, remaining_bytes);
-
         if (preview) {
+          parse_flv_script(this, remaining_bytes);
+
           /* send init info to decoders using script information as reference */
           if (!this->got_audio_header && this->audiocodec) {
             buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo);
@@ -570,7 +576,9 @@ static int read_flv_packet(demux_flv_t *this, int preview) {
           }
           
           return this->status;
-        }            
+        }
+        /* no preview */
+        this->input->seek(this->input, remaining_bytes, SEEK_CUR);   
         continue;
         
       default:
@@ -662,7 +670,7 @@ static void seek_flv_file(demux_flv_t *this, off_t seek_pos, int seek_pts) {
     }
   }
   
-  if (seek_pos && this->videocodec) {
+  if (seek_pos && this->videocodec && abs(seek_pts-this->cur_pts) > 300000) {
     off_t pos, size;
     
     pos = this->input->get_current_pos(this->input);
-- 
cgit v1.2.3


From c83889f17b35876c9575ca5cc9644e63b006981a Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Fri, 25 Jan 2008 21:58:29 +0000
Subject: Changelog update.

---
 ChangeLog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 39be0ed4e..75ac42bf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 xine-lib (1.1.10) (unreleased)
+  * Security fixes:
+    - Buffer overflow which allows a remote attacker to execute arbitrary
+      code or crash the client program via a crafted ASF header. 
+      (Related to CVE-2006-1664)
   * Update Ogg and Annodex mimetypes and extensions.
   * Change the default v4l device paths to /dev/video0 and /dev/radio0.
   * Fix support for subtitles with schemes (e.g. http://), partly broken
@@ -8,10 +12,9 @@ xine-lib (1.1.10) (unreleased)
     end authors should be careful with xine-lib older than 1.1.10.
   * Backported xine-config & libxine.pc from 1.2.
     Consequently, xine-config now requires pkg-config.
-  * Sanity-check ASF header sizes. This fixes a crash in the ASF demuxer,
-    caused by the example exploit given for CVE-2006-1664.
   * Don't discard audio samples forever. Fixed streaming playback.
   * Fix a possible crash on channel change in the DVB plugin.
+  * Flash video demuxer improvements and bug fixes.
 
 xine-lib (1.1.9.1) 2008-01-11
   * Security fixes:
-- 
cgit v1.2.3


From da5afb9cc5c1369b99db81f3c254eaf69642b777 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 01:39:52 +0000
Subject: Fix a few recently-caused compiler warnings.

---
 src/demuxers/demux_mpgaudio.c | 4 ++--
 src/demuxers/demux_ogg.c      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 180a9752c..1bea02302 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -591,14 +591,14 @@ static int parse_frame_payload(demux_mpgaudio_t *this,
     if (this->xing_header) {
       buf->free_buffer(buf);
       xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-              LOG_MODULE ": found Xing header at offset %PRId64\n", frame_pos);
+              LOG_MODULE ": found Xing header at offset %"PRId64"\n", frame_pos);
       return 1;
     }
     this->vbri_header = parse_vbri_header(&this->cur_frame, buf->content, this->cur_frame.size);
     if (this->vbri_header) {
       buf->free_buffer(buf);
       xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-              LOG_MODULE ": found Vbri header at offset %PRId64\n", frame_pos);
+              LOG_MODULE ": found Vbri header at offset %"PRId64"\n", frame_pos);
       return 1;
     }
   }
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 82eefdf75..dc867e5f1 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -2122,7 +2122,7 @@ static const char *anx_get_mimetypes (demux_class_t *this_gen) {
          "application/x-annodex: anx: Annodex media;"
          "audio/annodex: axa: Annodex audio;"
          "audio/x-annodex: axa: Annodex audio;"
-         "video/annodex: axv: Annodex video;";
+         "video/annodex: axv: Annodex video;"
          "video/x-annodex: axv: Annodex video;";
 }
 
@@ -2168,7 +2168,7 @@ static const char *ogg_get_mimetypes (demux_class_t *this_gen) {
          "application/x-ogg: ogx: Ogg Stream;"
          "audio/ogg: oga: Ogg Audio;"
          "audio/x-ogg: oga: Ogg Audio;"
-         "video/ogg: ogv: Ogg Video;";
+         "video/ogg: ogv: Ogg Video;"
          "video/x-ogg: ogv: Ogg Video;";
 }
 
-- 
cgit v1.2.3


From 728b56b78c6cbc6e239714b58eb440683c93d847 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 15:07:16 +0000
Subject: Unbreak xine-config distribution.

---
 misc/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/Makefile.am b/misc/Makefile.am
index a5ef28635..70cbe59ee 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = build_rpms.sh \
 	SlackBuild.in \
 	SlackBuild \
 	vga.xinefont.gz \
+	xine-config \
 	xine-fontconv.c \
 	xine-lib.spec.in \
 	xine-lib.spec \
-- 
cgit v1.2.3


From b6dfc3fc918b6067028121e660341c623942ced1 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 16:46:09 +0000
Subject: Resync translation source file.

---
 po/libxine1.pot | 511 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 271 insertions(+), 240 deletions(-)

diff --git a/po/libxine1.pot b/po/libxine1.pot
index 94d07aee3..3a9a95f4b 100644
--- a/po/libxine1.pot
+++ b/po/libxine1.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-12-24 18:34+0000\n"
+"POT-Creation-Date: 2008-01-26 14:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -712,12 +712,12 @@ msgstr ""
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 
-#: src/demuxers/demux_asf.c:426
+#: src/demuxers/demux_asf.c:441
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
-#: src/demuxers/demux_asf.c:428
+#: src/demuxers/demux_asf.c:443
 msgid "Media stream scrambled/encrypted"
 msgstr ""
 
@@ -1782,7 +1782,7 @@ msgstr ""
 msgid "input_net: unable to connect to '%s'.\n"
 msgstr ""
 
-#: src/input/input_net.c:508
+#: src/input/input_net.c:514
 msgid "net input plugin as shipped with xine"
 msgstr ""
 
@@ -1805,28 +1805,28 @@ msgstr ""
 msgid "input_pvr: read error (%s)\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1150 src/input/input_pvr.c:1403
+#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1426
 #, c-format
 msgid "input_pvr: error opening device %s\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1156 src/input/input_pvr.c:1409
+#: src/input/input_pvr.c:1179 src/input/input_pvr.c:1432
 msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1164 src/input/input_pvr.c:1418
+#: src/input/input_pvr.c:1187 src/input/input_pvr.c:1441
 msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
 msgstr ""
 
-#: src/input/input_pvr.c:1526
+#: src/input/input_pvr.c:1549
 msgid "WinTV-PVR 250/350 input plugin"
 msgstr ""
 
-#: src/input/input_pvr.c:1552
+#: src/input/input_pvr.c:1575
 msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
 msgstr ""
 
-#: src/input/input_pvr.c:1553
+#: src/input/input_pvr.c:1576
 msgid "The path to the device of your WinTV card."
 msgstr ""
 
@@ -2015,7 +2015,13 @@ msgstr ""
 msgid "rtsp_session: session can not be established.\n"
 msgstr ""
 
-#: src/input/librtsp/rtsp_session.c:159
+#: src/input/librtsp/rtsp_session.c:153
+msgid ""
+"rtsp_session: rtsp server returned overly-large headers, session can not be "
+"established.\n"
+msgstr ""
+
+#: src/input/librtsp/rtsp_session.c:164
 #, c-format
 msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
 msgstr ""
@@ -2350,37 +2356,37 @@ msgstr ""
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:156
+#: src/libffmpeg/ff_video_decoder.c:158
 msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:174
+#: src/libffmpeg/ff_video_decoder.c:176
 msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:338
+#: src/libffmpeg/ff_video_decoder.c:359
 #, c-format
 msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:367
+#: src/libffmpeg/ff_video_decoder.c:391
 msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:408
+#: src/libffmpeg/ff_video_decoder.c:434
 msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:836
+#: src/libffmpeg/ff_video_decoder.c:874
 #, c-format
 msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:1562
+#: src/libffmpeg/ff_video_decoder.c:1600
 msgid "MPEG-4 postprocessing quality"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:1563
+#: src/libffmpeg/ff_video_decoder.c:1601
 msgid ""
 "You can adjust the amount of post processing applied to MPEG-4 video.\n"
 "Higher values result in better quality, but need more CPU. Lower values may "
@@ -2389,17 +2395,42 @@ msgid ""
 "much."
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:1571
+#: src/libffmpeg/ff_video_decoder.c:1609
 msgid "FFmpeg video decoding thread count"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:1572
+#: src/libffmpeg/ff_video_decoder.c:1610
 msgid ""
 "You can adjust the number of video decoding threads which FFmpeg may use.\n"
 "Higher values should speed up decoding but it depends on the codec used "
 "whether parallel decoding is supported. A rule of thumb is to have one "
-"decoding thread per logical CPU (typically 1 to 4). A change will take "
-"effect with playing the next stream."
+"decoding thread per logical CPU (typically 1 to 4).\n"
+"A change of this setting will take effect with playing the next stream."
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1619
+msgid "Skip loop filter"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1620
+msgid ""
+"You can control for which frames the loop filter shall be skipped after "
+"decoding.\n"
+"Skipping the loop filter will speedup decoding but may lead to artefacts. "
+"The number of frames for which it is skipped increases from 'none' to 'all'. "
+"The default value leaves the decision up to the implementation.\n"
+"A change of this setting will take effect with playing the next stream."
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1629
+msgid "Choose speed over specification compliance"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1630
+msgid ""
+"You may want to allow speed cheats which violate codec specification.\n"
+"Cheating may speed up decoding but can also lead to decoding artefacts.\n"
+"A change of this setting will take effect with playing the next stream."
 msgstr ""
 
 #: src/libffmpeg/ffmpeg_encoder.c:165
@@ -2558,59 +2589,59 @@ msgstr ""
 msgid "encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/demux_sputext.c:1504
+#: src/libsputext/demux_sputext.c:1479
 msgid "default duration of subtitle display in seconds"
 msgstr ""
 
-#: src/libsputext/demux_sputext.c:1505
+#: src/libsputext/demux_sputext.c:1480
 msgid ""
 "Some subtitle formats do not explicitly give a duration for each subtitle. "
 "For these, you can set a default duration here. Setting to zero will result "
 "in the subtitle being shown until the next one takes over."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:928
+#: src/libsputext/xine_sputext_decoder.c:1151
 msgid "subtitle size"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:929
+#: src/libsputext/xine_sputext_decoder.c:1152
 msgid ""
 "You can adjust the subtitle size here. The setting will be evaluated "
 "relative to the window size."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:935
+#: src/libsputext/xine_sputext_decoder.c:1158
 msgid "subtitle vertical offset"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:936
+#: src/libsputext/xine_sputext_decoder.c:1159
 msgid ""
 "You can adjust the vertical position of the subtitle. The setting will be "
 "evaluated relative to the window size."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:942
-#: src/libsputext/xine_sputext_decoder.c:951
+#: src/libsputext/xine_sputext_decoder.c:1165
+#: src/libsputext/xine_sputext_decoder.c:1174
 msgid "font for subtitles"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:943
+#: src/libsputext/xine_sputext_decoder.c:1166
 msgid "A font from the xine font directory to be used for the subtitle text."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:952
+#: src/libsputext/xine_sputext_decoder.c:1175
 msgid "An outline font file (e.g. a .ttf) to be used for the subtitle text."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:958
+#: src/libsputext/xine_sputext_decoder.c:1181
 msgid "whether to use a freetype font"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:965
+#: src/libsputext/xine_sputext_decoder.c:1188
 msgid "encoding of the subtitles"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:966
+#: src/libsputext/xine_sputext_decoder.c:1189
 msgid ""
 "The encoding of the subtitle text in the stream. This setting is used to "
 "render non-ASCII characters correctly. If non-ASCII characters are not "
@@ -2618,11 +2649,11 @@ msgid ""
 "used."
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:974
+#: src/libsputext/xine_sputext_decoder.c:1197
 msgid "use unscaled OSD if possible"
 msgstr ""
 
-#: src/libsputext/xine_sputext_decoder.c:975
+#: src/libsputext/xine_sputext_decoder.c:1198
 msgid ""
 "The unscaled OSD will be rendered independently of the video frame and will "
 "always be sharp, even if the video is magnified. This will look better, but "
@@ -3073,10 +3104,10 @@ msgid "video colour key"
 msgstr ""
 
 #: src/video_out/video_out_directfb.c:1365
-#: src/video_out/video_out_vidix.c:1156 src/video_out/video_out_vidix.c:1163
-#: src/video_out/video_out_vidix.c:1170 src/video_out/video_out_xcbxv.c:1438
-#: src/video_out/video_out_xv.c:1491 src/video_out/video_out_xvmc.c:1445
-#: src/video_out/video_out_xxmc.c:2529
+#: src/video_out/video_out_vidix.c:1168 src/video_out/video_out_vidix.c:1175
+#: src/video_out/video_out_vidix.c:1182 src/video_out/video_out_xcbxv.c:1445
+#: src/video_out/video_out_xv.c:1503 src/video_out/video_out_xvmc.c:1464
+#: src/video_out/video_out_xxmc.c:2541
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3171,18 +3202,18 @@ msgstr ""
 msgid "xine video output plugin for win32 using directx"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:758
+#: src/video_out/video_out_fb.c:770
 #, c-format
 msgid ""
 "video_out_fb: only packed truecolour/directcolour is supported (%d).\n"
 "     Check 'fbset -i' or try 'fbset -depth 16'.\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:818 src/video_out/video_out_vidix.c:1236
+#: src/video_out/video_out_fb.c:830 src/video_out/video_out_vidix.c:1248
 msgid "framebuffer device name"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:819 src/video_out/video_out_vidix.c:1237
+#: src/video_out/video_out_fb.c:831 src/video_out/video_out_vidix.c:1249
 msgid ""
 "Specifies the file name for the framebuffer device to be used.\n"
 "This setting is security critical, because when changed to a different file, "
@@ -3190,16 +3221,16 @@ msgid ""
 "careful that the value you enter really is a proper framebuffer device."
 msgstr ""
 
-#: src/video_out/video_out_fb.c:893
+#: src/video_out/video_out_fb.c:905
 msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:950
+#: src/video_out/video_out_fb.c:962
 #, c-format
 msgid "video_out_fb: %d video RAM buffers are available.\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:956
+#: src/video_out/video_out_fb.c:968
 #, c-format
 msgid ""
 "WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
@@ -3208,13 +3239,13 @@ msgid ""
 "     the frame buffer resolution might help.\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:967
+#: src/video_out/video_out_fb.c:979
 msgid ""
 "WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
 "     do not support screen panning (used for frame flips).\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:1036
+#: src/video_out/video_out_fb.c:1048
 #, c-format
 msgid ""
 "WARNING: video_out_fb: current display depth is %d. For better performance\n"
@@ -3222,7 +3253,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/video_out/video_out_fb.c:1067
+#: src/video_out/video_out_fb.c:1079
 msgid "Xine video output plugin using the Linux frame buffer device"
 msgstr ""
 
@@ -3273,9 +3304,9 @@ msgid ""
 "Ignored for static render routines.\n"
 msgstr ""
 
-#: src/video_out/video_out_opengl.c:1915 src/video_out/video_out_vidix.c:1012
-#: src/video_out/video_out_xcbxv.c:1470 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xvmc.c:1459 src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_opengl.c:1915 src/video_out/video_out_vidix.c:1024
+#: src/video_out/video_out_xcbxv.c:1477 src/video_out/video_out_xv.c:1535
+#: src/video_out/video_out_xvmc.c:1478 src/video_out/video_out_xxmc.c:2573
 msgid "enable double buffering"
 msgstr ""
 
@@ -3350,9 +3381,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr ""
 
-#: src/video_out/video_out_pgx64.c:1461 src/video_out/video_out_xcbxv.c:1437
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1444
-#: src/video_out/video_out_xxmc.c:2528
+#: src/video_out/video_out_pgx64.c:1461 src/video_out/video_out_xcbxv.c:1444
+#: src/video_out/video_out_xv.c:1502 src/video_out/video_out_xvmc.c:1463
+#: src/video_out/video_out_xxmc.c:2540
 msgid "video overlay colour key"
 msgstr ""
 
@@ -3383,26 +3414,26 @@ msgid ""
 "memory."
 msgstr ""
 
-#: src/video_out/video_out_sdl.c:480
+#: src/video_out/video_out_sdl.c:488
 msgid "use hardware acceleration if available"
 msgstr ""
 
-#: src/video_out/video_out_sdl.c:481
+#: src/video_out/video_out_sdl.c:489
 msgid ""
 "When your system supports it, hardware acceleration provided by your "
 "graphics hardware will be used. This might not work, so you can disable it, "
 "if things go wrong."
 msgstr ""
 
-#: src/video_out/video_out_sdl.c:523
+#: src/video_out/video_out_sdl.c:531
 msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
 msgstr ""
 
-#: src/video_out/video_out_sdl.c:560
+#: src/video_out/video_out_sdl.c:568
 msgid "video_out_sdl: fullscreen mode is NOT supported\n"
 msgstr ""
 
-#: src/video_out/video_out_sdl.c:571
+#: src/video_out/video_out_sdl.c:579
 msgid "xine video output plugin using the Simple Direct Media Layer"
 msgstr ""
 
@@ -3418,59 +3449,59 @@ msgstr ""
 msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:938
+#: src/video_out/video_out_syncfb.c:950
 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:943
+#: src/video_out/video_out_syncfb.c:955
 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:948
+#: src/video_out/video_out_syncfb.c:960
 msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:954
+#: src/video_out/video_out_syncfb.c:966
 msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:961
+#: src/video_out/video_out_syncfb.c:973
 msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:966
+#: src/video_out/video_out_syncfb.c:978
 msgid ""
 "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
 "RGB565)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:985
+#: src/video_out/video_out_syncfb.c:997
 msgid ""
 "video_out_syncfb: info. (brightness/contrast control won't be available "
 "because your SyncFB kernel module seems to be outdated. Please refer to "
 "README.syncfb for informations on how to update it.)\n"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:1009
+#: src/video_out/video_out_syncfb.c:1021
 msgid "default number of frame repetitions"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:1010
+#: src/video_out/video_out_syncfb.c:1022
 msgid ""
 "This specifies how many times a single video frame will be displayed "
 "consecutively."
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:1058
+#: src/video_out/video_out_syncfb.c:1070
 msgid ""
 "xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:1076
+#: src/video_out/video_out_syncfb.c:1088
 msgid "SyncFB device name"
 msgstr ""
 
-#: src/video_out/video_out_syncfb.c:1077
+#: src/video_out/video_out_syncfb.c:1089
 msgid ""
 "Specifies the file name for the SyncFB (TeleTux) device to be used.\n"
 "This setting is security critical, because when changed to a different file, "
@@ -3478,101 +3509,101 @@ msgid ""
 "careful that the value you enter really is a proper framebuffer device."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:990
+#: src/video_out/video_out_vidix.c:1002
 msgid "red intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:990
+#: src/video_out/video_out_vidix.c:1002
 msgid "The intensity of the red colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:995
+#: src/video_out/video_out_vidix.c:1007
 msgid "green intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:995
+#: src/video_out/video_out_vidix.c:1007
 msgid "The intensity of the green colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1000
+#: src/video_out/video_out_vidix.c:1012
 msgid "blue intensity"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1000
+#: src/video_out/video_out_vidix.c:1012
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1013 src/video_out/video_out_xcbxv.c:1471
-#: src/video_out/video_out_xv.c:1524 src/video_out/video_out_xvmc.c:1460
-#: src/video_out/video_out_xxmc.c:2562
+#: src/video_out/video_out_vidix.c:1025 src/video_out/video_out_xcbxv.c:1478
+#: src/video_out/video_out_xv.c:1536 src/video_out/video_out_xvmc.c:1479
+#: src/video_out/video_out_xxmc.c:2574
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
 "flickering and tearing artifacts, but will use more graphics memory."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1060
+#: src/video_out/video_out_vidix.c:1072
 msgid "video_out_vidix: adaptor supports the yuy2 format\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1071
+#: src/video_out/video_out_vidix.c:1083
 msgid "video_out_vidix: adaptor supports the yv12 format\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1087
+#: src/video_out/video_out_vidix.c:1099
 msgid "video_out_vidix: You have wrong version of VIDIX library\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1095
+#: src/video_out/video_out_vidix.c:1107
 msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1108
+#: src/video_out/video_out_vidix.c:1120
 #, c-format
 msgid "video_out_vidix: using driver: %s by %s\n"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1155
+#: src/video_out/video_out_vidix.c:1167
 msgid "video overlay colour key red component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1162
+#: src/video_out/video_out_vidix.c:1174
 msgid "video overlay colour key green component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1169
+#: src/video_out/video_out_vidix.c:1181
 msgid "video overlay colour key blue component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1201
+#: src/video_out/video_out_vidix.c:1213
 msgid "xine video output plugin using libvidix for x11"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1283
+#: src/video_out/video_out_vidix.c:1295
 msgid "xine video output plugin using libvidix for linux frame buffer"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:155
+#: src/video_out/video_out_xcbshm.c:150
 #, c-format
 msgid ""
 "video_out_xcbshm: %s: allocating image\n"
 "video_out_xcbshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:164
+#: src/video_out/video_out_xcbshm.c:159
 msgid ""
 "video_out_xcbshm: shared memory error (address error) when allocating "
 "image \n"
 "video_out_xcbshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:175
+#: src/video_out/video_out_xcbshm.c:170
 msgid ""
 "video_out_xcbshm: x11 error during shared memory XImage creation\n"
 "video_out_xcbshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:1098 src/video_out/video_out_xshm.c:1154
+#: src/video_out/video_out_xcbshm.c:1101 src/video_out/video_out_xshm.c:1157
 #, c-format
 msgid ""
 "\n"
@@ -3582,42 +3613,42 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:1111
+#: src/video_out/video_out_xcbshm.c:1114
 msgid "video_out_xcbshm: MIT shared memory extension not present on display.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:1210
+#: src/video_out/video_out_xcbshm.c:1213
 msgid "video_out_xcbshm: your video mode was not recognized, sorry :-(\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:1240 src/video_out/video_out_xshm.c:1300
+#: src/video_out/video_out_xcbshm.c:1243 src/video_out/video_out_xshm.c:1303
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:268
+#: src/video_out/video_out_xcbxv.c:263
 msgid ""
 "video_out_xcbxv: XvShmCreateImage returned a zero size\n"
 "video_out_xcbxv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:277
+#: src/video_out/video_out_xcbxv.c:272
 #, c-format
 msgid ""
 "video_out_xcbxv: shared memory error in shmget: %s\n"
 "video_out_xcbxv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:296
+#: src/video_out/video_out_xcbxv.c:291
 msgid ""
 "video_out_xcbxv: x11 error during shared memory XImage creation\n"
 "video_out_xcbxv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1289
+#: src/video_out/video_out_xcbxv.c:1296
 msgid "video_out_xcbxv: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1331
+#: src/video_out/video_out_xcbxv.c:1338
 msgid ""
 "video_out_xcbxv: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
@@ -3625,30 +3656,30 @@ msgid ""
 "Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1339
+#: src/video_out/video_out_xcbxv.c:1346
 #, c-format
 msgid ""
 "video_out_xcbxv: using Xv port %d from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1446 src/video_out/video_out_xv.c:1499
-#: src/video_out/video_out_xvmc.c:1453 src/video_out/video_out_xxmc.c:2537
+#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1511
+#: src/video_out/video_out_xvmc.c:1472 src/video_out/video_out_xxmc.c:2549
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1447 src/video_out/video_out_xv.c:1500
-#: src/video_out/video_out_xvmc.c:1454 src/video_out/video_out_xxmc.c:2538
+#: src/video_out/video_out_xcbxv.c:1454 src/video_out/video_out_xv.c:1512
+#: src/video_out/video_out_xvmc.c:1473 src/video_out/video_out_xxmc.c:2550
 msgid "Make Xv autopaint its colour key."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1454 src/video_out/video_out_xv.c:1507
-#: src/video_out/video_out_xxmc.c:2545
+#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1519
+#: src/video_out/video_out_xxmc.c:2557
 msgid "bilinear scaling mode"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1455 src/video_out/video_out_xv.c:1508
-#: src/video_out/video_out_xxmc.c:2546
+#: src/video_out/video_out_xcbxv.c:1462 src/video_out/video_out_xv.c:1520
+#: src/video_out/video_out_xxmc.c:2558
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -3663,31 +3694,31 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1507
+#: src/video_out/video_out_xcbxv.c:1514
 msgid "video_out_xcbxv: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1512
+#: src/video_out/video_out_xcbxv.c:1519
 msgid "video_out_xcbxv: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1520 src/video_out/video_out_xv.c:1584
-#: src/video_out/video_out_xxmc.c:2630
+#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1596
+#: src/video_out/video_out_xxmc.c:2642
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1521 src/video_out/video_out_xv.c:1585
-#: src/video_out/video_out_xxmc.c:2631
+#: src/video_out/video_out_xcbxv.c:1528 src/video_out/video_out_xv.c:1597
+#: src/video_out/video_out_xxmc.c:2643
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1591
-#: src/video_out/video_out_xvmc.c:1522
+#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1603
+#: src/video_out/video_out_xvmc.c:1541
 msgid "deinterlace method (deprecated)"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1528 src/video_out/video_out_xv.c:1592
-#: src/video_out/video_out_xvmc.c:1523
+#: src/video_out/video_out_xcbxv.c:1535 src/video_out/video_out_xv.c:1604
+#: src/video_out/video_out_xvmc.c:1542
 msgid ""
 "This config setting is deprecated. You should use the new deinterlacing post "
 "processing settings instead.\n"
@@ -3725,41 +3756,41 @@ msgid ""
 "with medium CPU usage."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1582 src/video_out/video_out_xv.c:1665
-#: src/video_out/video_out_xxmc.c:2725
+#: src/video_out/video_out_xcbxv.c:1589 src/video_out/video_out_xv.c:1677
+#: src/video_out/video_out_xxmc.c:2737
 msgid "xine video output plugin using the MIT X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:199
+#: src/video_out/video_out_xshm.c:194
 msgid ""
 "video_out_xshm: shared memory error when allocating image\n"
 "video_out_xshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:215
+#: src/video_out/video_out_xshm.c:210
 #, c-format
 msgid ""
 "video_out_xshm: %s: allocating image\n"
 "video_out_xshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:225
+#: src/video_out/video_out_xshm.c:220
 msgid ""
 "video_out_xshm: shared memory error (address error) when allocating image \n"
 "video_out_xshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:242
+#: src/video_out/video_out_xshm.c:237
 msgid ""
 "video_out_xshm: x11 error during shared memory XImage creation\n"
 "video_out_xshm: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:1167
+#: src/video_out/video_out_xshm.c:1170
 msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
 msgstr ""
 
-#: src/video_out/video_out_xshm.c:1251
+#: src/video_out/video_out_xshm.c:1254
 msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
 msgstr ""
 
@@ -3788,66 +3819,66 @@ msgid ""
 "video_out_xv: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xv.c:1348
 msgid "video_out_xv: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1373
+#: src/video_out/video_out_xv.c:1385
 msgid ""
 "video_out_xv: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 "              Looks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1382
+#: src/video_out/video_out_xv.c:1394
 #, c-format
 msgid ""
 "video_out_xv: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1557
+#: src/video_out/video_out_xv.c:1569
 msgid "video_out_xv: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1562
+#: src/video_out/video_out_xv.c:1574
 msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1591
+#: src/video_out/video_out_xvmc.c:1610
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1637
+#: src/video_out/video_out_xvmc.c:1656
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1735
+#: src/video_out/video_out_xvmc.c:1754
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1744
+#: src/video_out/video_out_xvmc.c:1763
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colour space conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1749
+#: src/video_out/video_out_xvmc.c:1768
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1770
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1772
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1754
+#: src/video_out/video_out_xvmc.c:1773
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
@@ -3877,89 +3908,89 @@ msgid ""
 "video_out_xxmc: => not using MIT Shared Memory extension.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2380
+#: src/video_out/video_out_xxmc.c:2392
 msgid "video_out_xxmc: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2417
+#: src/video_out/video_out_xxmc.c:2429
 msgid ""
 "video_out_xxmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 "              Looks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2426
+#: src/video_out/video_out_xxmc.c:2438
 #, c-format
 msgid ""
 "video_out_xxmc: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2602
+#: src/video_out/video_out_xxmc.c:2614
 msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2607
+#: src/video_out/video_out_xxmc.c:2619
 msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2636
+#: src/video_out/video_out_xxmc.c:2648
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2637
+#: src/video_out/video_out_xxmc.c:2649
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2643
+#: src/video_out/video_out_xxmc.c:2655
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2644
+#: src/video_out/video_out_xxmc.c:2656
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2650
+#: src/video_out/video_out_xxmc.c:2662
 msgid "Fix buggy NVIDIA XvMC subpicture colours"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2651
+#: src/video_out/video_out_xxmc.c:2663
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2656
+#: src/video_out/video_out_xxmc.c:2668
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2657
+#: src/video_out/video_out_xxmc.c:2669
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "alternate between top and bottom field at double the frame rate.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2663
+#: src/video_out/video_out_xxmc.c:2675
 msgid "Don't use bob deinterlacing for progressive frames."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2664
+#: src/video_out/video_out_xxmc.c:2676
 msgid ""
 "Progressive frames don't need deinterlacing, so disabling it on\n"
 "demand should result in a better picture.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2670
+#: src/video_out/video_out_xxmc.c:2682
 msgid "Don't use bob deinterlacing while a scaled OSD is active."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2671
+#: src/video_out/video_out_xxmc.c:2683
 msgid ""
 "Bob deinterlacing adds some noise to horizontal lines, so disabling it\n"
 "on demand should result in a better OSD picture.\n"
@@ -4017,32 +4048,32 @@ msgid ""
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:1109
+#: src/xine-engine/audio_out.c:1110
 msgid ""
 "audio_out: delay calculation impossible with an unavailable audio device\n"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:1248
+#: src/xine-engine/audio_out.c:1249
 msgid "write to sound card failed. Assuming the device was unplugged.\n"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:1420
+#: src/xine-engine/audio_out.c:1421
 msgid "8 bits not supported by driver, converting to 16 bits.\n"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:1428
+#: src/xine-engine/audio_out.c:1429
 msgid "mono not supported by driver, converting to stereo.\n"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:1434
+#: src/xine-engine/audio_out.c:1435
 msgid "stereo not supported by driver, converting to mono.\n"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2093
+#: src/xine-engine/audio_out.c:2098
 msgid "method to sync audio and video"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2094
+#: src/xine-engine/audio_out.c:2099
 msgid ""
 "When playing audio and video, there are at least two clocks involved: The "
 "system clock, to which video frames are synchronized and the clock in your "
@@ -4065,11 +4096,11 @@ msgid ""
 "form."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2122
+#: src/xine-engine/audio_out.c:2127
 msgid "enable resampling"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2123
+#: src/xine-engine/audio_out.c:2128
 msgid ""
 "When the sample rate of the decoded audio does not match the capabilities of "
 "your sound hardware, an adaptation called \"resampling\" is required. Here "
@@ -4077,33 +4108,33 @@ msgid ""
 "automatically when necessary."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2130
+#: src/xine-engine/audio_out.c:2135
 msgid "always resample to this rate (0 to disable)"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2131
+#: src/xine-engine/audio_out.c:2136
 msgid ""
 "Some audio drivers do not correctly announce the capabilities of the audio "
 "hardware. By setting a value other than zero here, you can force the audio "
 "stream to be resampled to the given rate."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2140
+#: src/xine-engine/audio_out.c:2145
 msgid "offset for digital passthrough"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2141
+#: src/xine-engine/audio_out.c:2146
 msgid ""
 "If you use an external surround decoder and audio is ahead or behind video, "
 "you can enter a fixed offset here to compensate.\n"
 "The unit of the value is one PTS tick, which is the 90000th part of a second."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2150
+#: src/xine-engine/audio_out.c:2155
 msgid "play audio even on slow/fast speeds"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2151
+#: src/xine-engine/audio_out.c:2156
 msgid ""
 "If you enable this option, the audio will be heard even when playback speed "
 "is different than 1X. Of course, it will sound distorted (lower/higher "
@@ -4111,23 +4142,23 @@ msgid ""
 "audio post plugin instead."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2224
+#: src/xine-engine/audio_out.c:2229
 msgid "startup audio volume"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2225
+#: src/xine-engine/audio_out.c:2230
 msgid "The overall audio volume set at xine startup."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2228
+#: src/xine-engine/audio_out.c:2233
 msgid "restore volume level at startup"
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2229
+#: src/xine-engine/audio_out.c:2234
 msgid "If disabled, xine will not modify any mixer settings at startup."
 msgstr ""
 
-#: src/xine-engine/audio_out.c:2259
+#: src/xine-engine/audio_out.c:2264
 msgid "audio_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 
@@ -4150,22 +4181,22 @@ msgstr ""
 msgid "configfile: WARNING: your configuration will not be saved\n"
 msgstr ""
 
-#: src/xine-engine/configfile.c:1138
+#: src/xine-engine/configfile.c:1139
 #, c-format
 msgid "configfile: WARNING: writing configuration to %s failed\n"
 msgstr ""
 
-#: src/xine-engine/configfile.c:1139
+#: src/xine-engine/configfile.c:1140
 #, c-format
 msgid "configfile: WARNING: removing possibly broken config file %s\n"
 msgstr ""
 
-#: src/xine-engine/configfile.c:1140
+#: src/xine-engine/configfile.c:1141
 #, c-format
 msgid "configfile: WARNING: you should check the backup file %s\n"
 msgstr ""
 
-#: src/xine-engine/configfile.c:1275
+#: src/xine-engine/configfile.c:1276
 #, c-format
 msgid "configfile: entry '%s' mustn't be modified from MRL\n"
 msgstr ""
@@ -4516,70 +4547,70 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:377
+#: src/xine-engine/video_decoder.c:387
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:456
+#: src/xine-engine/video_decoder.c:466
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:492
+#: src/xine-engine/video_decoder.c:502
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:493
+#: src/xine-engine/video_decoder.c:503
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:640
+#: src/xine-engine/video_out.c:666
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:813
+#: src/xine-engine/video_out.c:839
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1793
+#: src/xine-engine/video_out.c:1817
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1818
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1833
+#: src/xine-engine/video_out.c:1875
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1876
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1839
+#: src/xine-engine/video_out.c:1881
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1882
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1874
+#: src/xine-engine/video_out.c:1916
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 
@@ -4622,132 +4653,132 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:789 src/xine-engine/xine.c:896
-#: src/xine-engine/xine.c:935 src/xine-engine/xine.c:971
-#: src/xine-engine/xine.c:983 src/xine-engine/xine.c:996
-#: src/xine-engine/xine.c:1009 src/xine-engine/xine.c:1022
-#: src/xine-engine/xine.c:1048 src/xine-engine/xine.c:1073
-#: src/xine-engine/xine.c:1108
+#: src/xine-engine/xine.c:802 src/xine-engine/xine.c:909
+#: src/xine-engine/xine.c:949 src/xine-engine/xine.c:985
+#: src/xine-engine/xine.c:997 src/xine-engine/xine.c:1010
+#: src/xine-engine/xine.c:1023 src/xine-engine/xine.c:1036
+#: src/xine-engine/xine.c:1062 src/xine-engine/xine.c:1087
+#: src/xine-engine/xine.c:1124
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:831
+#: src/xine-engine/xine.c:844
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:848
+#: src/xine-engine/xine.c:861
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:859
+#: src/xine-engine/xine.c:872
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:885
+#: src/xine-engine/xine.c:898
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:921
+#: src/xine-engine/xine.c:935
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:928
+#: src/xine-engine/xine.c:942
 msgid "xine: error opening rip input plugin instance\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:959
+#: src/xine-engine/xine.c:973
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:988
+#: src/xine-engine/xine.c:1002
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1001
+#: src/xine-engine/xine.c:1015
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1014
+#: src/xine-engine/xine.c:1028
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1027
+#: src/xine-engine/xine.c:1041
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1098
+#: src/xine-engine/xine.c:1114
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1102
+#: src/xine-engine/xine.c:1118
 msgid "xine: error opening subtitle mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1134
+#: src/xine-engine/xine.c:1150
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1141
+#: src/xine-engine/xine.c:1157
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1161
+#: src/xine-engine/xine.c:1177
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1177
+#: src/xine-engine/xine.c:1193
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1198
+#: src/xine-engine/xine.c:1214
 #, c-format
 msgid "xine: demuxer is already done. that was fast!\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1200
+#: src/xine-engine/xine.c:1216
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1266
+#: src/xine-engine/xine.c:1282
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1336
+#: src/xine-engine/xine.c:1352
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1612
+#: src/xine-engine/xine.c:1628
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1633
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1643
+#: src/xine-engine/xine.c:1659
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1652
+#: src/xine-engine/xine.c:1668
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1653
+#: src/xine-engine/xine.c:1669
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -4765,11 +4796,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1671
+#: src/xine-engine/xine.c:1687
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1672
+#: src/xine-engine/xine.c:1688
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -4779,11 +4810,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1683
+#: src/xine-engine/xine.c:1699
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1684
+#: src/xine-engine/xine.c:1700
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -4793,26 +4824,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1698
+#: src/xine-engine/xine.c:1714
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1699
+#: src/xine-engine/xine.c:1715
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:2051
+#: src/xine-engine/xine.c:2067
 msgid "messages"
 msgstr ""
 
-#: src/xine-engine/xine.c:2052
+#: src/xine-engine/xine.c:2068
 msgid "plugin"
 msgstr ""
 
-#: src/xine-engine/xine.c:2053
+#: src/xine-engine/xine.c:2069
 msgid "trace"
 msgstr ""
 
-- 
cgit v1.2.3


From c018c8408df06dcf47c2c924e0b88a6a048573de Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 17:42:56 +0000
Subject: Quick hack to allow configuration of the V4L ALSA audio input device.

---
 ChangeLog             |  1 +
 src/input/input_v4l.c | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 75ac42bf8..80791eb18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ xine-lib (1.1.10) (unreleased)
   * Don't discard audio samples forever. Fixed streaming playback.
   * Fix a possible crash on channel change in the DVB plugin.
   * Flash video demuxer improvements and bug fixes.
+  * Make the V4L ALSA audio input device configurable. (This needs more work.)
 
 xine-lib (1.1.9.1) 2008-01-11
   * Security fixes:
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 34f6a0684..d0558b492 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -93,6 +93,9 @@ static const resolution_t resolutions[] = {
 #define NUM_RESOLUTIONS  (sizeof(resolutions)/sizeof(resolutions[0]))
 #define RADIO_DEV        "/dev/radio0"
 #define VIDEO_DEV        "/dev/video0"
+#ifdef HAVE_ALSA
+#define AUDIO_DEV	 "plughw:0,0"
+#endif
 
 #if !defined(NDELAY) && defined(O_NDELAY)
 #define FNDELAY O_NDELAY
@@ -1701,6 +1704,9 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
 {
   /* v4l_input_class_t  *cls = (v4l_input_class_t *) cls_gen; */
   v4l_input_plugin_t *this;
+#ifdef HAVE_ALSA
+  cfg_entry_t        *entry;
+#endif
   char               *mrl     = strdup(data);
   
   /* Example mrl:  v4l:/Television/62500 */
@@ -1721,13 +1727,14 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
   this->event_queue   = NULL;
   this->scr           = NULL;
 #ifdef HAVE_ALSA
-  this->pcm_name      = NULL;
   this->pcm_data      = NULL;
   this->pcm_hwparams  = NULL;
   
   /* Audio */
   this->pcm_stream    = SND_PCM_STREAM_CAPTURE;
-  this->pcm_name      = strdup("plughw:0,0");
+  entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
+                                                   "media.video4linux.audio_device");
+  this->pcm_name      = strdup (entry->str_value);
   this->audio_capture = 1;
 #endif
   this->rate          = 44100;
@@ -1910,7 +1917,15 @@ static void *init_video_class (xine_t *xine, void *data)
 			   _("v4l video device"),
 			   _("The path to your Video4Linux video device."),
 			   10, NULL, NULL);
-  
+#ifdef HAVE_ALSA
+  config->register_filename (config, "media.video4linux.audio_device",
+			   AUDIO_DEV, 0,
+			   _("v4l ALSA audio input device"),
+			   _("The name of the audio device which corresponds "
+			     "to your Video4Linux video device."),
+			   10, NULL, NULL);
+#endif  
+
   return this;
 }
 
-- 
cgit v1.2.3


From e24b61023d44bdf561fe0a3dc5b7d5f996547d9c Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 17:44:45 +0000
Subject: Resync translation source file (again).

---
 po/libxine1.pot | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/po/libxine1.pot b/po/libxine1.pot
index 3a9a95f4b..fe631b703 100644
--- a/po/libxine1.pot
+++ b/po/libxine1.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-01-26 14:49+0000\n"
+"POT-Creation-Date: 2008-01-26 17:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1923,43 +1923,53 @@ msgstr ""
 msgid "stdin streaming input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:379
+#: src/input/input_v4l.c:382
 msgid "Buffer underrun..."
 msgstr ""
 
-#: src/input/input_v4l.c:383
+#: src/input/input_v4l.c:386
 msgid "Buffer overrun..."
 msgstr ""
 
-#: src/input/input_v4l.c:386
+#: src/input/input_v4l.c:389
 msgid "Adjusting..."
 msgstr ""
 
-#: src/input/input_v4l.c:658
+#: src/input/input_v4l.c:661
 msgid "Tuner name not found\n"
 msgstr ""
 
-#: src/input/input_v4l.c:1874
+#: src/input/input_v4l.c:1881
 msgid "v4l tv input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1878
+#: src/input/input_v4l.c:1885
 msgid "v4l radio input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1910
+#: src/input/input_v4l.c:1917
 msgid "v4l video device"
 msgstr ""
 
-#: src/input/input_v4l.c:1911
+#: src/input/input_v4l.c:1918
 msgid "The path to your Video4Linux video device."
 msgstr ""
 
-#: src/input/input_v4l.c:1936
+#: src/input/input_v4l.c:1923
+msgid "v4l ALSA audio input device"
+msgstr ""
+
+#: src/input/input_v4l.c:1924
+msgid ""
+"The name of the audio device which corresponds to your Video4Linux video "
+"device."
+msgstr ""
+
+#: src/input/input_v4l.c:1951
 msgid "v4l radio device"
 msgstr ""
 
-#: src/input/input_v4l.c:1937
+#: src/input/input_v4l.c:1952
 msgid "The path to your Video4Linux radio device."
 msgstr ""
 
-- 
cgit v1.2.3


From 5dfe5ae0be904d5992c3f535962ed9fac48663e8 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 21:02:02 +0000
Subject: Fix font installation (broken by the xine-config backport).

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 884d64e8e..c9396cf27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2398,7 +2398,7 @@ AC_SUBST(xinelibdir)
 AC_SUBST(xinedatadir)
 
 XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
-XINE_FONTDIR="\${xinedatadir}/xine/libxine$XINE_MAJOR/fonts"
+XINE_FONTDIR="\${xinedatadir}/libxine$XINE_MAJOR/fonts"
 XINE_LOCALEDIR='${datadir}/locale'
 XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"
 XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`"
-- 
cgit v1.2.3


From d59888853ae53ff61a341d19095e866dc79db56d Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 21:02:36 +0000
Subject: 1.1.10 release.

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 80791eb18..9c34b71d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-xine-lib (1.1.10) (unreleased)
+xine-lib (1.1.10) 2008-01-26
   * Security fixes:
     - Buffer overflow which allows a remote attacker to execute arbitrary
       code or crash the client program via a crafted ASF header. 
-- 
cgit v1.2.3


From 71827e5c4ab13f43e9eeefbf4f2a933b1c81727a Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 21:22:27 +0000
Subject: Added tag xine-lib-1_1_10-release for changeset 7f1232425c6d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8b9b6199b..6e05d9638 100644
--- a/.hgtags
+++ b/.hgtags
@@ -64,3 +64,4 @@ ab1531337553ad5eac24a69ac665eae33916b423 xine-lib-1_1_7-release
 e0a332b9d3e8bb3fad4d7feac1e519292b062056 xine-lib-1_1_8-release
 b6be674453e922114b55d4613cb197c77d19f094 xine-lib-1_1_9-release
 9438947f88ad2bed1832385301c6b4e62709625a xine-lib-1_1_9_1-release
+7f1232425c6d715c404e6df1292075b33ecb8305 xine-lib-1_1_10-release
-- 
cgit v1.2.3


From 082345c5b57e53633def3900b84d2a99974e8ac1 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 21:22:43 +0000
Subject: Added signature for changeset
 ae1e23df14223cdacf83df75b28b223895d658c2

---
 .hgsigs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgsigs b/.hgsigs
index 528d1e655..367ce4851 100644
--- a/.hgsigs
+++ b/.hgsigs
@@ -2,3 +2,4 @@
 42358e16442fe54fa554006e0b0bafd51e065c32 0 iD8DBQBG0xz0zbwfTn7RbcARAoD3AJ4012pabmpQvCKKDokZNyZzfPIbWgCfRk5FRly/Eei/xXnSaT54XHAT5KM=
 1dbf784bebc791266fcca02e917ee63034ac2e0b 0 iD8DBQBHgQ2mzbwfTn7RbcARArl9AKCslqZDrrm0GiU3IbBvcQVbOdSXlwCgyEMuHY2y/+T6WEeB2CXvCTs5ulI=
 b591d00fcd386cdd3779378c34b2d42b7504afc4 0 iD8DBQBHh5UfsBKtjPGfWZ8RAgvMAJ9xwnDNifmaobFYe2nR7+rJlLTkEQCgguGMqwqRZY68HWQXhEx918hp4Yg=
+ae1e23df14223cdacf83df75b28b223895d658c2 0 iD8DBQBHm6SjsBKtjPGfWZ8RAi8HAKDAHmmLu8rwN5XJJPhfEofE7BTpsgCfTyNzku+v/PhqXgl4kQnRiB6nUSE=
-- 
cgit v1.2.3