r225 - in general/xine-lib-vdr/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 02 Mar 2005 11:40:35 +0100
Author: tschmidt
Date: 2005-03-02 11:34:25 +0100 (Wed, 02 Mar 2005)
New Revision: 225
Added:
general/xine-lib-vdr/trunk/debian/patches/
general/xine-lib-vdr/trunk/debian/patches/00list
general/xine-lib-vdr/trunk/debian/patches/01_am_maintainer_mode.dpatch
general/xine-lib-vdr/trunk/debian/patches/02_from_cvs.dpatch
general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch
general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
Modified:
general/xine-lib-vdr/trunk/debian/changelog
general/xine-lib-vdr/trunk/debian/control
general/xine-lib-vdr/trunk/debian/copyright
general/xine-lib-vdr/trunk/debian/rules
Log:
Load newtrunk into general/xine-lib-vdr/trunk.
Modified: general/xine-lib-vdr/trunk/debian/changelog
===================================================================
--- general/xine-lib-vdr/trunk/debian/changelog 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/changelog 2005-03-02 10:34:25 UTC (rev 225)
@@ -1,5 +1,52 @@
-xine-lib (1.0-1) unstable; urgency=low
+xine-lib-vdr (1.0-1vdr6) unstable; urgency=low
+ * Updated patches from CVS branch xine-1_0.
+ * Dropped my XML, PNG/MNG and plugin description patches (merged).
+ * Converted the copyright file to UTF-8.
+ * Use standards version 3.6.1.
+ * Add sgmltools-lite and w3m to Build-Depends.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sat, 12 Feb 2005 21:51:12 +0000
+
+xine-lib-vdr (1.0-1vdr5) unstable; urgency=low
+
+ * Updated patches from CVS xine-1_0 and vdr-xine 0.7.0.
+ * Extra patch to allow access to descriptions for most types of plugin.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Wed, 02 Feb 2005 17:41:41 +0000
+
+xine-lib-vdr (1.0-1vdr4) unstable; urgency=low
+
+ * Updated patches from CVS xine-1_0.
+ * Extra patches:
+ + XML character entities
+ + PNG/MNG display fixups (shout if these break things):
+ - distortion if image width isn't a multiple of 8
+ - wrong colours (red/blue swapped)
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sun, 16 Jan 2005 19:13:28 +0000
+
+xine-lib-vdr (1.0-1vdr3) unstable; urgency=low
+
+ * Updated vdr patch from vdr-plugin-xine 0.6.4.
+ * Grabbed patches from CVS xine-1_0.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 10 Jan 2005 21:28:26 +0000
+
+xine-lib-vdr (1.0-1vdr2) unstable; urgency=high
+
+ * Patched for vdr.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Fri, 31 Dec 2004 19:14:25 +0000
+
+xine-lib-vdr (1.0-1vdr1) unstable; urgency=high
+
+ * Patched for vdr.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 28 Dec 2004 16:00:28 +0000
+
+xine-lib (1.0-1) unstable; urgency=high
+
* new upstream release
* links libXv dynamically (closes: #287186)
* updated build dependancies:
@@ -8,13 +55,15 @@
* added libsmbclient based SMB input plugin in addition to the gnomevfs one
* added libmodplug based support for various tracker formats
* added MNG support via libmng
+ * added vulnerability IDs in 1-rc8-1 changelog
- -- Siggi Langauf <siggi@flake.langauf.de> Sat, 25 Dec 2004 21:44:26 +0100
+ -- Siggi Langauf <siggi@debian.org> Sun, 26 Dec 2004 12:20:24 +0100
xine-lib (1-rc8-1) unstable; urgency=high
* new upstream release (closes: #286030)
* fixes PNM and RTSP related security vulnerabilities (closes: #286077)
+ This has been assigned CAN-2004-1188.
* fixes DVB playback for fullfeatured cards (possibly closes: #281873)
* added patch to fix aiff vulnerability (CAN-2004-1300, closes: #285899)
Modified: general/xine-lib-vdr/trunk/debian/control
===================================================================
--- general/xine-lib-vdr/trunk/debian/control 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/control 2005-03-02 10:34:25 UTC (rev 225)
@@ -1,11 +1,11 @@
-Source: xine-lib
+Source: xine-lib-vdr
Section: libs
Priority: optional
Maintainer: Siggi Langauf <siggi@debian.org>
Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>
-Build-Depends: debhelper (>= 4.0.4), aalib1-dev (>= 1.4p5-2), libcaca-dev, xlibs-dev (>> 4.1), xlibs-static-dev, libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev
+Build-Depends: debhelper (>= 4.0.4), dpatch, aalib1-dev (>= 1.4p5-2), libcaca-dev, xlibs-dev (>> 4.1), xlibs-static-dev, libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, sgmltools-lite, w3m
Build-Conflicts: libdvdnav-dev
-Standards-Version: 3.5.9
+Standards-Version: 3.6.1
Package: libxine-dev
Architecture: any
Modified: general/xine-lib-vdr/trunk/debian/copyright
===================================================================
--- general/xine-lib-vdr/trunk/debian/copyright 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/copyright 2005-03-02 10:34:25 UTC (rev 225)
@@ -2,7 +2,7 @@
Current versions can be downloaded from http://xine.sf.net
-Upstream Authors: Gnter Bartsch and lots of others (see AUTHORS file)
+Upstream Authors: Günter Bartsch and lots of others (see AUTHORS file)
Copyright (C) 2000,2001 the xine project
Added: general/xine-lib-vdr/trunk/debian/patches/00list
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/00list 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/patches/00list 2005-03-02 10:34:25 UTC (rev 225)
@@ -0,0 +1,4 @@
+01_am_maintainer_mode
+02_from_cvs
+03_vdr-xine_patch
+99_autoconf
Added: general/xine-lib-vdr/trunk/debian/patches/01_am_maintainer_mode.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/01_am_maintainer_mode.dpatch 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/patches/01_am_maintainer_mode.dpatch 2005-03-02 10:34:25 UTC (rev 225)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_am_maintainer_mode.dpatch by <ds@flibble.youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xine-lib-vdr-1-rc7/configure.ac /tmp/dpep.XGGKrs/xine-lib-vdr-1-rc7/configure.ac
+--- xine-lib-vdr-1-rc7/configure.ac 2004-11-21 21:48:22.000000000 +0000
++++ /tmp/dpep.XGGKrs/xine-lib-vdr-1-rc7/configure.ac 2004-11-21 21:49:03.000000000 +0000
+@@ -6,6 +6,8 @@
+ AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
+ AC_CONFIG_LIBOBJ_DIR([lib])
+
++AM_MAINTAINER_MODE
++
+ dnl
+ dnl Require autoconf version 2.53
+ dnl
Added: general/xine-lib-vdr/trunk/debian/patches/02_from_cvs.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/02_from_cvs.dpatch 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/patches/02_from_cvs.dpatch 2005-03-02 10:34:25 UTC (rev 225)
@@ -0,0 +1,107832 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_from_cvs.dpatch by xine developers
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cvs diff -uN -rxine-1_0-release -rxine-1_0
+## DP: (without the Wndws-specific and non-distributed bits)
+
+@DPATCH@
+--- ./AUTHORS 13 Dec 2004 04:04:35 -0000 1.217
++++ ./AUTHORS 9 Feb 2005 19:38:44 -0000 1.217.2.1
+@@ -128,6 +128,10 @@
+ VCD interpretation code in the extended VCD plugin from VCDImager
+ by Herbert Valerio Riedel http://vcdimager.org
+
++ CD I/O routines for the above from GNU libcdio
++ by Rocky Bernstein and Herbert Valerio Riedel
++ http://www.gnu.org/software/libcdio
++
+ Goom - visual effects generator
+ Written by Jean-Christophe Hoelt et. al.
+ http://ios.free.fr/?page=projet&quoi=1
+@@ -535,4 +539,7 @@
+ Tadashi Jokagi <elf2000@users.sourceforge.net>
+ Japanese translation of xine-ui
+
++Piarres Beobide <pi@beobide.net>
++ Basque translation of xine-ui
++
+ (let us know if we've forgotten anyone)
+--- ./CREDITS 3 Dec 2004 01:20:20 -0000 1.39
++++ ./CREDITS 9 Feb 2005 19:38:44 -0000 1.39.2.1
+@@ -16,17 +16,18 @@
+ goom 2k4-dev21
+ gsm610 1.0.10 Mike Melanson
+ liba52 0.7.4
+-libcdio 0.68
++libcdio 0.71 [o]
+ libdts 0.0.2
+ libdvdnav 0.1.10 Michael Roitzsch
+ libfaad 2.0 Miguel Freitas
+ libmad 0.15.1b Miguel Freitas
+ libmpeg2 0.2.1 [*]
+-libvcd 0.7.20
++libmusepack svn 13/01/05 James Stembridge
++libvcd 0.7.21 [o]
+ nosefart 1.92 Mike Melanson
+ tvtime 0.9.8.4 Miguel Freitas
+ wine
+-vidix cvs (16/Nov/03) James Stembridge
++vidix 0.9.9 James Stembridge
+
+ -----------------------------------------------------------------------
+
+@@ -54,3 +55,9 @@
+ cvs (eg. motion vector clipping for broken streams). if you need any
+ specific change or fix feel free to send us a patch or discuss the issue
+ at xine-devel.
++
++
++[o] These libraries are not well maintained and subsetted from the
++ packages where they come from. The external versions of libcdio
++ and libvcdinfo are preferred. You also get regression tests and
++ CD/VCD diagnostic tools.
+--- ./ChangeLog 25 Dec 2004 21:10:59 -0000 1.550
++++ ./ChangeLog 9 Feb 2005 19:38:44 -0000 1.550.2.4
+@@ -1,3 +1,31 @@
++xine-lib (1.0.1)
++ * fixed builds with Xv or the entire X11 unavailble
++ * updated internal copies of VCD libraries to libcdio 0.71 and vcdimager 0.7.21
++ * fixed compatibility with new libtool versions [bug #1094262]
++ * renamed input.http_no_proxy to media.network.http_no_proxy
++ * tightened no-proxy domain matching & added exact host match ('=' prefix)
++ * assume that front ends can handle tabs (ffmpeg pp plugin help text)
++ * fixed MMS/ASF chained stream bug
++ * Shoutcast: fixed meta info handling
++ * MMST: fixed incorrect command length
++ * fixed end of stream detection with AVI files
++ * added support for WMA Voice codec
++ * added limited support for character entities to the XML parser
++ * fixed support of icecast 2 server
++ * fixed some memleaks related to DVD playback and MPEG PES
++ * fixed PNG/MNG image distortion and incorrect colouring
++ * fixed build on solaris and other platforms [bugs #1062987, #1114677 and
++ #1115001]
++ * published documentation about Win32 platform
++ * brand new DirectX audio output plugin for Windows
++ * updated win32 MSVC port
++ * used only ASCII characters for C locale
++ * fixed cropping and zooming with vidix
++ * fixed status reporting to honour IDLE status as documented
++ * fixed aborts on DVB channel switching [bug #1090707]
++ * updated vidix to 0.9.9
++ * plugin description accessor functions (may load plugins)
++
+ xine-lib (1.0)
+ * unbreak DXR3 plugin
+ * fix crash in the AIFF demuxer on oversized chunks
+--- ./Makefile.am 1 Dec 2004 20:26:45 -0000 1.42
++++ ./Makefile.am 9 Feb 2005 19:38:44 -0000 1.42.2.1
+@@ -54,6 +54,7 @@
+ (cd $$subdir && $(MAKE) $@) || exit;\
+ done;
+
++debug-install: install-debug
+
+ install-debug: debug
+ @list='$(SUBDIRS)'; for subdir in $$list; do \
+--- ./configure.ac 25 Dec 2004 21:10:59 -0000 1.304
++++ ./configure.ac 9 Feb 2005 19:38:45 -0000 1.304.2.3
+@@ -12,7 +12,7 @@
+ AC_PREREQ(2.53)
+
+ dnl Making releases:
+-dnl XINE_SUB += 1; continue with LT_* values below
++dnl XINE_SUB += 1; continue with XINE_LT_* values below
+ dnl
+ XINE_MAJOR=1
+ XINE_MINOR=0
+@@ -24,34 +24,34 @@
+ XINE_SUBPART=".$XINE_SUB"
+ fi
+
+-dnl The libtool version numbers (LT_*); Don't even think about faking this!
++dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this!
+ dnl
+ dnl immediately before every release do:
+ dnl ===================================
+ dnl if (the interface is totally unchanged from previous release)
+-dnl LT_REVISION ++;
++dnl XINE_LT_REVISION ++;
+ dnl else { /* interfaces have been added, removed or changed */
+-dnl LT_REVISION = 0;
+-dnl LT_CURRENT ++;
++dnl XINE_LT_REVISION = 0;
++dnl XINE_LT_CURRENT ++;
+ dnl if (any interfaces have been _added_ since last release)
+-dnl AGE ++;
++dnl XINE_LT_AGE ++;
+ dnl if (any interfaces have been _removed_ or _incompatibly changed_)
+-dnl AGE = 0;
++dnl XINE_LT_AGE = 0;
+ dnl }
+ dnl
+ dnl If you want to know more about what you are doing, here are some details:
+-dnl * LT_CURRENT is the current API version
+-dnl * LT_REVISION is an internal revision number which is increased when the API
++dnl * XINE_LT_CURRENT is the current API version
++dnl * XINE_LT_REVISION is an internal revision number which is increased when the API
+ dnl itself did not change
+-dnl * LT_AGE is the number of previous API versions still supported by this library
++dnl * XINE_LT_AGE is the number of previous API versions still supported by this library
+ dnl * libtool has its own numbering scheme, because local library numbering schemes
+ dnl are platform dependent
+ dnl * in Linux, the library will be named
+-dnl libname.so.(LT_CURRENT - LT_AGE).LT_AGE.LT_REVISION
++dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION
+
+-LT_CURRENT=12
+-LT_REVISION=1
+-LT_AGE=11
++XINE_LT_CURRENT=12
++XINE_LT_REVISION=1
++XINE_LT_AGE=11
+
+ dnl for a release tarball do "rm .cvsversion" before "make dist"
+ if test -f .cvsversion; then
+@@ -70,9 +70,9 @@
+ AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR,[xine minor version number])
+ AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB, [xine sub version number])
+
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-AC_SUBST(LT_AGE)
++AC_SUBST(XINE_LT_CURRENT)
++AC_SUBST(XINE_LT_REVISION)
++AC_SUBST(XINE_LT_AGE)
+
+ SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR${XINE_SUBPART}$XINE_PRE
+ TAR_NAME="xine-lib-"$SPEC_VERSION
+@@ -495,9 +495,6 @@
+ dnl With recent XFree86 or Xorg, dynamic linking is preferred!
+ dnl Only dynamic linking is possible when using libtool < 1.4.0
+
+-dnl ----------------------------------------------
+-dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?)
+-dnl ----------------------------------------------
+ AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
+ xv_path="$withval",)
+
+@@ -507,13 +504,9 @@
+ xv_prefer_shared="yes")
+
+ if test x"$no_x" != "xyes"; then
+-
+- dnl -----------------------------------------------
+- dnl Finding install Xv library
+- dnl -----------------------------------------------
+ AC_FIND_LIBXV
+-
+ fi
++AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+
+
+ host_or_hostalias="$host"
+@@ -710,9 +703,16 @@
+ dnl Checks for Ascii-Art library
+ dnl ---------------------------------------------
+
++AC_ARG_ENABLE(aalib,
++ AC_HELP_STRING([--disable-aalib], [do not build aalib]),
++ disable_aalib=yes,
++ disable_aalib=no)
++
++if test x$disable_aalib = "xno"; then
+ AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***]))
+-AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
++fi
+
++AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
+
+ dnl ---------------------------------------------
+ dnl Checks for Color AsCii Art library
+@@ -1266,13 +1266,13 @@
+
+ if test x"$internal_vcdnav" = "xno" && test x"$PKG_CONFIG" != "xno" ; then
+ AC_MSG_CHECKING(for libcdio)
+- if $PKG_CONFIG --atleast-version 0.64 libcdio; then
++ if $PKG_CONFIG --atleast-version 0.71 libcdio; then
+ AC_MSG_RESULT(found)
+ LIBCDIO_CFLAGS=`$PKG_CONFIG --cflags libcdio`
+ LIBCDIO_LIBS=`$PKG_CONFIG --libs libcdio`
+
+ AC_MSG_CHECKING(for libvcdinfo)
+- if $PKG_CONFIG --atleast-version 0.7.19-cdio libvcdinfo; then
++ if $PKG_CONFIG --atleast-version 0.7.21 libvcdinfo; then
+ AC_MSG_RESULT(found)
+ LIBVCDINFO_CFLAGS=`$PKG_CONFIG --cflags libvcdinfo`
+ LIBVCDINFO_LIBS=`$PKG_CONFIG --libs libvcdinfo`
+@@ -1514,7 +1514,20 @@
+ AC_FUNC_FSEEKO
+ AC_DEFINE(_GNU_SOURCE)
+ AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h sys/times.h sys/ioctl.h)
+-AC_REPLACE_FUNCS(basename gettimeofday hstrerror setenv strndup strpbrk strsep strtok_r)
++AC_REPLACE_FUNCS(basename gettimeofday setenv strndup strpbrk strsep strtok_r)
++
++AC_LIBSOURCE(hstrerror.c)
++AC_LINK_IFELSE([#include <netdb.h>
++int main(void) {
++ hstrerror(0);
++}], ac_cv_function_system_hstrerror="yes")
++AC_CHECK_LIB([resolv], [hstrerror], [ac_cv_function_system_hstrerror="yes"])
++if test x"$ac_cv_function_system_hstrerror" = "xyes"; then
++ AC_DEFINE(HAVE_HSTRERROR, 1, [Define to 1 if you have 'hstrerror' in <netdb.h>])
++else
++ AC_LIBOBJ(hstrerror)
++fi
++
+ AH_BOTTOM([/* include internal system specific header */
+ #include "os_internal.h"])
+
+@@ -2198,6 +2211,8 @@
+ src/liblpcm/Makefile
+ src/libmad/Makefile
+ src/libmpeg2/Makefile
++src/libmusepack/Makefile
++src/libmusepack/musepack/Makefile
+ src/libspudec/Makefile
+ src/libspucc/Makefile
+ src/libspucmml/Makefile
+--- ./include/xine.h.in 14 Dec 2004 20:45:22 -0000 1.136
++++ ./include/xine.h.in 9 Feb 2005 19:38:46 -0000 1.136.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xine.h.in,v 1.136 2004/12/14 20:45:22 miguelfreitas Exp $
++ * $Id: xine.h.in,v 1.136.2.1 2005/02/09 19:38:46 mroi Exp $
+ *
+ * public xine-lib (libxine) interface and documentation
+ *
+@@ -992,9 +992,23 @@
+ * returns NULL if no demuxer is available to handle this. */
+ char *xine_get_demux_for_mime_type (xine_t *self, const char *mime_type);
+
+-/* get a description string for an input plugin */
++/* get a description string for a plugin */
+ const char *xine_get_input_plugin_description (xine_t *self,
+ const char *plugin_id);
++const char *xine_get_demux_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_spu_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_audio_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_video_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_audio_driver_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_video_driver_plugin_description (xine_t *self,
++ const char *plugin_id);
++const char *xine_get_post_plugin_description (xine_t *self,
++ const char *plugin_id);
+
+ /* get lists of available audio and video output plugins */
+ const char *const *xine_list_audio_output_plugins (xine_t *self) ;
+@@ -1822,15 +1836,14 @@
+ void xine_osd_draw_rect (xine_osd_t *self, int x1, int y1,
+ int x2, int y2,
+ int color, int filled );
+-/* for freetype2 fonts x1 and y1 specifies the beginning of the baseline,
+- for xine fonts x1 and y1 specifies the upper left corner of the text
+- to be rendered */
++/* x1 and y1 specifies the upper left corner of the text to be rendered */
+ void xine_osd_draw_text (xine_osd_t *self, int x1, int y1,
+ const char *text, int color_base);
+ void xine_osd_draw_bitmap (xine_osd_t *self, uint8_t *bitmap,
+ int x1, int y1, int width, int height,
+ uint8_t *palette_map);
+-/* for freetype2 fonts the height is taken from _baseline_ to top */
++/* for freetype2 fonts the height is the maximum height for the whole font and not
++ * only for the specified text */
+ void xine_osd_get_text_size (xine_osd_t *self, const char *text,
+ int *width, int *height);
+ /* with freetype2 support compiled in, you can also specify a font file
+@@ -1859,6 +1872,11 @@
+ * color index, up to the size of the text palette.
+ *
+ * Use OSD_TEXT1, OSD_TEXT2, ... for some preassigned color indices.
++ *
++ * these palettes are not really well working the true type fonts.
++ * First thing is that these fonts can not have a border. So the best
++ * result you can get by loading a linearly blending palette from the
++ * background (at index 0) to the forground color (at index 10)
+ */
+ void xine_osd_set_text_palette (xine_osd_t *self,
+ int palette_number,
+--- ./lib/os_types.h 1 Dec 2004 07:30:54 -0000 1.3
++++ ./lib/os_types.h 9 Feb 2005 19:38:47 -0000 1.3.2.1
+@@ -17,9 +17,10 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id:
++ * $Id: os_types.h,v 1.3.2.1 2005/02/09 19:38:47 mroi Exp $ Ext
+ *
+- * Platform dependent types needed by public xine.h.
++ * Platform dependent types needed by public xine.h.
++ * Types not needed by xine.h are specified in os_internal.h.
+ *
+ * Heavily based on os_types.h from OggVorbis (BSD License),
+ * not tested on all platforms with xine.
+@@ -103,23 +104,15 @@
+ # ifndef __STDC_LIBRARY_SUPPORTED__
+ # define __STDC_LIBRARY_SUPPORTED__
+ # endif /* __STDC_LIBRARY_SUPPORTED__ */
+-# include <inttypes.h>
+-
+-#elif defined(MINGW32)
+
+ # include <inttypes.h>
+
+- struct timezone {
+- int tz_minuteswest;
+- int tz_dstime;
+- };
+-
+ #else
+
+ /*
+ * CygWin: _WIN32 & __GNUC__
+ * BeOS: __BEOS__
+- * Linux and others
++ * Linux, Solaris and others
+ */
+ # include <inttypes.h>
+
+--- ./m4/xv.m4 13 Dec 2004 21:35:21 -0000 1.4
++++ ./m4/xv.m4 1 Jan 2005 13:33:09 -0000 1.4.2.1
+@@ -43,8 +43,6 @@
+ ,
+ [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
+
+- AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+-
+ dnl -----------------------------------------------
+ dnl xine_check use Xv functions API.
+ dnl -----------------------------------------------
+@@ -66,7 +64,7 @@
+ AC_REQUIRE([AC_PATH_XTRA])
+
+ # Set xv_path if its not done already
+- if test -z $xv_path; then
++ if test x$xv_path = x; then
+ xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
+ fi
+
+@@ -77,7 +75,7 @@
+ fi
+
+ # Try the other lib if prefered failed
+- if test -z $XV_LIB; then
++ if test x$XV_LIB = x; then
+ if ! test "x$xv_prefer_shared" = "xyes"; then
+ AC_PATH_LIBXV_IMPL([libXv.so])
+ else
+@@ -85,7 +83,7 @@
+ fi
+ fi
+
+- if ! test -z $XV_LIB; then
++ if ! test x$XV_LIB = x; then
+ AC_TEST_LIBXV
+ fi
+ ])
+--- ./misc/xine-lib.spec.in 8 Dec 2004 20:25:36 -0000 1.83
++++ ./misc/xine-lib.spec.in 9 Feb 2005 19:38:47 -0000 1.83.2.2
+@@ -10,24 +10,60 @@
+ # Build separat packages:
+ # 1 create a sparate package
+ # 0 include files in main package
++%if %{?BUILD_AA:0}%{!?BUILD_AA:1}
+ %define BUILD_AA 0
++%endif
++%if %{?BUILD_ALSA09:0}%{!?BUILD_ALSA09:1}
+ %define BUILD_ALSA09 0
++%endif
++%if %{?BUILD_ARTS:0}%{!?BUILD_ARTS:1}
+ %define BUILD_ARTS 0
++%endif
++%if %{?BUILD_DEVEL:0}%{!?BUILD_DEVEL:1}
+ %define BUILD_DEVEL 1
++%endif
++%if %{?BUILD_DVB:0}%{!?BUILD_DVB:1}
+ %define BUILD_DVB 0
++%endif
++%if %{?BUILD_DVD:0}%{!?BUILD_DVD:1}
+ %define BUILD_DVD 0
++%endif
++%if %{?BUILD_DXR3:0}%{!?BUILD_DXR3:1}
+ %define BUILD_DXR3 0
++%endif
++%if %{?BUILD_ESD:0}%{!?BUILD_ESD:1}
+ %define BUILD_ESD 0
++%endif
++%if %{?BUILD_FLAC:0}%{!?BUILD_FLAC:1}
+ %define BUILD_FLAC 0
++%endif
++%if %{?BUILD_GNOME_VFS:0}%{!?BUILD_GNOME_VFS:1}
+ %define BUILD_GNOME_VFS 0
++%endif
++%if %{?BUILD_OGG:0}%{!?BUILD_OGG:1}
+ %define BUILD_OGG 0
++%endif
++%if %{?BUILD_OPENGL:0}%{!?BUILD_OPENGL:1}
+ %define BUILD_OPENGL 0
++%endif
++%if %{?BUILD_SDL:0}%{!?BUILD_SDL:1}
+ %define BUILD_SDL 0
++%endif
++%if %{?BUILD_DIRECTFB:0}%{!?BUILD_DIRECTFB:1}
+ %define BUILD_DIRECTFB 0
++%endif
++%if %{?BUILD_SYNCFB:0}%{!?BUILD_SYNCFB:1}
+ %define BUILD_SYNCFB 0
++%endif
++%if %{?BUILD_W32DLL:0}%{!?BUILD_W32DLL:1}
+ %define BUILD_W32DLL 0
++%endif
++%if %{?BUILD_XVMC:0}%{!?BUILD_XVMC:1}
+ %define BUILD_XVMC 0
++%endif
++%if %{?BUILD_STK:0}%{!?BUILD_STK:1}
+ %define BUILD_STK 0
++%endif
+
+ Name: %{name}
+ Summary: A portable video/audio library for unix-like systems.
+@@ -869,6 +905,10 @@
+ %endif
+
+ %changelog
++* Thu Jan 06 2005 Manfred Tremmel <Manfred.Tremmel@iiv.de>
++- enabled defining build or not to build subpackages at runtime
++ using '--define "BUILD_XYZ 1"', you can find possible BUILD_
++ defines at the top of the spec-file
+ * Tue Dec 07 2004 Manfred Tremmel <Manfred.Tremmel@iiv.de>
+ - included xxmc video out plugin into xvmc sub-rpm
+ * Sat Sep 11 2004 Manfred Tremmel <Manfred.Tremmel@iiv.de>
+--- ./po/Makefile.in.in 13 Dec 2004 00:17:45 -0000 1.16
++++ ./po/Makefile.in.in 9 Feb 2005 19:38:47 -0000 1.16.2.1
+@@ -86,8 +86,9 @@
+
+ $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
+ $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+- --add-comments --from-code=iso-8859-1 --keyword=_ --keyword=N_ \
++ --add-comments --keyword=_ --keyword=N_ \
+ --files-from=$(srcdir)/POTFILES.in \
++ --msgid-bugs-address='http://sourceforge.net/tracker/?atid=109655&group_id=9655' \
+ && test ! -f $(PACKAGE).po \
+ || ( rm -f $(srcdir)/$(PACKAGE).pot \
+ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+--- ./po/POTFILES.in 2005-02-12 22:28:44.000000000 +0000
++++ ./po/POTFILES.in 2005-02-12 22:28:45.000000000 +0000
+@@ -1,120 +1,125 @@
+ # For updating this file, look at the result of:
+ # head -3 po/POTFILES.in > /tmp/POTFILES.in && find src -name "*.[chy]" | xargs grep -l '[^A-Za-z_]_(' | grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/
+
+-src/audio_out/audio_alsa_out.c
+-src/audio_out/audio_arts_out.c
+-src/audio_out/audio_coreaudio_out.c
+-src/audio_out/audio_directx_out.c
+-src/audio_out/audio_esd_out.c
+-src/audio_out/audio_file_out.c
+-src/audio_out/audio_irixal_out.c
+-src/audio_out/audio_none_out.c
+-src/audio_out/audio_oss_out.c
+-src/audio_out/audio_polyp_out.c
+-src/audio_out/audio_sun_out.c
+-src/demuxers/demux_asf.c
+-src/demuxers/demux_avi.c
++src/libsputext/demux_sputext.c
++src/libsputext/xine_decoder.c
++src/libffmpeg/audio_decoder.c
++src/libffmpeg/video_decoder.c
++src/libffmpeg/dvaudio_decoder.c
++src/libffmpeg/xine_encoder.c
++src/liba52/xine_decoder.c
++src/xine-utils/memcpy.c
++src/libdts/xine_decoder.c
++src/libfaad/xine_decoder.c
++src/libspucmml/xine_decoder.c
++src/libspudvb/xine_decoder.c
++src/libmusepack/synth_filter.c
++src/libmusepack/xine_decoder.c
++src/libmusepack/requant.c
++src/libspucc/xine_decoder.c
++src/video_out/video_out_directfb.c
++src/video_out/video_out_xvmc.c
++src/video_out/video_out_vidix.c
++src/video_out/x11osd.c
++src/video_out/video_out_aa.c
++src/video_out/video_out_pgx64.c
++src/video_out/video_out_stk.c
++src/video_out/video_out_xxmc.c
++src/video_out/video_out_xshm.c
++src/video_out/video_out_fb.c
++src/video_out/video_out_sdl.c
++src/video_out/video_out_directx.c
++src/video_out/video_out_none.c
++src/video_out/video_out_caca.c
++src/video_out/video_out_pgx32.c
++src/video_out/alphablend.c
++src/video_out/video_out_xv.c
++src/video_out/video_out_syncfb.c
++src/video_out/video_out_opengl.c
++src/demuxers/demux_mpc.c
++src/demuxers/demux_ogg.c
+ src/demuxers/demux_film.c
+-src/demuxers/demux_iff.c
++src/demuxers/demux_voc.c
+ src/demuxers/demux_mpeg_block.c
+-src/demuxers/demux_mpeg_pes.c
+-src/demuxers/demux_ogg.c
++src/demuxers/demux_asf.c
+ src/demuxers/demux_snd.c
+-src/demuxers/demux_voc.c
++src/demuxers/demux_mpeg_pes.c
++src/demuxers/demux_avi.c
+ src/demuxers/demux_wc3movie.c
+-src/dxr3/dxr3.h
+-src/dxr3/dxr3_decode_spu.c
+-src/dxr3/dxr3_decode_video.c
+-src/dxr3/dxr3_mpeg_encoders.c
+-src/dxr3/dxr3_scr.c
+-src/dxr3/video_out_dxr3.c
+-src/input/input_cdda.c
++src/demuxers/demux_iff.c
++src/libxinevdec/bitplane.c
++src/libw32dll/w32codec.c
++src/libw32dll/qt_decoder.c
++src/input/input_rtp.c
++src/input/mmsh.c
++src/input/vcd/vcdplayer.h
++src/input/vcd/xineplug_inp_vcd.c
++src/input/vcd/vcdio.c
++src/input/vcd/vcdplayer.c
++src/input/media_helper.c
+ src/input/input_dvb.c
+ src/input/input_dvd.c
+-src/input/input_file.c
+-src/input/input_gnome_vfs.c
+-src/input/input_http.c
++src/input/input_stdin_fifo.c
+ src/input/input_mms.c
+-src/input/input_net.c
++src/input/net_buf_ctrl.c
+ src/input/input_pnm.c
+-src/input/input_pvr.c
+-src/input/input_rtp.c
+-src/input/input_rtsp.c
++src/input/input_http.c
++src/input/librtsp/rtsp.c
++src/input/librtsp/rtsp_session.c
++src/input/input_gnome_vfs.c
++src/input/input_net.c
+ src/input/input_smb.c
+-src/input/input_stdin_fifo.c
++src/input/pnm.c
+ src/input/input_v4l.c
+-src/input/input_vcd.c
+-src/input/media_helper.c
+ src/input/mms.c
+-src/input/mmsh.c
+-src/input/net_buf_ctrl.c
+-src/input/pnm.c
+-src/input/librtsp/rtsp.c
+-src/input/librtsp/rtsp_session.c
+-src/input/vcd/vcdio.c
+-src/input/vcd/vcdplayer.c
+-src/input/vcd/vcdplayer.h
+-src/input/vcd/xineplug_inp_vcd.c
+-src/liba52/xine_decoder.c
+-src/libdts/xine_decoder.c
+-src/libfaad/xine_decoder.c
+-src/libffmpeg/audio_decoder.c
+-src/libffmpeg/dvaudio_decoder.c
+-src/libffmpeg/video_decoder.c
+-src/libffmpeg/xine_encoder.c
+-src/libreal/audio_decoder.c
+-src/libreal/xine_decoder.c
+-src/libspucc/xine_decoder.c
+-src/libspucmml/xine_decoder.c
+-src/libspudvb/xine_decoder.c
+-src/libsputext/demux_sputext.c
+-src/libsputext/xine_decoder.c
+-src/libw32dll/qt_decoder.c
+-src/libw32dll/w32codec.c
+-src/libxinevdec/bitplane.c
+-src/post/audio/stretch.c
+-src/post/audio/upmix.c
+-src/post/deinterlace/xine_plugin.c
+-src/post/goom/xine_goom.c
+-src/post/mosaico/mosaico.c
+-src/post/mosaico/switch.c
+-src/post/planar/boxblur.c
+-src/post/planar/denoise3d.c
+-src/post/planar/eq.c
+-src/post/planar/eq2.c
+-src/post/planar/expand.c
+-src/post/planar/pp.c
+-src/post/planar/unsharp.c
+-src/video_out/alphablend.c
+-src/video_out/video_out_aa.c
+-src/video_out/video_out_caca.c
+-src/video_out/video_out_directfb.c
+-src/video_out/video_out_directx.c
+-src/video_out/video_out_fb.c
+-src/video_out/video_out_none.c
+-src/video_out/video_out_opengl.c
+-src/video_out/video_out_pgx32.c
+-src/video_out/video_out_pgx64.c
+-src/video_out/video_out_sdl.c
+-src/video_out/video_out_stk.c
+-src/video_out/video_out_syncfb.c
+-src/video_out/video_out_vidix.c
+-src/video_out/video_out_xshm.c
+-src/video_out/video_out_xv.c
+-src/video_out/video_out_xvmc.c
+-src/video_out/video_out_xxmc.c
+-src/video_out/x11osd.c
++src/input/input_cdda.c
++src/input/input_vcd.c
++src/input/input_rtsp.c
++src/input/input_pvr.c
++src/input/input_file.c
++src/dxr3/video_out_dxr3.c
++src/dxr3/dxr3_decode_spu.c
++src/dxr3/dxr3.h
++src/dxr3/dxr3_mpeg_encoders.c
++src/dxr3/dxr3_scr.c
++src/dxr3/dxr3_decode_video.c
++src/audio_out/audio_oss_out.c
++src/audio_out/audio_sun_out.c
++src/audio_out/audio_irixal_out.c
++src/audio_out/audio_none_out.c
++src/audio_out/audio_arts_out.c
++src/audio_out/audio_alsa_out.c
++src/audio_out/audio_directx2_out.c
++src/audio_out/audio_esd_out.c
++src/audio_out/audio_coreaudio_out.c
++src/audio_out/audio_directx_out.c
++src/audio_out/audio_file_out.c
++src/audio_out/audio_polyp_out.c
+ src/xine-engine/audio_decoder.c
+-src/xine-engine/audio_out.c
++src/xine-engine/video_decoder.c
+ src/xine-engine/configfile.c
+ src/xine-engine/info_helper.c
++src/xine-engine/io_helper.c
++src/xine-engine/audio_out.c
++src/xine-engine/video_out.c
+ src/xine-engine/input_cache.c
++src/xine-engine/xine.c
++src/xine-engine/osd.c
+ src/xine-engine/input_rip.c
+-src/xine-engine/io_helper.c
+ src/xine-engine/load_plugins.c
+-src/xine-engine/osd.c
+-src/xine-engine/video_decoder.c
+-src/xine-engine/video_out.c
+ src/xine-engine/vo_scale.c
+-src/xine-engine/xine.c
+-src/xine-utils/memcpy.c
++src/libreal/audio_decoder.c
++src/libreal/xine_decoder.c
++src/post/mosaico/mosaico.c
++src/post/mosaico/switch.c
++src/post/planar/pp.c
++src/post/planar/eq.c
++src/post/planar/expand.c
++src/post/planar/denoise3d.c
++src/post/planar/boxblur.c
++src/post/planar/eq2.c
++src/post/planar/unsharp.c
++src/post/deinterlace/xine_plugin.c
++src/post/audio/stretch.c
++src/post/audio/upmix.c
++src/post/goom/xine_goom.c
+--- ./po/cs.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/cs.po 2005-02-12 22:28:45.000000000 +0000
+@@ -1,13 +1,14 @@
+ # Czech translate, xine-lib.po.
+-# Copyright (C) 2002-2004 Free Software Foundation, Inc.
++# Copyright (C) 2002-2005 Free Software Foundation, Inc.
+ # Frantisek Dvorak <valtri@atlas.cz>, 2002.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: xine-lib 0.9.13\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
+-"PO-Revision-Date: 2004-12-12 00:16+0200\n"
++"Project-Id-Version: xine-lib 1.0.1\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
++"PO-Revision-Date: 2005-02-05 20:32+0100\n"
+ "Last-Translator: František Dvořák <valtri@atlas.cz>\n"
+ "Language-Team: Czech <cs@li.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -16,624 +17,1320 @@
+ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+ "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
+-msgstr "audio_alsa_out: Již otevřeno...PROČ!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
++msgstr "výchozí doba zobrazení titulků v sekundách"
+
+-#: src/audio_out/audio_alsa_out.c:390
+-#, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+-msgstr "audio_alsa_out: snd_pcm_open() na %s selhalo: %s\n"
++#: src/libsputext/demux_sputext.c:1507
++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 ""
++"Některé formáty titulků neobsahují explicitně trvání každého titulku.Pro "
++"takové formáty zde můžete nastavit výchozí dobu trvání. Nastavení na nulu "
++"bude mít za následek, že titulek bude vždy zobrazen tak dlouho, než se "
++"objeví další."
+
+-#: src/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
++msgstr "velikost titulků"
++
++# FIXME: correct original?
++#: src/libsputext/xine_decoder.c:901
++msgid ""
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
+ msgstr ""
+-"audio_alsa_out: >>> zkontrolujte, jestli už jiný program nepoužívá PCM <<<\n"
++"Zde můžete upravit velikost titulků. Nastavení bude bráno relativně k "
++"velikosti okna."
+
+-#: src/audio_out/audio_alsa_out.c:405
+-#, c-format
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
++msgstr "vertikální posun titulků"
++
++# FIXME: correct original?
++#: src/libsputext/xine_decoder.c:908
+ msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
+ msgstr ""
+-"audio_alsa_out: přerušena konfigurace tohoto PCM: žádná konfigurace není k "
+-"dispozici: %s\n"
++"Můžete upravit svislou polohu titulků. Nastavení bude bráni relativně k "
++"velikosti okna."
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
+-msgstr "uvědomit o změnách hardwarový mixer"
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
++msgstr "font titulků"
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr "Font z adresáře fontů xine, který se použije na text s titulky."
++
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr "kódování titulků"
++
++#: src/libsputext/xine_decoder.c:923
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
+ msgstr ""
+-"Když se změní hardwarový mixer, vaše aplikace obdrží upozornění, a tak může "
+-"za běhu aktualizovat svoji grafickou reprezentaci nastavení mixeru."
++"Kódování textu titulků ve streamu dat. Toto nastavení se používá ke "
++"správnému renderování znaků, které nejsou v ASCII. Jestliže nejsou takové "
++"znaky zobrazeny tak, jak očekáváte, zeptejte se toho, kdo titulky vytvářel, "
++"jaké bylo použito kódování."
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr "používat OSD bez změn měřítka, je-li to možné"
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++"OSD bez změn měřítka bude renderováno nezávisle na snímku videa a bude vždy "
++"ostré, dokonce když se zvětší video. Vypadá to lépe, ale nefunguje to na "
++"každém grafickém hardwaru. Druhá možnost je škálované OSD, které se stane "
++"rozmazané, jestliže rozšíříte video s nízkým rozlišením na celou obrazovku, "
++"ale funguje na všech grafických kartách."
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
+-msgstr "snd_lib_error_set_handler() selhalo: %d"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_audio_dec: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
+-msgstr "zvuková karta umožňuje provádět mmap"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr "ffmpeg_audio_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr "ffmpeg_audio_dec: nelze otevřít dekodér\n"
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: nepodporovaný formát, DR1 zakázáno.\n"
++
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: nepodporované rozměry snímku, DR1 zakázáno.\n"
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr "ffmpeg_video_dec: nelze otevřít dekodér\n"
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr "ffmpeg_video_dec: přímé renderování povoleno\n"
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr "Selhala funkce avcodec_find_decoder (CODEC_ID_MPEG1VIDEO)\n"
++
++#: src/libffmpeg/video_decoder.c:714
++#, c-format
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_video_dec: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr "ffmpeg_video_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
++
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr "kvalita dodatečného zpracování MPEG-4"
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+-"Toto povolte, pokud vaše zvuková karta a ovladač ALSA podporují I/O mapované "
+-"do paměti.\n"
+-"Můžete to zkusit povolit a zkontrolovat, zda vše funguje. Pokud ano, zlepší "
+-"toto nastavení výkon."
++"Můžete přizpůsobit množství dodatečného zpracování použitého na video MPEG-"
++"4.\n"
++"Vyšší hodnoty mají za následek lepší kvalitu, ale více zatíží CPU. Menší "
++"hodnoty mohou mít za následek defekty v obrázku, např. blokové artefakty. "
++"Pro vysokou kvalitu videa může příliš silné dodatečné zpracování způsobit "
++"horší obraz tím, že ho více rozmaže."
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "zařízení použité pro mono výstup"
++#: src/libffmpeg/dvaudio_decoder.c:303
++#, c-format
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr "dvaudio: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr "výstupní rychlost libavcodec mpeg (kbit/s)"
++
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+-"xine použije toto zařízení ALSA pro výstup zvuku mono.\n"
+-"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
++"Bitová rychlost knihovny libavcodec kódující mpeg, jaká by se měla používat "
++"v režimu kódování DXR3. Vyšší hodnoty zvýší využití procesoru a kvalitu.\n"
++"Toto nastavení je uvažováno pouze, když je zakázán režim konstantní kvality."
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "zařízení použité pro stereo výstup"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr "režim konstantní kvality"
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+-"xine použije toto zařízení ALSA pro výstup zvuku stereo.\n"
+-"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
++"Když bude povoleno, libavcodec použije režim konstantní kvality dynamickou "
++"kompresí obrázků na základě jejich složitosti. Když bude zakázáno, "
++"libavcodec použije režim konstantní bitové rychlosti."
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "zařízení použité pro čtyřkanálový výstup"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
++msgstr "minimálné komprese"
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++"Minimální komprese, která se použije na obraz v režimu konstatní kvality."
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr "Maximální kvantizér"
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++"Maximální komprese, která se použije na obraz v režimu konstantní kvality."
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr "POMÓC! Zvukový ovladač pouze mono?!\n"
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr "hlasitost A/52"
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+-"xine použije toto zařízení ALSA pro výstup surround zvuku 4kanálově (4.0).\n"
+-"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
++"U zvuku A/52 můžete změnit hlasitost na úrovni dekódování. To má výhodu, že "
++"zvuk je již dekódován na specifikovanou hlasitost, takže pozdější operace "
++"jako smixovávání kanálů budou pracovat na zvukových datech dané hlasitosti."
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "zařízení použité pro 5.1-kanálový výstup"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
++msgstr "povolit zhuštění dynamického rozsahu A/52"
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+-"xine použije toto zařízení ALSA pro výstup surround zvuku 5kanálově s LFE "
+-"(5.1).\n"
+-"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
++"Zhuštění dynamického rozsahu omezí dynamický rozsah zvuku. To znamená, že "
++"hlasité zvuky se stanou tiššími a tiché zvuky hlasitějšími, a tak můžete "
++"lépe slyšet zvuk v hlasitém prostředí bez toho, abyste kohokoliv rušili."
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
++msgstr "redukce zvuku do 2.0 surround stereo"
++
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+-"xine použije toto zařízení ALSA pro výstup nedekódovaného surround zvuku. "
+-"Může to být použito vnějšími surround dekodéry.\n"
+-"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
++"Jestli chcete poslouchat vícekanálový surround zvuk, ale máte pouze dva "
++"reproduktory, surround dekodér nebo zesilovač, který provádí nějaké maticové "
++"surround dekódování jako např. prologic, měli byste tuto volbu povolit. Pak "
++"budou dodatečné kanály přimixovávány do stereo signálu."
+
+-#: src/audio_out/audio_alsa_out.c:1398
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr "metoda memcpy použitá xine"
++
++#: src/xine-utils/memcpy.c:482
++msgid ""
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
++msgstr ""
++"Kopírování objemných paměťových bloků je jednou z nejnáročnějších operací na "
++"dnešních počítačích. Proto xine poskytuje různé vyladěné metody, které "
++"provádějí toto kopírování. Obvykle je nejlepší metoda deketována automaticky."
++
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr "Výkonnostní testování metod memcpy (menší je lepší):\n"
++
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
++msgstr "libfaad: selhala funkce faacDecOpen().\n"
++
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
++msgstr "libfaad: selhala funkce faacDecInit2.\n"
++
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr "libfaad: selhala funkce faacDecInit.\n"
++
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
++msgstr "font externích titulků"
++
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr "vertikální posun titulků (vzhledem k velikosti okna)"
++
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
++msgstr "kódování titulků"
++
++#: src/libspudvb/xine_decoder.c:622
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "dvbsub: nelze vytvořit časovací vlákno\n"
++
++#: src/libmusepack/xine_decoder.c:237
+ #, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "snd_cm_open() selhalo:%d:%s\n"
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr "libmusepack: mpc_streaminfo_read selhalo: %d\n"
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
+-msgstr ">>> Zkontrolujte, jestli už jiný program nepoužívá PCM <<<\n"
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr "libmusepack: data po posledním snímku ignorována\n"
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
+-msgstr "uspořádání reproduktorů"
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
++msgstr "libmusepack: selhalo mpc_decoder_initialise\n"
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr "libmusepack: selhalo mpc_decoder_decode: %d\n"
++
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
++msgstr "zobrazovat skryté titulky v sekvencích MPEG-2"
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+-"Vyberte, jak jsou uspořádány vaše reproduktory. To určuje, které "
+-"reproduktory xine použije pro výstup zvuku. Jednotlivé hodnoty jsou:\n"
+-"\n"
+-"Mono 1.0: Máte pouze jeden reproduktor.\n"
+-"Stereo 2.0: Máte dva reproduktory na levý a pravý kanál.\n"
+-"Headphones 2.0: Používáte sluchátka.\n"
+-"Stereo 2.1: Máte dva reproduktory na levý a pravý kanál a jeden sobwoofer na "
+-"nízké frekvence.\n"
+-"Surround 3.0: Máte tři reproduktory na levý, pravý a zadní kanál.\n"
+-"Surround 4.0: Máte čtyři reproduktory na přední levý a pravý kanál a na "
+-"zadní levý a pravý kanál.\n"
+-"Surround 4.1: Máte čtyři reproduktory na přední levý a pravý kanál a na "
+-"zadní levý a pravý kanál a jeden subwoofer na nízké frekvence.\n"
+-"Surround 5.0: Máte pět reproduktorů na přední levý, střední a pravý kanál a "
+-"zadní levý a pravý kanál.\n"
+-"Surround 5.1: Máte pět reproduktorů na přední levý, střední a pravý kanál a "
+-"zadní levý a pravý kanál a jeden subwoofer na nízké frekvence.\n"
+-"Surround 6.0: Máte šest reproduktorů na přední levý, střední a pravý kanál a "
+-"zadní levý, střední a pravý kanál.\n"
+-"Surround 6.1: Máte šest reproduktorů na přední levý, střední a pravý kanál a "
+-"zadní levý, střední a pravý kanál a jeden subwoofer na nízké frekvence.\n"
+-"Surround 7.1: Máte sedm reproduktorů na přední levý, střední a pravý kanál, "
+-"levý a pravý kanál a zadní levý, střední a pravý kanál a jeden subwoofer na "
+-"nízké frekvence.\n"
+-"Pass Through: Váš zvukový systém obdrží ze xine nedekódovaný digitální zvuk. "
+-"Na digitální výstup vaší zvukové karty potřebujete připojit digitální "
+-"surround dekodér schopný dekódovat formáty, které chcete přehrát."
++"Skryté titulky jsou titulky určené hlavně na pomoc sluchově postiženým."
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
+-msgstr "audio_alsa_out : podporované režimy jsou "
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
++msgstr "podoba skrytých titulků (popředí/pozadí)"
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
+-msgstr "8bitový"
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
++msgstr "Vyberte váš oblíbený způsob vykreslování skrytých titulků."
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
+-msgstr "16bitový"
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
++msgstr "standardní font skrytých titulků"
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
+-msgstr "24bitový"
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
++msgstr "Vyberte font pro normální text u skrytých titulků."
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
+-msgstr "32bitový"
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
++msgstr "font kurzívy skrytých titulků"
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
+-msgstr "mono"
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
++msgstr "Vyberte font pro text kurzívy u skrytých titulků."
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
+-msgstr "stereo"
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
++msgstr "velikost fontu skrytých titulků"
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
+-msgstr "4kanálový"
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
++msgstr "Vyberte velikost fontu pro text skrytých titulků."
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
+-msgstr "(4kanálový není povolen v konfiguraci xine)"
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
++msgstr "přizpůsobení centrování skrytých titulků"
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
+-msgstr "4.1kanálový"
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
++msgstr ""
++"Pokud je povoleno, skryté titulky budou umisťovány doprostřed jednotlivých "
++"řádků."
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
+-msgstr "(4.1kanálový není povolen v konfiguraci xine)"
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
++msgstr "výstupní modul videa xine použije knihovnu DirectFB"
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
+-msgstr "5kanálový"
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
++msgstr "hodnota klíčové barvy překrývání"
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
+-msgstr "(5kanálový není povolen v kondifuraci xine)"
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
++msgstr ""
++"Klíčová barva je používána k informování grafické karty, kam vykreslit obraz "
++"videa. Jestliže zjistíte, že se okna stávají transparentní, vyzkoušejte jiné "
++"hodnoty."
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
+-msgstr "5.1kanálový"
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
++msgstr "klíčová barva pro automatické vykreslování"
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
+-msgstr "(5.1kanálový není povolen v konfiguraci xine)"
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
++msgstr "Přimět Xv automaticky kreslit svou klíčovou barvu."
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
+-msgstr "a/52 a DTS pass-through\n"
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr "povolit dvojité bufferování"
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+-msgstr "(a/52 a DTS pass-through nejsou povoleny v konfiguraci xine)\n"
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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 ""
++"Dvojité bufferování synchronizuje aktualizaci obrazu videa s překreslováním "
++"úplné obrazovky (\"vertikální zpětný běh paprsku\"). Toto eliminuje blikání "
++"a trhané artefakty, ale bude použito více grafické paměti."
+
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "mixovací zařízení alsa"
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr "metoda korekce prokládání (zavrženo)"
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
+ msgstr ""
+-"ke změně hlasitosti použije xine toto zařízení mixeru ALSA.\n"
+-"Informace o zařízeních ALSA nalzeznete v dokumentaci k ALSA."
++"Tato položka nastavení konfigurace je zavržena. Měli byste používat nové "
++"nastavení dodatečné korekce prokládání.\n"
++"\n"
++"Ze starých časů analogové televize, kde by měly být sudé a liché řádky "
++"zobrazovány v různých časech, pochází myšlenka zvýšit hladkost pohybu "
++"zaznamenáváním řádek v různých časech. Tomu se říká \"prokládání\". Ale "
++"naneštěstí, dnešní zobrazovače zobrazují všechny sudé a liché řádky najednou "
++"jako jeden kompletní snímek (tzv. \"postupný zobrazovač\"), což má za "
++"následek ošklivé chyby známé jako hřebenové artefakty. Softwarová korekce "
++"prokládání je způsob, jak redukovat tyto artefakty. Jednotlivé hodnoty "
++"jsou:\n"
++"\n"
++"none\n"
++"Zakáže softwarovou korekci prokládání.\n"
++"\n"
++"bob\n"
++"Interpoluje mezi řádky pohyblivých částí obrazu.\n"
++"\n"
++"weave\n"
++"Podobné jako bob, ale se snahou zachovat plné rozlišení, lepší u velkých "
++"detailů v ne moc pohyblivých scénách.\n"
++"\n"
++"greedy\n"
++"Velmi dobrý přizpůsobivý korektor prokládání, ale potřebuje velký výkon "
++"CPU.\n"
++"\n"
++"onefield\n"
++"Interpoluje vždy a redukuje svislé rozlišení.\n"
++"\n"
++"onefieldxv\n"
++"Stejné jako onefield, ale interpoluje hardwarově.\n"
++"\n"
++"linearblend\n"
++"K odstranění hřebenových artefaktů použije lehké rozmazání. Dobré výsledky "
++"se střední zátěží CPU."
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+-msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače alsa"
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "výstupní modul videa xine použije X video rozšíření XvMC"
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "modul zvukového výstupu xine použije artsd"
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr "video_out_xvmc: rozšíření XvMC není přítomno.\n"
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "modul zvukového výstupu xine pro Coreaudio/Mac OS X"
++#: src/video_out/video_out_xvmc.c:1797
++msgid ""
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
++msgstr ""
++"video_out_xvmc: rozšíření Xv je přítomno, ale nebyl nalezen použitelný port "
++"yuv12\n"
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "modul zvukového výstupu xine pro win32 používající directx"
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
++msgstr ""
++"video_out_xvmc: pro hardwarovou konverzi barevného prostoru a škálování\n"
++" se použije Xv port %ld z adaptéru %s\n"
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr " idct a akcelerace kompenzace pohybu\n"
++
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr " pouze akcelerace kompenzace pohybu\n"
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr " žádná podpora XvMC\n"
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+-msgstr "audio_esd_out: připojuje se k serveru ESD %s: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgstr " S Overlay = %d; UnsignedIntra = %d.\n"
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
+-msgstr "audio_esd_out: připojuje se k serveru ESD...\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr "intenzita červené"
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr "Intenzita červené barevné složky."
++
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr "intenzita zelené"
++
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr "Intenzita zelené barevné složky."
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr "intenzita modré"
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr "Intenzita modré barevné složky."
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr "video_out_vidix: adaptér podporuje formát yuy2\n"
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr "video_out_vidix: adaptér podporuje formát yv12\n"
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr "video_out_vidix: Máte špatnou verzi knihovny VIDIX\n"
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr "video_out_vidix: Nelze nalézt fungující ovladač VIDIX\n"
++
++#: src/video_out/video_out_vidix.c:1107
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+-msgstr "audio_esd_out: nelze se připojit k ESD serveru %s: %s\n"
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr "video_out_vidix: použije se ovladač: %s od %s\n"
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "zpoždění zvukového výstupu esd (upraví synchronizaci zvuku a videa)"
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
++msgstr "klíčová barva překrývání videa červené složky"
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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 ""
+-"Pokud zjistíte, že zvuk není synchronizovaný s videem, můžete to kompenzovat "
+-"zadáním pevného posunu.\n"
+-"Jednotka hodnoty je jeden tik PTS, což je 1/90000 sekundy."
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
++msgstr "klíčová barva překrývání videa zelené složky"
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
+-msgstr "modul zvukového výstupu xine použije esound"
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
++msgstr "klíčová barva překrývání videa modré složky"
+
+-#: src/audio_out/audio_file_out.c:362
+-msgid "xine file audio output plugin"
+-msgstr "modul zvukového výstupu xine do souboru"
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr "výstupní modul videa xine použije libvidix pro X11"
+
+-#: src/audio_out/audio_irixal_out.c:385
+-msgid "irixal audio output maximum gap length"
+-msgstr "maximální mezera zvukového výstupu irixalu"
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++msgid "framebuffer device name"
++msgstr "jméno zařízení framebufferu"
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+-"Můžete uvézt maximální posuv mezi zvukem a videem, který bude xine tolerovat "
+-"před tím, než se je pokusí znovu synchronizovat.\n"
+-"Jednotka této hodnoty je jeden tik PTS, což je 1/90000 sekundy."
++"Specifikuje jméno souboru pro framebuffer, které se má použít.\n"
++"Toto nastavení je kritické s ohledem na bezpečnost, protože při změně na "
++"jiný soubor může být xine použito k vyplnění tohoto souboru libovolným "
++"obsahem. A tak by jste si měli být jistí, že hodnota, kterou zadáváte, "
++"skutečně je náležité zařízení framebufferu."
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "zvukový výstupní modul xine použije IRIX libaudio"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr "výstupní modul videa xine použije libvidix pro linux frame buffer"
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
+-msgstr "fiktivní modul zvukového výstupu xine"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: rozšíření XShape není k dispozici. Overlay bez změn měřítka "
++"zakázán.\n"
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr "x11osd: chyba vytvoření okna. Overlay bez změn měřítka zakázán.\n"
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr "x11osd: chyba vytváření mapy bodů. Overlay bez změn měřítka zakázán.\n"
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
+-msgstr "audio_oss_out: Otevírá se zvukové zařízení %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
++msgstr "x11osd: overlay bez změn měřítka vytvořen (režim %s).\n"
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "výstupní modul videa xine použije knihovnu ascii-art"
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++"video_out_pgx64: Chyba: nelze použít DGA drawable pro okno videa\n"
++"\n"
++
++#: src/video_out/video_out_pgx64.c:300
++#, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "video_out_pgx64: Chyba: nelze otevřít zařízení framebufferu '%s'\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+-"audio_oss_out: varování: vzorkovací frekvence %d Hz není podporována, zkusí "
+-"se 44100 Hz\n"
++"video_out_pgx64: Chyba: ioctl selhalo (VIS_GETIDENTIFIER), špatné zařízení (%"
++"s)\n"
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+-"audio_oss_out: rychlost zvuku : %d požadováno, %d poskytnuto zařízením\n"
++"video_out_pgx64: Chyba: '%s' není zařízení framebufferu xvr100/pgx64/pgx24\n"
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
+-msgstr "jméno zvukového zařízení OSS"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++msgstr ""
++"video_out_pgx64: Chyba: překrývání videa ja na této obrazovce již používáno\n"
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr "video_out_pgx64: Chyba: nelze nastavit vlastnosti okna\n"
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr "video_out_pgx64: Varování: málo videopaměti, multi-buffering zakázán\n"
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr "video_out_pgx64: Chyba: nedostatek videopaměti\n"
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++"video_out_pgx64: Varování: málo videopaměti, double-buffering zakázán\n"
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr "video_out_pgx64: Chyba: selhalo ioctl (FBIOGATTR)\n"
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+-"Specifikujte bázovou část jména zvukového zařízení, ke kterému se přidá "
+-"číslo OSS zařízení, aby se získalo celé jméno zařízení.\n"
+-"Vyberte \"auto\", jestliže chcete, aby xine automaticky zjistilo správné "
+-"nastavení."
++"Barevný klíč je použit k tomu, aby se řeklo grafické kartě, kam může "
++"zobrazit obraz videa. Pokud vidíte video zobrazované skrz jiná okna, "
++"vyzkoušejte jiné hodnoty."
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
+-msgstr "číslo zvukového zařízení OSS, -1 pro žádné číslo"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
++msgstr "jas videa"
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr "Jas videoobrazu."
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr "sytost videa"
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr "Sytost videoobrazu."
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr "povolit klíčování barvou"
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+-"Plné jméno zvukového zařízení je vytvořeno zřetězením jména zařízení OSS a "
+-"čísla zvukového zařízení.\n"
+-"Jestliže nepotřebujete číslo, protože jste spokojeni s výchozím zařízením "
+-"systému, nastavte ho na -1.\n"
+-"Rozsah této hodnoty je -1 nebo 0-15. Toto nastavení je ignorováno, pokud je "
+-"jméno zvukového zařízení nastaveno na \"auto\"."
++"Raději kreslit grafiku OSD nahoře na klíčové barvě overlay než ji míchat do "
++"každého snímku."
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
++msgstr "povolit multi-buffering"
++
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
++msgstr "Multi buffering zvýší výkon na úkor využití více grafické paměti."
++
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+ msgstr ""
+-"audio_oss_out: audio.device.oss_device_name = auto, zkouší se zařízení\n"
++"výstupní modul videa xine použije knihovnu Libstk Surface Set-top Toolkit"
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
+-msgstr "audio_oss_out: automatická zkouška zvukového zařízení selhala\n"
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xxmc: selhalo XvShmCreateImage\n"
++"video_out_xxmc: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_oss_out.c:773
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xxmc: funkce XvShmCreateImage vrátila nulovou velikost\n"
++"video_out_xxmc: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
+-msgstr "audio_oss_out: použije se zařízení >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xxmc: chyba sdílené paměti v shmget: %s\n"
++"video_out_xxmc: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#: src/video_out/video_out_xxmc.c:651
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xxmc: chyba x11 během vytváření XImage ve sdílené paměti\n"
++"video_out_xxmc: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr "video_out_xxmc: rozšíření Xv není přítomno.\n"
++
++#: src/video_out/video_out_xxmc.c:2195
++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 ""
++"video_out_xxmc: Rozšíření Xv je přítomno, ale nepodařilo se nalézt "
++"použitelný\n"
++" port yuv12.\n"
++" Vypadá to, jako by váš grafický hardwarový ovladač\n"
++" nepodporoval Xv?!\n"
++
++#: src/video_out/video_out_xxmc.c:2204
+ #, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+-"audio_oss_out: otevírání zvukového zařízení %s selhalo:\n"
+-"%s\n"
++"video_out_xxmc: pro hardwarovou konverzi barevného prostoru a škálování se "
++"použije Xv port %ld z adaptéru %s.\n"
+
+-#: src/audio_out/audio_oss_out.c:800
+-msgid "a/v sync method to use by OSS"
+-msgstr "metoda synchronizace zvuku a videa použitá OSS"
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
++msgstr "bilineární režim škálování"
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
+-"\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++"Vybere bilineární režim škálování pro karty Permedia. Jednotlivé hodnoty "
++"jsou:\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"Permedia 2\n"
++"0 - zakázat bilineární filtrování\n"
++"1 - povolit bilineární filtrování\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
++"Permedia 3\n"
++"0 - zakázat bilineární filtrování\n"
++"1 - horizontální lineární filtrování\n"
++"2 - povolit plné bilineární filtrování"
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xxmc: tento adaptér podporuje formát yv12.\n"
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xxmc: tento adaptér podporuje formát yuy2.\n"
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr "obcházet chybu zarovnávání rozteče"
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
+ msgstr ""
+-"xine může k zachování synchronizace zvuku a videa používat různé metody. "
+-"Které nastavení funguje nejlépe záleží na ovladači OSS a zvukovém hardware, "
+-"který používáte. Pokud narazíte na problémy se synchronizací, vyzkoušejte "
+-"různé metody.\n"
++"Některé chybové ovladače videa potřebují ke správně funkci tento workaround."
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr "Přimět XvMC alokovat více snímků za účelem lepšího buferrování."
++
++#: src/video_out/video_out_xxmc.c:2415
++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 ""
++"Něktré implementace XvMC dovolují více než 8 snímků.\n"
++"Tato volba, pokud je zapnuta, přiměje ovladač zkusit alokovat 15 snímků. "
++"Nutnost pro unichrome a live VDR.\n"
++
++#: src/video_out/video_out_xxmc.c:2421
++msgid "Unichrome cpu save"
++msgstr "Šetření procesoru unichrome"
++
++#: src/video_out/video_out_xxmc.c:2422
++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 ""
++"Šetří procesorový čas uspáváním, zatímco dekodér pracuje.\n"
++"Pouze pro jádra Linuxu řady 2.6 nebo 2.4 s multimediálním patchem.\n"
++"Experimentální.\n"
++
++#: src/video_out/video_out_xxmc.c:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr "Opravovat chybné barvy elementů XvMC"
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++"V knivovně XvMC od NVidie je chyba, která způsobuje, že červené barvy OSD "
++"vypadají modře a naopak. Tato volba umožňuje chybu obejít.\n"
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "výstupní modul videa xine použije rozšíření MIT X video"
++
++#: src/video_out/video_out_xshm.c:190
++msgid ""
++"video_out_xshm: shared memory error when allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: chyba sdílené paměti během alokování obrázku\n"
++"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xshm.c:206
++#, c-format
++msgid ""
++"video_out_xshm: %s: allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: %s: alokování obrázku\n"
++"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xshm.c:216
++msgid ""
++"video_out_xshm: shared memory error (address error) when allocating image \n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: chyba sdílené paměti (chyba adresy) během alokování obrázku\n"
++"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xshm.c:233
++msgid ""
++"video_out_xshm: x11 error during shared memory XImage creation\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: chyba x11 během vytváření XImage ve sdílené paměti\n"
++"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++
++#: src/video_out/video_out_xshm.c:1138
++#, c-format
++msgid ""
+ "\n"
+-"Význam hodnot je následující:\n"
+ "\n"
+-"auto\n"
+-"xine zkusí automaticky zjistit optimální nastavení\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"getodelay\n"
+-"k dosažení věrné synchronizace zvuku a videa používá ioctl "
+-"SNDCTL_DSP_GETODELAY dokonce, když ovladač tvrdí, že nepodporuje přehrávání "
+-"v reálném čase\n"
++msgstr ""
+ "\n"
+-"getoptr\n"
+-"k dosažení věrné synchronizace zvuku a videa používá ioctl "
+-"SNDCTL_SDP_GETOPTR dokonce, když ovladač podporuje preferované ioctl "
+-"SNDCTL_DSP_GETODELAY\n"
+ "\n"
+-"softsync\n"
+-"používá softwarovou synchronizaci se systémovými hodinami; zvuk a video se "
+-"mohou vzájemně dostat mimo synchronizaci, jestliže rychlost hodin v systému "
+-"přesně nesouhlasí s rychlostí přehrávání zvukové karty\n"
++"VAROVÁNÍ: hloubka současného displeje je %d. Pro lepší výkon\n"
++"je doporučována hloubka 16 bitů/bod!\n"
+ "\n"
+-"probebuffer\n"
+-"při inicializaci se zkouší velikost vyrovnávací paměti zvukové karty, aby se "
+-"vypočetlo zpoždění synchronizace zvuku a videa; toto vyzkoušejte, jestliže "
+-"váš systém nepodporuje žádné ioctl reálného času a zjistíte, že je po "
+-"dlouhém přehrávání špatná synchronizace"
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++msgstr ""
++"video_out_xshm: Rozšíření MIT shared memory není na displeji přítomno.\n"
++
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr "video_out_xshm: váš videorežim nebyl rozpoznán, bohužel :-(\n"
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr "korekce jasu"
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+-"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
+-" audio_oss_out: ...místo toho se použijí pro soft-sync systémové hodiny "
+-"reálného času\n"
+-" audio_oss_out: ...mohou zde být problémy se synchronizací zvuku a videa\n"
++"Korekce jasu může být použita na světlejší nebo tmavší obraz. Změní se "
++"úroveň černé bez úpravy kontrastu, ale omezí se tím tónový rozsah."
+
+-#: src/audio_out/audio_oss_out.c:856
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "zpoždění zvukového výstupu OSS (upraví synchronizaci zvuku a videa)"
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr "výstupní modul videa xine použije rozšíření MIT X shared memory"
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_fb.c:762
++#, c-format
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+-"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
+-" audio_oss_out: ...zkouší se velikost výstupní vyrovnávací paměti: "
++"video_out_fb: jsou podporovány pouze pravé barvy (truecolor/directcolor) (%"
++"d).\n"
++" Zkontrolujte 'fbset -i' nebo zkuste 'fbset -depth 16'.\n"
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr "video_out_fb: Váš videorežim nebyl rozpoznán, bohužel.\n"
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr "video_out_fb: je k dispozici %d video RAM bufferů.\n"
++
++#: src/video_out/video_out_fb.c:938
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+-"%d bytů\n"
+-"audio_oss_out: ...mohou zde být problémy se synchronizací zvuku a videa\n"
++"VAROVÁNÍ: video_out_fb: Buffery s nulami jsou ZAKÁZÁNY, protože je k "
++"dispozici\n"
++" pouze %d bufferů, což je méně než doporučovaných %d bufferů.\n"
++" Mohlo by pomoci snížení rozlišení bufferu.\n"
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
+-msgstr "číslo zvukového mixeru OSS, -1 pro žádné"
++#: src/video_out/video_out_fb.c:949
++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 ""
++"VAROVÁNÍ: video_out_fb: Buffery s nulami jsou ZAKÁZÁNY, protože ovladač "
++"jádra\n"
++" nepodporuje \"screen panning\" (použito pro přepínání snímků).\n"
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:1016
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+-"Plné jméno zařízení mixeru se vytvoří tak, že se vezme jméno zařízení OSS, "
+-"\"dsp\" se nahradí \"mixer\" a přidá se číslo mixeru.\n"
+-"Pokud nepotřebujete číslo, protože jste spokojeni s výchozím nastavením "
+-"mixovacího zařízení v systému, nastavte tuto volbu na -1.\n"
+-"Rozsah této hodnoty je -1 nebo 0-15. Toto nastavení je ignorováno, pokud je "
+-"jméno zvukového zařízení OSS nastaveno na \"auto\"."
++"VAROVÁNÍ: video_out_fb: současná hloubka displeje je %d. Pro lepší výkon\n"
++" je doporučována hloubka 16 bitů/bod!\n"
++"\n"
+
+-#: src/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr "výstupní modul videa xine použije zařízení framebuffer"
++
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr "použít hardwarovou akceleraci videa, je-li k dispozici"
++
++#: src/video_out/video_out_sdl.c:480
++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 ""
++"Pokud to systém podporuje, bude použita harwarová akcelerace vašeho "
++"grafického hardwaru. Nemuselo by to správně fungovat, proto to můžete "
++"zakázat, pokud by to fungovalo chybně."
++
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr "SDL musí emulovat 16bitové povrchy, to vše zpomalí.\n"
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr "video_out_sdl: celoobrazovkový režim NENÍ podporován\n"
++
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "výstupní modul videa xine použije Simple Direct Media Layer"
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr "výstupní modul videa xine pro win32 používající directx"
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr "výstupní modul videa xine, které nezobrazuje nic"
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "výstupní modul videa xine použije knihovnu Color AsCii Art"
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr "video_out_pgx32: Chyba: nelze zpoužít DGA drawable okno videa\n"
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "audio_oss_out: open() mixer %s selhalo: %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "video_out_dxr3: Chyba: selhalo ioctl, špatné zařízení (%s)\n"
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+-msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače OSS"
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++msgstr "video_out_pgx32: Chyba: '%s' není zařízení framebufferu pgx32\n"
+
+-#: src/audio_out/audio_polyp_out.c:489
+-#, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "zařízení použité pro zvukové CD"
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr "zakázat přesné alfa míchání overlayů"
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/alphablend.c:1768
++msgid ""
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
++msgstr ""
++"Jestliže zjistíte, že OSD nebo jiné overlaye jako DVD titulky mají v "
++"činnosti dopad na výkon, pak byste mohli povolit tuto volbu.\n"
++"Výsledkem bude, že alfa míchání overlayů bude méně přesné než předtím, ale "
++"také se sníží využití procesoru."
++
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
++"video_out_xv: selhalo XvShmCreateImage\n"
++"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_polyp_out.c:535
+-#, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "modul zvukového výstupu xine použije esound"
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: funkce XvShmCreateImage vrátila nulovou velikost\n"
++"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "audio_sun_out: otevírání zvukového zařízení %s selhalo: %s\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: chyba sdílené paměti v shmget: %s\n"
++"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
+-msgstr "jméno zvukového zařízení Sun"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: chyba x11 během vytváření XImage\n"
++"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr "video_out_xv: Rozšíření Xv není přítomno.\n"
++
++#: src/video_out/video_out_xv.c:1304
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
++"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 ""
++"video_out_xv: Rozšíření Xv je přítomno, ale nepodařilo se nalézt použitelný "
++"port yuv12.\n"
++" Vypadá to, jako by váš grafický hardwarový ovladač "
++"nepodporoval Xv?!\n"
++
++#: src/video_out/video_out_xv.c:1313
++#, c-format
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++"video_out_xv: pro hardwarovou konverzi barevného prostoru a škálování se "
++"použije Xv port %ld z adaptéru %s.\n"
++
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje formát yv12.\n"
++
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje formát yuy2.\n"
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++"video_out_syncfb: chyba. (formát YUY2 není podporován vaší grafickou "
++"kartou)\n"
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++"video_out_syncfb: chyba. (formát YV12 není podporován vaší grafickou "
++"kartou)\n"
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++"video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:0 (3 roviny))\n"
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++"video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:0 (2 roviny))\n"
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr "video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:2)\n"
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr "video_out_syncfb: info. (modul SyncFB podporuje YUY2)\n"
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr "video_out_syncfb: info. (modul SyncFB podporuje RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++"video_out_syncfb: ruší se. (modul SyncFB nepodporuje YV12, YUY2 ani RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:983
++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 ""
++"video_out_syncfb: info. (nebude k dispozici řízení jasu a kontrastu, protože "
++"se zdá, že je váš modul jádra SyncFB zastaralý. Informace o tom, jak ho "
++"aktualizovat, získáte z README.syncfb.)\n"
++
++#: src/video_out/video_out_syncfb.c:1007
++msgid "default number of frame repetitions"
++msgstr "Výchozí počet opakování snímku"
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr "Toto určuje, kolikrát po sobě se bude jeden videosnímek zobrazovat."
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++"výstupní modul videa xine použije modul SyncFB pro karty Matrox G200/G400"
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr "Jméno zařízení SyncFB"
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+-"Specifikuje jméno souboru zvukového zařízení Sun, které se má použít.\n"
++"Specifikuje jméno souboru pro SyncFB (TeleTux), které se má použít.\n"
+ "Toto nastavení je kritické s ohledem na bezpečnost, protože při změně na "
+ "jiný soubor může být xine použito k vyplnění tohoto souboru libovolným "
+ "obsahem. A tak by jste si měli být jisti, že hodnota, kterou zadáváte, je "
+-"skutečně náležité zvukové zařízení Sun."
+-
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+-msgstr "výstupní zvukový modul použije zvuková zařízení/ovladače sun"
++"skutečně náležité zařízení framebufferu."
+
+-#: src/demuxers/demux_asf.c:468
+-#, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
+-msgstr "demux_asf: varování: Proud dat číslo %d je zašifrovaný.\n"
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr "renderer OpenGL"
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
+-msgstr "Proud dat je zamíchán/zašifrován"
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++"Modul OpenGL poskytuje několik renderovacích modulů:\n"
++"\n"
++"2D_Textures\n"
++"Tento modul zavádí obraz jako 2D textury a renderuje texturovaný plát.\n"
++"Toto je typicky nejrychlejší metoda.\n"
++"\n"
++"Image_Pipeline\n"
++"Tento modul používá k renderování obrázků glDraw().\n"
++"Urychlované pouze v několika ovladačích.\n"
++"Neinterpoluje škálování.\n"
++"\n"
++"Cylinder\n"
++"Zobrazuje obrázky na rotačním válci. Hezký efekt :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Zobrazuje obrázky odražené v otáčejícím se anuloidu. Hezký způsob =)"
+
+-#: src/demuxers/demux_asf.c:1716
+-#, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: Špatná verze ASX: %s\n"
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr "minimální rychlost snímků OpenGL"
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
+-msgstr "Obnovuje se index..."
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++"Minimální rychlost snímků animačních renderovacích podprogramů.\n"
++"Ignorováno u statických renderovacích podprogramů.\n"
+
+-#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
+-#, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
+ msgstr ""
+-"demux:avi: neplatný datový blok avi \"%c%c%c%c\" na pozici %<PRIiMAX>\n"
++"V případě dvojitého bufferování u OpenGL to odstraňuje nejen trhavé "
++"artefakty,\n"
++"ale také to velmi redukuje třepotání.\n"
++"Nemělo by to mít žádný dopad na výkon."
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: index avi je porušen\n"
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr "demux_mpc: snímek příliš velký do bufferu"
+
+-#: src/demuxers/demux_avi.c:849
+-#, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+ msgstr ""
+-"demux_avi: selhalo nastavení pozice na další data (pozice %<PRIiMAX>)\n"
++"ogg: zjištěna zvuková stopa vorbis, ale nenalezena žádná hlavička dat "
++"vorbis.\n"
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -643,20 +1340,16 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr "nerozpoznaný datový blok FILM\n"
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr "iff-8svx/16sv: neznámá komprese: %d\n"
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
+-msgstr "iff-ilbm: neznámá komprese: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgstr "neznámý typ bloku VOC (0x%02X); prosím oznamte vývojářům xine\n"
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
+-msgstr "iff: neznámý datový blok: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgstr "neznámý typ komprese VOC (0x%02X); prosím oznamte vývojářům xine\n"
+
+ #: src/demuxers/demux_mpeg_block.c:296
+ #, c-format
+@@ -687,6 +1380,29 @@
+ "demux_mpeg_block: varování: hlavička PES indikuje, že tyto data mohou být "
+ "zašifrována (šifrovací mód: %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr "demux_asf: varování: Proud dat číslo %d je zašifrovaný.\n"
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr "Proud dat je zamíchán/zašifrován"
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: Špatná verze ASX: %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr "demux_snd: špatné parametry hlavičky\n"
++
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_snd: nepodporovaný typ zvuku: %d\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -724,31 +1440,25 @@
+ "demux_mpeg_pes: Nerozpoznaný soukromý proud dat 1 0x%02x. Prosím oznamte to "
+ "vývojářům xine.\n"
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-"ogg: zjištěna zvuková stopa vorbis, ale nenalezena žádná hlavička dat "
+-"vorbis.\n"
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
+-msgstr "demux_snd: špatné parametry hlavičky\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
++msgstr "Obnovuje se index..."
+
+-#: src/demuxers/demux_snd.c:149
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_snd: nepodporovaný typ zvuku: %d\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
++msgstr ""
++"demux:avi: neplatný datový blok avi \"%c%c%c%c\" na pozici %<PRIdMAX>\n"
+
+-#: src/demuxers/demux_voc.c:105
+-#, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+-msgstr "neznámý typ bloku VOC (0x%02X); prosím oznamte vývojářům xine\n"
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: index avi je porušen\n"
+
+-#: src/demuxers/demux_voc.c:120
++#: src/demuxers/demux_avi.c:850
+ #, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
+-msgstr "neznámý typ komprese VOC (0x%02X); prosím oznamte vývojářům xine\n"
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
++msgstr ""
++"demux_avi: selhalo nastavení pozice na další data (pozice %<PRIdMAX>)\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -760,631 +1470,448 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr "demux_wc3movie: Byl zde problém během načítání datových bloků palety\n"
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
+-msgstr "Číslo zařízení DXR3"
++#: src/demuxers/demux_iff.c:235
++#, c-format
++msgid "iff-8svx/16sv: unknown compression: %d\n"
++msgstr "iff-8svx/16sv: neznámá komprese: %d\n"
+
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-"Jestliže máte ve vašem počítači více než jednu DXR3, můžete uvézt, kterou z "
+-"nich zde použít."
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
++msgstr "iff-ilbm: neznámá komprese: %d\n"
+
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+-msgstr "dxr3_decode_spu: Selhalo otevření zařízení titulků %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
++msgstr "iff: neznámý datový blok: %s\n"
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
+-msgstr "požadované tlačítko není k dispozici\n"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
++msgstr "bitplane: chyba při provádění dekomprese ByteRun1\n"
+
+-#: src/dxr3/dxr3_decode_video.c:250
+-#, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+-msgstr "dxr3_decode_video: Selhalo otevření řídícího zařízení %s (%s)\n"
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++msgstr "bitplane: V tomto okamžiku není Anim Opt 1 podporován\n"
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
+-msgstr "použít informaci Pan & Scan"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++msgstr "bitplane: V tomto okamžiku není Anim Opt 2 podporován\n"
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+-msgstr ""
+-"\"Pan & Scan\" je speciální režim zobrazení, který je občas používán v "
+-"médiích kódovaných v MPEG. Můžete zde uvézt, jak pracovat s takovým "
+-"obsahem.\n"
+-"\n"
+-"pouze, pokud je vynuceno\n"
+-"Použít Pan & Scan pouze, když si to obsah, který přehráváte, vynucuje.\n"
+-"\n"
+-"použít informaci v MPEG\n"
+-"Povolit Pan & Scan na základě informací vložených v datech MPEG videa.\n"
+-"\n"
+-"použít informaci z DVB\n"
+-"Povolit Pan & Scan na základě informací vložených v datech DVB. Toto "
+-"způsobí, že se použije Active Format Descriptor (AFD) používaný některými "
+-"Evropskými kanály."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++msgstr "bitplane: V tomto okamžiku není Anim ASCIIJ podporován\n"
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
+-msgstr "Zkusit synchronizovat video každý snímek"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
++msgstr "bitplane: V tomto okamžiku není tento typ anim podporován\n"
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
+-msgstr ""
+-"Zkouší nastavit pro každý snímek synchronizační časovou značku. Běžně toto "
+-"není nutné, protože synchronizace je dostatečná, i když je časová značka "
+-"nastavena pouze občas.\n"
+-"Toto je odůvodněné pouze pro postupné video (většina filmů PAL)."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
++msgstr "w32codec: Selhalo ICOpen! neznámý kodek %08lx nebo špatné parametry?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
+-msgstr "použít hladký režim přehrávání"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++msgstr "w32codec: Selhalo ICDecompressGetFormat (%.4s %08lx/%d): Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
+-msgstr "Povolením této volby se využije hladší režim přehrávání."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgstr "w32codec: Selhalo ICDecompressQuery: Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
+-msgstr "opravovat dobu trvání snímků v porušených datových proudech"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgstr "w32codec: Selhalo ICDecompressBegin: Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:288
++#: src/libw32dll/w32codec.c:685
++#, c-format
+ msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"Povolí logiku, která upravuje doby trvání snímku některých mpeg streamů se "
+-"špatnými kódy rychlosti snímku. V současnosti je implementována korekce pro "
+-"NTSC streamy mylně označené jako PAL streamy. Povolte to pouze tehdy, když "
+-"se s takovými stramy setkáte."
++"w32codec: Selhal DS_VideoDecoder! neznámý kodek %08lx nebo špatné "
++"parametry?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:696
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "dxr3_decode_video: Selhalo otevření video zařízení %s (%s)\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
+-msgstr "dxr3_decode_video: zápis do zařízení by blokoval. okamžité zapsání\n"
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgstr ""
++"w32codec: Selhal DMO_VideoDecoder! neznámý kodek %08lx nebo špatné "
++"parametry?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
+-msgstr "dxr3_decode_video: zápis do video zařízení selhal (%s)\n"
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
++msgstr "w32codec: selhalo spuštění dekodéru. Je nainstalován '%s?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgstr "w32codec: (ACM_Decoder) Neadekvátní zvukový formát\n"
++
++#: src/libw32dll/w32codec.c:1216
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+-msgstr "dxr3_decode_video: VAROVÁNÍ: neznámý kód rychlosti snímků %d\n"
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgstr "w32codec: (ACM_Decoder) chyba acmStreamOpen%d\n"
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+-msgstr ""
+-"dxr3_decode_video: VAROVÁNÍ: oprava kódu rychlosti snímků z PAL na NTSC\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
++msgstr "w32codec: Chyba inicializace DirectShow zvuku\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
+-msgstr "dxr3_mpeg_encoder: selhala inicializace librte\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
++msgstr "w32codec: Chyba inicializace DMO zvuku\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
++msgstr "cesta ke kodekům WIN32"
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+-"dxr3_mpeg_encoder: rte pracuje pouze s rozměry videa, které jsou násobky 16\n"
++"Pokud máte nainstalované kodeky Windows nebo Apple Quicktime, uveďte zde "
++"cestu k tomuto adresáři s kodeky. Pokud bude moci xine nalézt kodeky Windows "
++"nebo Apple Quicktime, použije je pro vás k dekódování různých dat Windows "
++"Media a Quickime. Více informací, jak nainstalovat kodeky, získáte ve xine "
++"FAQ."
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+-msgstr "dxr3_mpeg_encoder: selhalo získání kontextu rte.\n"
++#: src/input/input_rtp.c:182
++#, c-format
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
+-msgstr "dxr3_mpeg_encoder: nešlo vytvořit kodek.\n"
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
++msgstr "Uvedená IP adresa je multicast\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
+-msgstr "výstupní rychlost rte mpeg (kbit/s)"
++#: src/input/input_rtp.c:201
++#, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
+-msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
+-msgstr ""
+-"Bitová rychlost knihovny librte kódující mpeg, jaká by se měla používat v "
+-"režimu kódování DXR3. Vyšší hodnoty zvýší využití procesoru a kvalitu."
++#: src/input/input_rtp.c:209
++#, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:216
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+-msgstr "dxr3_mpeg_encoder: nelze inicializovat kontext: %s\n"
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:236
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr "dxr3_mpeg_encoder: nelze začít s kódováním: %s\n"
++msgid "Can't find address for iface %s:%s\n"
++msgstr "Nelze nalézt adresu rozhraní %s:%s\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+-msgstr "dxr3_mpeg_encoder: Nešlo spustit knihovnu FAME\n"
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) selhalo (jádro s multicastem?): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
+-msgstr "kvalita kódování MPEG knihovny fame"
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "nelze zjistit adresu '%s'.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
+-msgstr ""
+-"Kvalita kódování knihovny libfame vytvářející mpeg. Menší je rychlejší, ale "
+-"dává viditelné artefakty. Vyšší je lepší, ale pomalejší."
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "nelze se připojit k '%s'.\n"
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
+-msgstr "priorita modulu SCR"
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
++msgstr "recv(): %s.\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
+-msgstr ""
+-"Priorita modulu DXR3 SCR. Hodnoty menší než 5 znamenají, že bude použit "
+-"časovač unixového systému. Hodnoty větší než 5 vynutí použití jako zdroj "
+-"synchronizace vnitřních hodin DXR3."
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
++msgstr "RTP: ukončuje se čtecí vlákno...\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
+-msgstr "prohodit liché a sudé řádky"
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
++msgstr "RTP: čtecí vlákno ukončeno\n"
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
+-msgstr ""
+-"Prohodí sudé a liché pole obrázku.\n"
+-"Povolte tuto volbu pro média v jiném formátu než MPEG, které vytváří na "
+-"obrazovce vodorovné chvění."
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
++msgstr "Otevírání >filename:%s port:%d rozhraní:%s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
+-msgstr "upravit poměr stran přidáním černých pruhů"
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: nelze vytvořit nové vlákno (%s)\n"
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
+-msgstr ""
+-"Přidá černé pruhy, jestliže má obraz poměr stran, se kterým karta nemůže "
+-"pracovat přímo. Je to nutné k udržení patřičných proporcí obrázku."
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "vstupní modul pro RTP a UDP dodaný se xine"
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr "pro kodér MPEG použít hladký režim přehrávání"
++#: src/input/mmsh.c:232
++msgid "libmmsh: send error\n"
++msgstr "libmmsh: chyba při posílání\n"
+
+-#: src/dxr3/video_out_dxr3.c:272
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
+-msgstr ""
+-"Povolením této volby se využije pro ne-MPEG obsah hladší režim přehrávání."
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
++msgstr "libmmsh: špatný formát odpovědi\n"
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "video_out_dxr3: Selhalo otevření řídícího zařízení %s (%s)\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "libmmsh: přesměrování 3xx není implementováno: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "video_out_dxr3: Selhalo otevření video zařízení %s (%s)\n"
+-
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
+-msgstr "kodér pro ne-MPEG obsah"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "libmmsh: stav http není 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
+-msgstr ""
+-"Obsah jiný než MPEG musí projít dodatečnou překódovávací fází, protože DXR3 "
+-"pracuje pouze s MPEG.\n"
+-"V závislosti na tom, co je podporováno vaším xine, může být toto nastavení "
+-"\"fame\", \"rte\", \"libavcodec\" nebo \"none\".\n"
+-"Kodér \"libavcodec\" použije modul ffmpeg, který je již se xine dodán, takže "
+-"pro to nepotřebujete instalovat žádné další knihovny. libavcodec je dokonce "
+-"lepší, poskytuje vyšší kvalitu s nižším využitím CPU. Použití \"libavcodec\" "
+-"je proto silně doporučováno.\n"
+-"\"fame\" a \"rte\" zde stále jsou, ale jejich podpora ve xine je zastaralá, "
+-"takže by to nemuselo fungovat."
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "libmmsh: Přesměrování umístění není implementováno\n"
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+-msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru.\n"
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
++msgstr "Připojuje se k MMS serveru (přes HTTP)..."
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+-msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru rte.\n"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
++msgstr "neplatné URL\n"
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+-msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru fame.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
++msgstr "nepodporovaný protokol\n"
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: kódování MPEG zakázáno.\n"
+-"video_out_dxr3: to je v pořádku, nepotřebujete to pro MPEG video jako je "
+-"DVD,\n"
+-"video_out_dxr3: ale při použití tohoto ovladače výstupu videa nebudete\n"
+-"video_out_dxr3: moci přehrávat ne-MPEG obsah. Detaily o konfiguraci kodéru\n"
+-"video_out_dxr3: viz. README.dxr3.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
++msgstr "selhalo hledání zařízení s VCD"
+
+-#: src/dxr3/video_out_dxr3.c:367
+-msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: kódování MPEG není zakompilováno.\n"
+-"video_out_dxr3: to je v pořádku, nepotřebujete to pro MPEG video jako je "
+-"DVD,\n"
+-"video_out_dxr3: ale při použití tohoto ovladače výstupu videa nebudete\n"
+-"video_out_dxr3: moci přehrávat ne-MPEG obsah. Detaily o konfiguraci kodéru\n"
+-"video_out_dxr3: viz. README.dxr3.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
++msgstr "byl předán parametr třídy null"
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
+-msgstr "režim výstupu videa (TV nebo překrývaní)"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
++msgstr "Neplatný typ aktuální položky"
+
+-# TODO: dopřeložit
+-#: src/dxr3/video_out_dxr3.c:383
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
+-msgstr ""
+-"Zde může být nastaven způsob výstupu výsledného videa z DXR3. Jednotlivé "
+-"hodnoty jsou:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Posílat video pouze do výstupního TV konektoru. Toto je režim použitý pro "
+-"standardní nastavení televize 4:3. Anamorfické video (16:9) bude zobrazeno "
+-"4:3, média pan&scan budou mít oříznutý obraz na levé a pravé straně. Toto je "
+-"běžné nastavení pro sledování TV, která se chová stejně jako samotný DVD "
+-"přehrávač.\n"
+-"\n"
+-"widescreen tv\n"
+-"Posílat video pouze do výstupního TV konektoru. This mode is intended for "
+-"16:9 widescreen TV sets. Anamorphic and pan&scan content will fill the "
+-"entire screen, but you have to set the TV's aspect ratio manually to 16:9 "
+-"using your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
+-
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
+-msgstr "hodnota klíčové barvy překrývání"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++msgstr "modul video CD s PBC a podporou: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
+-msgstr ""
+-"Šestnáctková hodnota RGB klíčové barvy.\n"
+-"Pokud při použití překryvného režimu DXR3 zjistíte, že se okna stávají "
+-"transparentní, můžete vyzkoušet jiné hodnoty."
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
++msgstr "výběr nemá položku NÁVRAT"
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
+-msgstr "rozsah klíčové barvy překrývání"
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
++msgstr "VÝCHOZÍ vybráno, ale PBC není zapnuto."
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
+-msgstr ""
+-"Větší hodnota rozšíří toleranci překryvné klíčové barvy.\n"
+-"Pokud při použití překryvného režimu DXR3 zjistíte, že se okna stávají "
+-"transparentní, můžete vyzkoušet nižší hodnoty. Ale při použití příliš "
+-"nízkého nastavení mohou mizet části okrajů obrazu."
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
++msgstr "výběr nemá položku DALŠÍ"
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
+-msgstr "oříznout překrývanou oblast nahoře a dole"
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
++msgstr "výběr nemá položku PŘEDCHOZÍ"
+
+-#: src/dxr3/video_out_dxr3.c:442
+-msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
+-msgstr ""
+-"Odstraní jeden bodový řádek z hořejšku a dolejšku překrývaného obrazu. Toto "
+-"povolte, pokud vidíte nahoře a dole zelené řádky."
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
++msgstr "Neznámý typ události: "
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+-msgstr "video_out_dxr3: spusťte prosím autocal, překrývání zakázáno\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
++msgstr "Výše uvedená zpráva má neznámou logovací úroveň vcdimageru"
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
+-msgstr "přednost režimu TV"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
++msgstr "výchozí typ, který se použije na automatické přehrání VCD"
+
+-#: src/dxr3/video_out_dxr3.c:456
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+-"Vybere TV režim, který má použít DXR3. Hodnoty znamenají:\n"
+-"\n"
+-"ntsc: NTSC na 60Hz\n"
+-"pal: PAL na 50Hz\n"
+-"pal60: PAL na 60Hz\n"
+-"default: zachovat nastavení karty"
++"Jednotka přehrávání, kterou použít, jestliže žádná není uvedena v MRL. Např. "
++"vcd:// nebo vcd:///dev/dvd:"
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
+-msgstr "video_out_dxr3: selhalo nastavení režimu videa.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
++msgstr "výchozí zařízení CD použité pro VCD, jestliže není žádné zadáno"
+
+-#: src/dxr3/video_out_dxr3.c:708
++#: src/input/vcd/xineplug_inp_vcd.c:1713
+ msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
+-msgstr ""
+-"video_out_dxr3: K přehrávání ne-MPEG videa na dxr3 potřebujete MPEG kodér\n"
+-"video_out_dxr3: Detaily viz. README.dxr3.\n"
+-
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+-"video_out_dxr3: CHYBA čtení souboru inicializace překrývání. Spusťte "
+-"autocal!\n"
++"Co použít, jestliže není uvedeno zařízení. Jestliže je nastavení prázdné, "
++"xine prozkoumá jednotky CD."
+
+-#: src/input/input_cdda.c:1494
+-#, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "%s: http: nelze se připojit k %s:%d\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
++msgstr "rozsah ukazatele pozice"
+
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cdda: úspěšně připojeno k CDDB serveru '%s:%d'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
++msgstr "Rozsah ukazatele pozice přehrávání přítomného při přehrávání."
+
+-#: src/input/input_cdda.c:1545
+-#, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_cdda: nelze se připojit k CDDB serveru '%s:%d' (%s).\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
++msgstr "Mělo by se používat cachování read-ahead?"
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
+-msgstr "digitální zvukové CD (CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
++msgstr "Na slabších strojích může toto vést k trhanému přehrávání"
+
+-#: src/input/input_cdda.c:2586
+-msgid "device used for CD audio"
+-msgstr "zařízení použité pro zvukové CD"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
++msgstr "automaticky postupovat ve stopách nebo položkách"
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1744
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
+-"Cesta k zeřízení, obvykle CD nebo DVD mechanika, které máte v úmyslu "
+-"používat k přehrávání zvukových CD."
++"Jestliže je povoleno, měli bychom automaticky postoupit na další položku "
++"nebo stopu. Použito pouze, když není zapnuta kontrola přehrávání (PBC)."
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
+-msgstr "dotazovat se CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr "zobrazit 'odmítnuté' LID?"
+
+-#: src/input/input_cdda.c:2593
++#: src/input/vcd/xineplug_inp_vcd.c:1754
+ msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+-"Povolí dotazy CDDB, které vám budou vracet pro vaše zvuková CD příslušné "
+-"nadpisy a názvy stop.\n"
+-"Vězte, že pokud nepoužíváte vlastní CDDB, je tato informace získávána z "
+-"internetového serveru, který by pak mohl znát profil vašich poslechových "
+-"zvyků."
++"Nekteré identifikátory seznamů přehrávání (LID) bývají označeny, aby se "
++"nezobrazovaly. Ale pokud je nastavena tato volba, můžete je vidět v seznamu "
++"MRL. Odmítané položky jsou označeny hvězdičkou (*) přidanou na konec MRL."
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
+-msgstr "jméno serveru CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
++msgstr "formát řetězce pro nápis na obrazovce"
+
+-#: src/input/input_cdda.c:2601
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+-"Server CDDB, který se použije, aby se z něj získávaly nadpisy a informace o "
+-"stopě.\n"
+-"Toto nastavení je kritické s ohledem na bezpečnost, protože serveru budou "
+-"posílány informace o vašich poslechovích zvycích a také mohl by odpovídat na "
+-"dotazy zákeřnými odpověďmi. Ujistěte se, že serveru můžete důvěřovat."
++"Formát použitý v titulku GUI. Podobá se zadání unixovského datumu. "
++"Specifikátory formátu začínají znakem procento. Specifikátory jsou %A, %C, %"
++"c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v a %%."
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
+-msgstr "port serveru CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
++msgstr "formátovací řetězec pro pole komentáře proudu dat"
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
+-msgstr ""
+-"Port serveru, který se použije, aby se z něj získávaly nadpisy a informace o "
+-"stopě."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
++msgstr "debugovací maska příznaků"
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
+-msgstr "adresář se záznamy CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
++msgstr "Toto celé číslo v binární reprezentaci je debugovací maska."
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
+-msgstr ""
+-"Odpovědi z CDDB serveru budou uchovávány v tomto adresáři.\n"
+-"Toto nastavení je kritické s ohledem na bezpečnost, protože mohou být v "
+-"tomto adresáři vytvářeny soubory s nekontrolovatelnými jmény. Ujistěte se, "
+-"že daný adresář není používán pro nic jiného než cachování CDDB."
++#: src/input/vcd/vcdio.c:217
++msgid "SEEK_CUR not implemented for non-zero offset"
++msgstr "SEEK_CUR není implementováno pro nenulovou hodnotu posuvu"
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
+-msgstr "zpomalit diskovou jednotku na tento rychlostní faktor"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
++msgstr "SEEK_END ještě není implementováno."
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
+-msgstr ""
+-"Protože některé CD nebo DVD jednotky vydávají opravdu silný hluk kvůli "
+-"rychlé rotaci disku, xine je zkusí zpomalit. Pro běžné přehrávání CD nebo "
+-"DVD nejsou vysoké rychlosti dat, které vyžadují rychlou rotaci disku, "
+-"potřebné, a tak by nemělo zpomalení ovlivnit výkon přehrávání.\n"
+-"Hodnota nula zde zakáže zpomalování."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
++msgstr "posuv ještě není implementován"
+
+-#: src/input/input_dvb.c:834
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
++msgstr "špatný typ položky"
++
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
++msgstr "špatné číslo položky"
++
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
++msgstr "špatné číslo segmentu"
++
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
++msgstr "Chyba při získávání čísla aktuálního segmentu"
++
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
++msgstr "Výše uvedené by mělo být převedeno"
++
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr "input_dvd: Selhalo otevření zařízení %s během volání vysunutí\n"
++
++#: src/input/input_dvb.c:838
+ #, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_dvb: selhalo otevření souboru kanálu dvb '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_dvb: selhalo nastavení kanálu\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvb: nelze otevřít zařízení dvb\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr "input_dvb: kanál %d mimo rozsah, použije se výchozí 0\n"
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_dvb: hledání kanálu %s\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr "input_dvb: přesná shoda pro %s nenalezena: zkusí se částečné shody\n"
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_dvb: nalezen odpovídající kanál %s\n"
+
+-#: src/input/input_dvb.c:2663
+-#, fuzzy, c-format
++#: src/input/input_dvb.c:2667
++#, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+-msgstr ""
+-"input_dvb: kanál %s nenalezen v channels.conf, použije se výchozí kanál 0\n"
++msgstr "input_dvb: kanál %s nenalezen v channels.conf, použije se výchozí.\n"
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
+-#, fuzzy
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+-msgstr "input_dvb: neplatná specifikace kanálu, použije se výchozí kanál 0\n"
++msgstr ""
++"input_dvb: neplatná specifikace kanálu, použije se naposledy sledovaný\n"
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr "input_dvb: neplatná specifikace kanálu, použije se výchozí kanál 0\n"
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+@@ -1392,7 +1919,7 @@
+ "input_dvb: bylo uvedeno MRL DVBS, ale nezdá se, že by tuner byl QPSK (DVB-"
+ "S)\n"
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+@@ -1400,28 +1927,27 @@
+ "input_dvb: bylo uvedeno MRL DVBT, ale nezdá se, že by byl tuner OFDM (DVB-"
+ "T)\n"
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+ "input_dvb: bylo uvedeno MRL DVBC, ale nezdá se, že by byl tuner QAM (DVB-C)\n"
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvb: nelze otevřít zařízení dvr '%s'\n"
+
+-#: src/input/input_dvb.c:2784
+-#, fuzzy
++#: src/input/input_dvb.c:2788
+ msgid "input_dvb: cannot create EPG updater thread\n"
+-msgstr "input_rtp: nelze vytvořit nové vlákno (%s)\n"
++msgstr "input_dvb: nelze vytvořit vlákno na aktualizace EPG\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr "použít 'středový výsek' DVB (zvětšení)"
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+@@ -1429,38 +1955,37 @@
+ "Toto dovolí přehrát obsah 4:3 na celé obrazovce, který byl přenášen ve "
+ "formátu 16:9."
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "vstupní modul DVB (digitální TV)"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr "Pamatovat si naposledy sledovaný kanál DVB"
+
+-#: src/input/input_dvb.c:3082
+-#, fuzzy
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+-"Při automatickém přehrávání si xine bude pamatovat tento kanál a přepne na "
+-"něj."
++"Při automatickém přehrávání xine přepne na poslední kanál uvedený v media."
++"dvb.last_channel."
+
+-#: src/input/input_dvb.c:3089
+-#, fuzzy
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+-msgstr "Pamatovat si naposledy sledovaný kanál DVB"
++msgstr "Naposledy sledovaný kanál DVB"
+
+-#: src/input/input_dvb.c:3090
+-#, fuzzy
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+-msgstr "Pokud je povoleno, xine si bude pamatovat tento kanál a přepne na něj."
++msgstr ""
++"Pokud je povoleno, xine si bude pamatovat tento kanál a bude se na něj "
++"automaticky přepínat."
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr "Počet karet DVB, které se mají použít."
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+@@ -1468,26 +1993,26 @@
+ "kartu."
+
+ # what is it?
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+ "input_dvd: values of \\beta will give rise to dom! (pět korun za překlad)\n"
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr "input_dvd: Chyba získání bloku z DVD (%s)\n"
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: chyba otevírání zařízení DVD\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ msgid "device used for DVD playback"
+ msgstr "zařízení použité pro přehrávání DVD"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+@@ -1495,11 +2020,11 @@
+ "Cesta k zařízení, obvykle DVD mechanice, které chcete používat pro "
+ "přehrávání DVD."
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr "cesta k raw zařízení nastavenému pro přístup k DVD"
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1517,11 +2042,11 @@
+ "použita pouze jednou.\n"
+ "Další informace viz. dokumentace o raw zařízeních (man raw)."
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr "metoda dešifrování CSS"
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+@@ -1531,11 +2056,11 @@
+ "chráněních proti kopírování. Pokud máte problémy s přehráváním zakódovaných "
+ "DVD, vyzkoušejte různé metody."
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr "cesta ke cache klíčů titulů"
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1549,11 +2074,11 @@
+ "tomto adresáři vytvářeny soubory s nekontrolovatelnými jmény. Ujistěte se, "
+ "že daný adresář není kromě cachování DVD klíčů používán na nic jiného."
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr "DVD přehrávač tvrdí, že je v oblasti (1 až 8)"
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+@@ -1563,11 +2088,11 @@
+ "na špatný kód oblasti. Nemá to nic dělat s kódem oblasti nastaveným v DVD "
+ "mechanikách, je to čistě softwarové."
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr "výchozí jazyk pro přehrávání DVD"
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+@@ -1577,11 +2102,11 @@
+ "bude podporovat, volby a zvukové stopy budou prezentovány v tomto jazyce.\n"
+ "Hodnotou musí být dva znaky jazykového kódu ISO639."
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr "read-ahead cachování"
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+@@ -1591,11 +2116,11 @@
+ "To může vést na pomalých mechanikách ke škubavému přehrávání, ale na "
+ "rychlejších mechanikách to zlepší výsledek změny vrstvy DVD."
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr "jednotka pro akci skoku"
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1627,11 +2152,11 @@
+ "skip title\n"
+ "přeskočí DVD titul, což je stavební jednotka reprezentující celé DVD"
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr "jednotka pro nastavení pozice"
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1655,158 +2180,170 @@
+ "nastavování pozice se týká programu DVD, což je navigační jednotka "
+ "reprezentující kapitolu současného dějství"
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: chyba čtení (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr "stdin: nelze se posunout zpět! (%<PRIdMAX> < %<PRIdMAX>)\n"
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_file: Přístup odepřen: >%s<\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "stdin: selhalo otevření '%s'\n"
+
+-#: src/input/input_file.c:286
+-#, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: Soubor nenalezen >%s<\n"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr "vstupní modul pro data ze standardního vstupu"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr "modul pro vstup ze souboru"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
++msgstr "vstupní modul mms pro streamovaná data"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
+-msgstr "počáteční umístění při procházení souborů"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
++msgstr "šířka pásma sítě"
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
+-msgstr "Prohlížeč vybírající soubor k přehrání začne na tomto umístění."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
++msgstr ""
++"Uveďte zde šířku pásma vašeho internetového připojení. To bude použito v "
++"případě, že streamovací servery poskytnou různé verze stejných dat s "
++"rozdílnými požadavky na šířku pásma."
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
+-msgstr "ukazovat skryté soubory"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
++msgstr "protokol MMS"
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+-"Pokud je povoleno, bude prohlížeč vybírající soubor k přehrání ukazovat také "
+-"skryté soubory."
++"Vyberte protokol zapoudřující MMS. TCP je lepší, ale za firewallem můžete "
++"potřebvat HTTP."
+
+-#: src/input/input_gnome_vfs.c:218
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "vstupní modul gnome-vfs dodaný se xine"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr "Nahrává se..."
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr "vstupní modul pnm pro streamovaná data"
++
++#: src/input/input_http.c:174
+ #, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_http: selhalo gethostbyname(%s): %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: chyba čtení %d\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr "Připojuje se k HTTP serveru..."
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: neplatná odpověď http\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: přesměrování 3xx: >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: stav http není 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
+-msgstr "input_http: délka obsahu = %<PRIiMAX> bytů\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
++msgstr "input_http: délka obsahu = %<PRIdMAX> bytů\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr "vstupní modul http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr "HTTP proxy host"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr "Hostitelské jméno HTTP proxy."
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr "HTTP proxy port"
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr "Číslo portu HTTP proxy."
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr "Uživatelské jméno HTTP proxy"
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr "Uživatelské jméno pro HTTP proxy."
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr "Heslo HTTP proxy"
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr "Heslo pro HTTP proxy."
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
+-msgstr "Domény, kde ignorovat HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
++msgstr "Domény, pro které ignorovat HTTP proxy"
+
+-# FIXEM: correct the original
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
+-msgstr "Seznam domén oddělený čárkami, kde nebude použito proxy."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
++msgstr ""
++"Seznam doménových jmen oddělených čárkami, pro které bude ignorováno proxy.\n"
++"Pokud bude doménové jméno začínat na '=', pak bude zpracováno pouze jako "
++"hostitelské jméno (bude vyžadována rovnost celého jména)."
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
+-msgstr "vstupní modul mms pro streamovaná data"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
++msgstr "rtsp: špatné MRL: %s\n"
+
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
+-msgstr "šířka pásma sítě"
++#: src/input/librtsp/rtsp.c:507
++#, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "rtsp: nelze se připojit k '%s'\n"
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
+-"Uveďte zde šířku pásma vašeho internetového připojení. To bude použito v "
+-"případě, že streamovací servery poskytnou různé verze stejných dat s "
+-"rozdílnými požadavky na šířku pásma."
++#: src/input/librtsp/rtsp_session.c:84
++#, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "rtsp_session: nelze se připojit k serveru %s\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
+-msgstr "protokol MMS"
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
++msgstr "rtsp_session: nelze zavést relaci.\n"
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
+-msgstr ""
+-"Vyberte protokol zapoudřující MMS. TCP je lepší, ale za firewallem můžete "
+-"potřebvat HTTP."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
++msgstr "rtsp_session: typ rtsp serveru '%s' ještě není podporován. bohužel.\n"
++
++#: src/input/input_gnome_vfs.c:218
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "vstupní modul gnome-vfs dodaný se xine"
+
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+@@ -1818,156 +2355,41 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: nelze zjistit adresu '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: nelze se připojit k '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "vstupní modul pro síť dodaný se xine"
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr "vstupní modul pnm pro streamovaná data"
+-
+-#: src/input/input_pvr.c:604
+-#, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_pvr: chyba vytváření souboru pvr (%s)\n"
+-
+-#: src/input/input_pvr.c:761
+-#, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_pvr: chyba otevírání souboru pvr (%s)\n"
+-
+-#: src/input/input_pvr.c:837
+-#, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_pvr: chyba čtení (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_pvr: chyba otevírání zařízení %s\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: selhalo IVTV_IOC_G_CODEC, možná se změnilo API?\n"
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: selhalo IVTV_IOC_S_CODEC, možná se změnilo API?\n"
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr "Vstupní modul WinTV-PVR 250/350"
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr "zařízení použité pro WinTV-PVR 250/350 (modul pvr)"
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr "Cesta k zařízení vaší karty WinTV."
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr "Uvedená IP adresa je multicast\n"
+-
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr "Nelze nalézt adresu rozhraní %s:%s\n"
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) selhalo (jádro s multicastem?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "nelze zjistit adresu '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "nelze se připojit k '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, c-format
+-msgid "recv(): %s.\n"
+-msgstr "recv(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr "RTP: ukončuje se čtecí vlákno...\n"
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr "RTP: čtecí vlákno ukončeno\n"
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr "Otevírání >filename:%s port:%d rozhraní:%s<\n"
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: nelze vytvořit nové vlákno (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "vstupní modul pro RTP a UDP dodaný se xine"
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr "vstupní modul rtsp pro streamovaná data"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+-msgstr ""
++msgstr "Vstupní modul CIFS/SMB založený na libsmbclient"
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
+-msgstr "stdin: nelze se posunout zpět! (%<PRIiMAX> < %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
++msgstr ""
++"input_pnm: během čtení proudu dat přišla zpráva ze serveru:\n"
++"%s\n"
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "stdin: selhalo otevření '%s'\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_pnm: nelze se připojit k '%s'\n"
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr "vstupní modul pro data ze standardního vstupu"
++#: src/input/pnm.c:766
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_pnm: selhalo nastavení proudu dat\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -2009,6 +2431,120 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr "Cesta k vašemu zařízení rádia Video4Linux."
+
++#: src/input/mms.c:650
++msgid "Connecting MMS server (over tcp)..."
++msgstr "Připojuje se k MMS serveru (přes TCP)..."
++
++#: src/input/input_cdda.c:1494
++#, c-format
++msgid "%s: can't connect to %s:%d\n"
++msgstr "%s: http: nelze se připojit k %s:%d\n"
++
++#: src/input/input_cdda.c:1540
++#, c-format
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cdda: úspěšně připojeno k CDDB serveru '%s:%d'.\n"
++
++#: src/input/input_cdda.c:1545
++#, c-format
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++msgstr "input_cdda: nelze se připojit k CDDB serveru '%s:%d' (%s).\n"
++
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
++msgstr "digitální zvukové CD (CDDA)"
++
++#: src/input/input_cdda.c:2586
++msgid "device used for CD audio"
++msgstr "zařízení použité pro zvukové CD"
++
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
++msgstr ""
++"Cesta k zeřízení, obvykle CD nebo DVD mechanika, které máte v úmyslu "
++"používat k přehrávání zvukových CD."
++
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
++msgstr "dotazovat se CDDB"
++
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
++msgstr ""
++"Povolí dotazy CDDB, které vám budou vracet pro vaše zvuková CD příslušné "
++"nadpisy a názvy stop.\n"
++"Vězte, že pokud nepoužíváte vlastní CDDB, je tato informace získávána z "
++"internetového serveru, který by pak mohl znát profil vašich poslechových "
++"zvyků."
++
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
++msgstr "jméno serveru CDDB"
++
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
++msgstr ""
++"Server CDDB, který se použije, aby se z něj získávaly nadpisy a informace o "
++"stopě.\n"
++"Toto nastavení je kritické s ohledem na bezpečnost, protože serveru budou "
++"posílány informace o vašich poslechovích zvycích a také mohl by odpovídat na "
++"dotazy zákeřnými odpověďmi. Ujistěte se, že serveru můžete důvěřovat."
++
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
++msgstr "port serveru CDDB"
++
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
++msgstr ""
++"Port serveru, který se použije, aby se z něj získávaly nadpisy a informace o "
++"stopě."
++
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
++msgstr "adresář se záznamy CDDB"
++
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
++msgstr ""
++"Odpovědi z CDDB serveru budou uchovávány v tomto adresáři.\n"
++"Toto nastavení je kritické s ohledem na bezpečnost, protože mohou být v "
++"tomto adresáři vytvářeny soubory s nekontrolovatelnými jmény. Ujistěte se, "
++"že daný adresář není používán pro nic jiného než cachování CDDB."
++
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
++msgstr "zpomalit diskovou jednotku na tento rychlostní faktor"
++
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
++msgstr ""
++"Protože některé CD nebo DVD jednotky vydávají opravdu silný hluk kvůli "
++"rychlé rotaci disku, xine je zkusí zpomalit. Pro běžné přehrávání CD nebo "
++"DVD nejsou vysoké rychlosti dat, které vyžadují rychlou rotaci disku, "
++"potřebné, a tak by nemělo zpomalení ovlivnit výkon přehrávání.\n"
++"Hodnota nula zde zakáže zpomalování."
++
+ #: src/input/input_vcd.c:849
+ msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+ msgstr "input_vcd: Neplatné MRL. Použijte vcdo:/<stopa #>\n"
+@@ -2044,2114 +2580,1436 @@
+ "Cesta k zařízení, obvykle CD nebo DVD mechanika, se kterým zamýšlíte "
+ "přehrávat VideoCD."
+
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr "input_dvd: Selhalo otevření zařízení %s během volání vysunutí\n"
+-
+-#: src/input/mms.c:646
+-msgid "Connecting MMS server (over tcp)..."
+-msgstr "Připojuje se k MMS serveru (přes TCP)..."
+-
+-#: src/input/mmsh.c:232
+-msgid "libmmsh: send error\n"
+-msgstr "libmmsh: chyba při posílání\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr "libmmsh: špatný formát odpovědi\n"
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
++msgstr "vstupní modul rtsp pro streamovaná data"
+
+-#: src/input/mmsh.c:283
++#: src/input/input_pvr.c:604
+ #, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "libmmsh: přesměrování 3xx není implementováno: >%d %s<\n"
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_pvr: chyba vytváření souboru pvr (%s)\n"
+
+-#: src/input/mmsh.c:290
++#: src/input/input_pvr.c:761
+ #, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "libmmsh: stav http není 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "libmmsh: Přesměrování umístění není implementováno\n"
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr "Připojuje se k MMS serveru (přes HTTP)..."
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr "neplatné URL\n"
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr "nepodporovaný protokol\n"
+-
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr "Nahrává se..."
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_pvr: chyba otevírání souboru pvr (%s)\n"
+
+-#: src/input/pnm.c:617
++#: src/input/input_pvr.c:837
+ #, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
+-msgstr ""
+-"input_pnm: během čtení proudu dat přišla zpráva ze serveru:\n"
+-"%s\n"
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_pvr: chyba čtení (%s)\n"
+
+-#: src/input/pnm.c:755
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+ #, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
+-msgstr "input_pnm: nelze se připojit k '%s'\n"
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_pvr: chyba otevírání zařízení %s\n"
+
+-#: src/input/pnm.c:766
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_pnm: selhalo nastavení proudu dat\n"
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: selhalo IVTV_IOC_G_CODEC, možná se změnilo API?\n"
+
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr "rtsp: špatné MRL: %s\n"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: selhalo IVTV_IOC_S_CODEC, možná se změnilo API?\n"
+
+-#: src/input/librtsp/rtsp.c:507
+-#, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "rtsp: nelze se připojit k '%s'\n"
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
++msgstr "Vstupní modul WinTV-PVR 250/350"
+
+-#: src/input/librtsp/rtsp_session.c:84
+-#, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "rtsp_session: nelze se připojit k serveru %s\n"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
++msgstr "zařízení použité pro WinTV-PVR 250/350 (modul pvr)"
+
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr "rtsp_session: nelze zavést relaci.\n"
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
++msgstr "Cesta k zařízení vaší karty WinTV."
+
+-#: src/input/librtsp/rtsp_session.c:135
++#: src/input/input_file.c:127
+ #, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr "rtsp_session: typ rtsp serveru '%s' ještě není podporován. bohužel.\n"
+-
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr "Pro nenulovou hodnotu posuvu není SEEK_CUR implementován"
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
+-msgstr "SEEK_END ještě není implementováno."
+-
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
+-msgstr "posuv ještě není implementován."
+-
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
+-msgstr "špatný typ položky"
+-
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
+-msgstr "špatné číslo položky"
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: chyba čtení (%s)\n"
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
+-msgstr "špatné číslo segmentu"
++#: src/input/input_file.c:282
++#, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_file: Přístup odepřen: >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
+-msgstr "Chyba při získávání čísla aktuálního segmentu"
++#: src/input/input_file.c:286
++#, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: Soubor nenalezen >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
+-msgstr "Výše uvedené by mělo být převedeno"
++#: src/input/input_file.c:510
++msgid "file input plugin"
++msgstr "modul pro vstup ze souboru"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
+-msgstr "selhalo hledání zařízení s VCD"
++#: src/input/input_file.c:872
++msgid "file browsing start location"
++msgstr "počáteční umístění při procházení souborů"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
+-msgstr "byl předán parametr třídy null"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
++msgstr "Prohlížeč vybírající soubor k přehrání začne na tomto umístění."
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
+-msgstr "Neplatný typ aktuální položky"
++#: src/input/input_file.c:880
++msgid "list hidden files"
++msgstr "ukazovat skryté soubory"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_file.c:881
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-msgstr "modul video CD s PBC a podporou: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
+-msgstr "výběr nemá položku NÁVRAT"
+-
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
+-msgstr "VÝCHOZÍ je vybráno, ale PBC není zapnuto."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr "výběr nemá položku VÝCHOZÍ"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr "výběr nemá položku DALŠÍ"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr "výběr nemá položku PŘEDCHOZÍ"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr "Neznámý typ události: "
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr "Výše uvedená zpráva má neznámou logovací úroveň vcdimageru"
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
++msgstr ""
++"Pokud je povoleno, bude prohlížeč vybírající soubor k přehrání ukazovat také "
++"skryté soubory."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
+-msgstr "výchozí typ, který se použije na automatické přehrání VCD"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
++msgstr "prohodit liché a sudé řádky"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+-"Jednotka přehrávání, kterou použít, jestliže žádná není uvedena v MRL. Např. "
+-"vcd:// nebo vcd:///dev/dvd:"
++"Prohodí sudé a liché pole obrázku.\n"
++"Povolte tuto volbu pro média v jiném formátu než MPEG, které vytváří na "
++"obrazovce vodorovné chvění."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr "výchozí zařízení CD použité pro VCD, jestliže není žádné zadáno"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
++msgstr "upravit poměr stran přidáním černých pruhů"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+-"Co použít, jestliže není uvedeno zařízení. Jestliže je nastavení prázdné, "
+-"xine prozkoumá jednotky CD."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr "rozsah ukazatele pozice"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr "Rozsah ukazatele pozice přehrávání přítomného při přehrávání."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr "Mělo by se používat cachování read-ahead?"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
+-msgstr "Na slabších strojích může toto vést k trhanému přehrávání"
++"Přidá černé pruhy, jestliže má obraz poměr stran, se kterým karta nemůže "
++"pracovat přímo. Je to nutné k udržení patřičných proporcí obrázku."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
+-msgstr "automaticky postupovat ve stopách nebo položkách"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
++msgstr "pro kodér MPEG použít hladký režim přehrávání"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
++#: src/dxr3/video_out_dxr3.c:272
+ msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+-"Jestliže je povoleno, měli bychom automaticky postoupit na další položku "
+-"nebo stopu. Použito pouze, když není zapnuta kontrola přehrávání (PBC)."
++"Povolením této volby se využije pro ne-MPEG obsah hladší režim přehrávání."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
+-msgstr "zobrazit 'odmítnuté' LID?"
++#: src/dxr3/video_out_dxr3.c:280
++#, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "video_out_dxr3: Selhalo otevření řídícího zařízení %s (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
+-msgstr ""
+-"Nekteré identifikátory seznamů přehrávání (LID) bývají označeny, aby se "
+-"nezobrazovaly. Ale pokud je nastavena tato volba, můžete je vidět v seznamu "
+-"MRL. Odmítané položky jsou označeny hvězdičkou (*) přidanou na konec MRL."
++#: src/dxr3/video_out_dxr3.c:288
++#, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "video_out_dxr3: Selhalo otevření video zařízení %s (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr "formát řetězce pro nápis na obrazovce"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
++msgstr "kodér pro ne-MPEG obsah"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
++#: src/dxr3/video_out_dxr3.c:331
+ msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+-"Formát použitý v titulku GUI. Podobá se zadání unixovského datumu. "
+-"Specifikátory formátu začínají znakem procento. Specifikátory jsou %A, %C, %"
+-"c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v a %%."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr "formátovací řetězec pro pole komentáře proudu dat"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
+-msgstr "debugovací maska příznaků"
++"Obsah jiný než MPEG musí projít dodatečnou překódovávací fází, protože DXR3 "
++"pracuje pouze s MPEG.\n"
++"V závislosti na tom, co je podporováno vaším xine, může být toto nastavení "
++"\"fame\", \"rte\", \"libavcodec\" nebo \"none\".\n"
++"Kodér \"libavcodec\" použije modul ffmpeg, který je již se xine dodán, takže "
++"pro to nepotřebujete instalovat žádné další knihovny. libavcodec je dokonce "
++"lepší, poskytuje vyšší kvalitu s nižším využitím CPU. Použití \"libavcodec\" "
++"je proto silně doporučováno.\n"
++"\"fame\" a \"rte\" zde stále jsou, ale jejich podpora ve xine je zastaralá, "
++"takže tyto by nemusely fungovat."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
+-msgstr "Toto celé číslo v binární reprezentaci je debugovací maska."
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru.\n"
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
+-msgstr "POMÓC! Zvukový ovladač pouze mono?!\n"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru rte.\n"
+
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
+-msgstr "hlasitost A/52"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++msgstr "video_out_dxr3: Selhala inicializace Mpeg kodéru fame.\n"
+
+-#: src/liba52/xine_decoder.c:781
++#: src/dxr3/video_out_dxr3.c:361
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+-"U zvuku A/52 můžete změnit hlasitost na úrovni dekódování. To má výhodu, že "
+-"zvuk je již dekódován na specifikovanou hlasitost, takže pozdější operace "
+-"jako smixovávání kanálů budou pracovat na zvukových datech dané hlasitosti."
+-
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
+-msgstr "povolit zhuštění dynamického rozsahu A/52"
++"video_out_dxr3: kódování MPEG zakázáno.\n"
++"video_out_dxr3: to je v pořádku, nepotřebujete to pro MPEG video jako je "
++"DVD,\n"
++"video_out_dxr3: ale při použití tohoto ovladače výstupu videa nebudete\n"
++"video_out_dxr3: moci přehrávat ne-MPEG obsah. Detaily o konfiguraci kodéru\n"
++"video_out_dxr3: viz. README.dxr3.\n"
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:367
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+-"Zhuštění dynamického rozsahu omezí dynamický rozsah zvuku. To znamená, že "
+-"hlasité zvuky se stanou tiššími a tiché zvuky hlasitějšími, a tak můžete "
+-"lépe slyšet zvuk v hlasitém prostředí bez toho, abyste kohokoliv rušili."
++"video_out_dxr3: kódování MPEG není zakompilováno.\n"
++"video_out_dxr3: to je v pořádku, nepotřebujete to pro MPEG video jako je "
++"DVD,\n"
++"video_out_dxr3: ale při použití tohoto ovladače výstupu videa nebudete\n"
++"video_out_dxr3: moci přehrávat ne-MPEG obsah. Detaily o konfiguraci kodéru\n"
++"video_out_dxr3: viz. README.dxr3.\n"
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
+-msgstr "redukce zvuku do 2.0 surround stereo"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
++msgstr "režim výstupu videa (TV nebo překrývaní)"
+
+-#: src/liba52/xine_decoder.c:798
++# TODO: dopřeložit
++#: src/dxr3/video_out_dxr3.c:383
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+-"Jestli chcete poslouchat vícekanálový surround zvuk, ale máte pouze dva "
+-"reproduktory, surround dekodér nebo zesilovač, který provádí nějaké maticové "
+-"surround dekódování jako např. prologic, měli byste tuto volbu povolit. Pak "
+-"budou dodatečné kanály přimixovávány do stereo signálu."
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
+-msgstr "libfaad: selhala funkce faacDecOpen().\n"
+-
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr "libfaad: selhala funkce faacDecInit2.\n"
+-
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
+-msgstr "libfaad: selhala funkce faacDecInit.\n"
+-
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_audio_dec: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
+-
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr "ffmpeg_audio_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
+-
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_audio_dec: nelze otevřít dekodér\n"
+-
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+-msgstr "dvaudio: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
+-
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: nepodporovaný formát, DR1 zakázáno.\n"
+-
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: nepodporované rozměry snímku, DR1 zakázáno.\n"
+-
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_video_dec: nelze otevřít dekodér\n"
+-
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
+-msgstr "ffmpeg_video_dec: přímé renderování povoleno\n"
+-
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
+-msgstr "Selhala funkce avcodec_find_decoder (CODEC_ID_MPEG1VIDEO)\n"
+-
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_video_dec: zvětšení bufferu na %d, aby se předešlo přetečení.\n"
+-
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr "ffmpeg_video_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
++"Zde může být nastaven způsob výstupu výsledného videa z DXR3. Jednotlivé "
++"hodnoty jsou:\n"
++"\n"
++"letterboxed tv\n"
++"Posílat video pouze do výstupního TV konektoru. Toto je režim použitý pro "
++"standardní nastavení televize 4:3. Anamorfické video (16:9) bude zobrazeno "
++"4:3, média pan&scan budou mít oříznutý obraz na levé a pravé straně. Toto je "
++"běžné nastavení pro sledování TV, která se chová stejně jako samotný DVD "
++"přehrávač.\n"
++"\n"
++"widescreen tv\n"
++"Posílat video pouze do výstupního TV konektoru. This mode is intended for "
++"16:9 widescreen TV sets. Anamorphic and pan&scan content will fill the "
++"entire screen, but you have to set the TV's aspect ratio manually to 16:9 "
++"using your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
+-msgstr "kvalita dodatečného zpracování MPEG-4"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
++msgstr "hodnota klíčové barvy překrývání"
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+-"Můžete přizpůsobit množství dodatečného zpracování použitého na video MPEG-"
+-"4.\n"
+-"Vyšší hodnoty mají za následek lepší kvalitu, ale více zatíží CPU. Menší "
+-"hodnoty mohou mít za následek defekty v obrázku, např. blokové artefakty. "
+-"Pro vysokou kvalitu videa může příliš silné dodatečné zpracování způsobit "
+-"horší obraz tím, že ho více rozmaže."
++"Šestnáctková hodnota RGB klíčové barvy.\n"
++"Pokud při použití překryvného režimu DXR3 zjistíte, že se okna stávají "
++"transparentní, můžete vyzkoušet jiné hodnoty."
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
+-msgstr "výstupní rychlost libavcodec mpeg (kbit/s)"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
++msgstr "rozsah klíčové barvy překrývání"
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+-"Bitová rychlost knihovny libavcodec kódující mpeg, jaká by se měla používat "
+-"v režimu kódování DXR3. Vyšší hodnoty zvýší využití procesoru a kvalitu.\n"
+-"Toto nastavení je uvažováno pouze, když je zakázán režim konstantní kvality."
++"Větší hodnota rozšíří toleranci překryvné klíčové barvy.\n"
++"Pokud při použití překryvného režimu DXR3 zjistíte, že se okna stávají "
++"transparentní, můžete vyzkoušet nižší hodnoty. Ale při použití příliš "
++"nízkého nastavení mohou mizet části okrajů obrazu."
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
+-msgstr "režim konstantní kvality"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
++msgstr "oříznout překrývanou oblast nahoře a dole"
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+-"Když bude povoleno, libavcodec použije režim konstantní kvality dynamickou "
+-"kompresí obrázků na základě jejich složitosti. Když bude zakázáno, "
+-"libavcodec použije režim konstantní bitové rychlosti."
++"Odstraní jeden bodový řádek z hořejšku a dolejšku překrývaného obrazu. Toto "
++"povolte, pokud vidíte nahoře a dole zelené řádky."
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
+-msgstr "minimálné komprese"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++msgstr "video_out_dxr3: spusťte prosím autocal, překrývání zakázáno\n"
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
++msgstr "přednost režimu TV"
++
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+-"Minimální komprese, která se použije na obraz v režimu konstatní kvality."
++"Vybere TV režim, který má použít DXR3. Hodnoty znamenají:\n"
++"\n"
++"ntsc: NTSC na 60Hz\n"
++"pal: PAL na 50Hz\n"
++"pal60: PAL na 60Hz\n"
++"default: zachovat nastavení karty"
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
+-msgstr "Maximální kvantizér"
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
++msgstr "video_out_dxr3: selhalo nastavení režimu videa.\n"
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+-"Maximální komprese, která se použije na obraz v režimu konstantní kvality."
+-
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+-msgstr "libareal: (audio) Nelze zjistit symboly - nekompatibilní dll: %s\n"
++"video_out_dxr3: K přehrávání ne-MPEG videa na dxr3 potřebujete MPEG kodér\n"
++"video_out_dxr3: Detaily viz. README.dxr3.\n"
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
+-msgstr "libareal: selhala inicializace dekodéru, chybový kód: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++msgstr ""
++"video_out_dxr3: CHYBA čtení souboru inicializace překrývání. Spusťte "
++"autocal!\n"
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+-msgstr "libareal: nastavení esence dekodéru selhalo, chybový kód: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgstr "dxr3_decode_spu: Selhalo otevření zařízení titulků %s (%s)\n"
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
+-msgstr "libareal: jejda, real může mít více než 2 kanály?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
++msgstr "požadované tlačítko není k dispozici\n"
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
+-msgstr "cesta ke kodekům Real Playeru"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
++msgstr "Číslo zařízení DXR3"
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+-"Pokud máte nainstalovaný RealPLayer, uveďte zde cestu k adresáři s jeho "
+-"kodeky. Adresář s kodeky můžete jednoduše nalézt hledáním souboru \"drv3."
+-"so.6.0\", který je v něm. Pokud bude moci xine nalézt kodeky RealPlayeru, "
+-"použije je pro vás k dekódování RealPlayer obsahu. Více informací, jak "
+-"nainstalovat kodeky, získáte ve xine FAQ."
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+-msgstr "libreal: Chyba hledání symbolů! (nekompatibilita verzí?)\n"
++"Jestliže máte ve vašem počítači více než jednu DXR3, můžete uvézt, kterou z "
++"nich zde použít."
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
+-msgstr "zobrazovat skryté titulky v sekvencích MPEG-2"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
++msgstr "dxr3_mpeg_encoder: selhala inicializace librte\n"
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+-"Skryté titulky jsou titulky určené hlavně na pomoc sluchově postiženým."
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr "podoba skrytých titulků (popředí/pozadí)"
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr "Vyberte váš oblíbený způsob vykreslování skrytých titulků."
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr "standardní font skrytých titulků"
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr "Vyberte font pro normální text u skrytých titulků."
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr "font kurzívy skrytých titulků"
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
+-msgstr "Vyberte font pro text kurzívy u skrytých titulků."
++"dxr3_mpeg_encoder: rte pracuje pouze s rozměry videa, které jsou násobky 16\n"
+
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
+-msgstr "velikost fontu skrytých titulků"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++msgstr "dxr3_mpeg_encoder: selhalo získání kontextu rte.\n"
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
+-msgstr "Vyberte velikost fontu pro text skrytých titulků."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
++msgstr "dxr3_mpeg_encoder: nešlo vytvořit kodek.\n"
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
+-msgstr "přizpůsobení centrování skrytých titulků"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
++msgstr "výstupní rychlost rte mpeg (kbit/s)"
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+-"Pokud je povoleno, skryté titulky budou umisťovány doprostřed jednotlivých "
+-"řádků."
+-
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
+-msgstr "font externích titulků"
++"Bitová rychlost knihovny librte kódující mpeg, jaká by se měla používat v "
++"režimu kódování DXR3. Vyšší hodnoty zvýší využití procesoru a kvalitu."
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
+-msgstr "vertikální posun titulků (vzhledem k velikosti okna)"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgstr "dxr3_mpeg_encoder: nelze inicializovat kontext: %s\n"
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
+-msgstr "kódování titulků"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgstr "dxr3_mpeg_encoder: nelze začít s kódováním: %s\n"
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "demux_ts: nelze vytvořit nové vlákno (%s)\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++msgstr "dxr3_mpeg_encoder: Nešlo spustit knihovnu FAME\n"
+
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
+-msgstr "výchozí doba zobrazení titulků v sekundách"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
++msgstr "kvalita kódování MPEG knihovny fame"
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+-"Některé formáty titulků neobsahují explicitně trvání každého titulku.Pro "
+-"takové formáty zde můžete nastavit výchozí dobu trvání. Nastavení na nulu "
+-"bude mít za následek, že titulek bude vždy zobrazen tak dlouho, než se "
+-"objeví další."
++"Kvalita kódování knihovny libfame vytvářející mpeg. Menší je rychlejší, ale "
++"dává viditelné artefakty. Vyšší je lepší, ale pomalejší."
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
+-msgstr "velikost titulků"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
++msgstr "priorita modulu SCR"
+
+-# FIXME: correct original?
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+-"Zde můžete upravit velikost titulků. Nastavení bude bráno relativně k "
+-"velikosti okna."
++"Priorita modulu DXR3 SCR. Hodnoty menší než 5 znamenají, že bude použit "
++"časovač unixového systému. Hodnoty větší než 5 vynutí použití jako zdroj "
++"synchronizace vnitřních hodin DXR3."
+
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
+-msgstr "vertikální posun titulků"
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgstr "dxr3_decode_video: Selhalo otevření řídícího zařízení %s (%s)\n"
+
+-# FIXME: correct original?
+-#: src/libsputext/xine_decoder.c:908
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
++msgstr "použít informaci Pan & Scan"
++
++#: src/dxr3/dxr3_decode_video.c:257
+ msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+-"Můžete upravit svislou polohu titulků. Nastavení bude bráni relativně k "
+-"velikosti okna."
+-
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
+-msgstr "font titulků"
+-
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
+-msgstr "Font z adresáře fontů xine, který se použije na text s titulky."
++"\"Pan & Scan\" je speciální režim zobrazení, který je občas používán v "
++"médiích kódovaných v MPEG. Můžete zde uvézt, jak pracovat s takovým "
++"obsahem.\n"
++"\n"
++"pouze, pokud je vynuceno\n"
++"Použít Pan & Scan pouze, když si to obsah, který přehráváte, vynucuje.\n"
++"\n"
++"použít informaci v MPEG\n"
++"Povolit Pan & Scan na základě informací vložených v datech MPEG videa.\n"
++"\n"
++"použít informaci z DVB\n"
++"Povolit Pan & Scan na základě informací vložených v datech DVB. Toto "
++"způsobí, že se použije Active Format Descriptor (AFD) používaný některými "
++"Evropskými kanály."
+
+-#: src/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
+-msgstr "kódování titulků"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
++msgstr "Zkusit synchronizovat video každý snímek"
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+-"Kódování textu titulků ve streamu dat. Toto nastavení se používá ke "
+-"správnému renderování znaků, které nejsou v ASCII. Jestliže nejsou takové "
+-"znaky zobrazeny tak, jak očekáváte, zeptejte se toho, kdo titulky vytvářel, "
+-"jaké bylo použito kódování."
++"Zkouší nastavit pro každý snímek synchronizační časovou značku. Běžně toto "
++"není nutné, protože synchronizace je dostatečná, i když je časová značka "
++"nastavena pouze občas.\n"
++"Toto je odůvodněné pouze pro postupné video (většina filmů PAL)."
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
+-msgstr "používat OSD bez změn měřítka, je-li to možné"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
++msgstr "použít hladký režim přehrávání"
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
+-msgstr ""
+-"OSD bez změn měřítka bude renderováno nezávisle na snímku videa a bude vždy "
+-"ostré, dokonce když se zvětší video. Vypadá to lépe, ale nefunguje to na "
+-"každém grafickém hardwaru. Druhá možnost je škálované OSD, které se stane "
+-"rozmazané, jestliže rozšíříte video s nízkým rozlišením na celou obrazovku, "
+-"ale funguje na všech grafických kartách."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
++msgstr "Povolením této volby se využije hladší režim přehrávání."
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
+-msgstr "cesta ke kodekům WIN32"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
++msgstr "opravovat dobu trvání snímků v porušených datových proudech"
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+-"Pokud máte nainstalované kodeky Windows nebo Apple Quicktime, uveďte zde "
+-"cestu k tomuto adresáři s kodeky. Pokud bude moci xine nalézt kodeky Windows "
+-"nebo Apple Quicktime, použije je pro vás k dekódování různých dat Windows "
+-"Media a Quickime. Více informací, jak nainstalovat kodeky, získáte ve xine "
+-"FAQ."
+-
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr "w32codec: Selhalo ICOpen! neznámý kodek %08lx nebo špatné parametry?\n"
++"Povolí logiku, která upravuje doby trvání snímku některých mpeg streamů se "
++"špatnými kódy rychlosti snímku. V současnosti je implementována korekce pro "
++"NTSC streamy mylně označené jako PAL streamy. Povolte to pouze tehdy, když "
++"se s takovými stramy setkáte."
+
+-#: src/libw32dll/w32codec.c:595
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+-msgstr "w32codec: Selhalo ICDecompressGetFormat (%.4s %08lx/%d): Chyba %ld\n"
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "dxr3_decode_video: Selhalo otevření video zařízení %s (%s)\n"
+
+-#: src/libw32dll/w32codec.c:628
+-#, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+-msgstr "w32codec: Selhalo ICDecompressQuery: Chyba %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
++msgstr "dxr3_decode_video: zápis do zařízení by blokoval. okamžité zapsání\n"
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+-msgstr "w32codec: Selhalo ICDecompressBegin: Chyba %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgstr "dxr3_decode_video: zápis do video zařízení selhal (%s)\n"
+
+-#: src/libw32dll/w32codec.c:685
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
+-"w32codec: Selhal DS_VideoDecoder! neznámý kodek %08lx nebo špatné "
+-"parametry?\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgstr "dxr3_decode_video: VAROVÁNÍ: neznámý kód rychlosti snímků %d\n"
+
+-#: src/libw32dll/w32codec.c:696
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+-"w32codec: Selhal DMO_VideoDecoder! neznámý kodek %08lx nebo špatné "
+-"parametry?\n"
++"dxr3_decode_video: VAROVÁNÍ: oprava kódu rychlosti snímků z PAL na NTSC\n"
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr "w32codec: selhalo spuštění dekodéru. Je nainstalován '%s?\n"
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+-msgstr "w32codec: (ACM_Decoder) Neadekvátní zvukový formát\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgstr "audio_oss_out: Otevírá se zvukové zařízení %s: %s\n"
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+-msgstr "w32codec: (ACM_Decoder) chyba acmStreamOpen%d\n"
+-
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
+-msgstr "w32codec: Chyba inicializace DirectShow zvuku\n"
+-
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
+-msgstr "w32codec: Chyba inicializace DMO zvuku\n"
+-
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
+-msgstr "bitplane: chyba při provádění dekomprese ByteRun1\n"
+-
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+-msgstr "bitplane: V tomto okamžiku není Anim Opt 1 podporován\n"
+-
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+-msgstr "bitplane: V tomto okamžiku není Anim Opt 2 podporován\n"
+-
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+-msgstr "bitplane: V tomto okamžiku není Anim ASCIIJ podporován\n"
+-
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
+-msgstr "bitplane: V tomto okamžiku není tento typ anim podporován\n"
+-
+-#: src/post/audio/stretch.c:264
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+-"Tento filtr bude provádět časové natahování - sekvence se přehraje rychleji "
+-"nebo pomaleji podle násobku. Rozteč je volitelně zachovávána, takže je možné "
+-"např. použít tento filter ke shlédnutí filmu v kratším čase, než byl původně "
+-"natočen.\n"
++"audio_oss_out: varování: vzorkovací frekvence %d Hz není podporována, zkusí "
++"se 44100 Hz\n"
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:225
++#, c-format
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+-"Funkce upmixu, např. vzít vstup stereo a vydat výstup Surround 5.1.\n"
+-"Parametry\n"
+-" cut_off_freq\n"
+-"\n"
+-"Poznámka: K nastavení těchto parametrů je možné použít řídící okno "
+-"frontendu.\n"
+-"\n"
++"audio_oss_out: rychlost zvuku : %d požadováno, %d poskytnuto zařízením\n"
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
++msgstr "jméno zvukového zařízení OSS"
++
++#: src/audio_out/audio_oss_out.c:737
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
+-"\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
+-"\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
+-"\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
+-"\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
+-"\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+-"Zdokonalený modul tvtime/deinterlacer s pulldown detekcí\n"
+-"Tento modul má za cíl poskytnout mechanizmy korekce prokládání srovnatelné s "
+-"vysoce kvalitními postupnými přehrávači DVD a takzvanými \"zdvojovači řádek"
+-"\" (line-doublers) pro použití s počítačovými monitory, projektory a jinými "
+-"postupnými zobrazovacími zařízeními.\n"
+-"\n"
+-"Parametry\n"
+-"\n"
+-" Method: Vybrat metodu (algoritmus), kterou použít. Vysvětlení všech metod "
+-"je dále.\n"
+-"\n"
+-" Enabled: Povolit nebo zakázat modul.\n"
+-"\n"
+-" Pulldown: Vybrat detekční algoritmus 2-3 pulldown. Filmy s rychostí 24 "
+-"snímků/s, které byly konvertovány do NTSC mohou být detekovány a "
+-"inteligentně rekonstruovány do původních (neprokládaných) snímků.\n"
+-"\n"
+-" Framerate_mode: Vybráním 'full' se bude korigovat prokládání každého "
+-"půlsnímku do unikátního snímku. Získá se tím televizní nebo ještě vyšší "
+-"kvalita. Tato funkce účinně zdvojnásobí rychlost snímků, což zlepší "
+-"hladkost. Poznamenejme však, že plných 59.94 snímků/s nelze dosáhnout s "
+-"neupraveným jádrem Linuxu 2.4 (to používá frekvenci přerušení časovače 100 "
+-"Hz). Novější jádra RedHatu a 2.6 jádra používají vyšší nastavení HZ (512 a "
+-"1000, v pořadí) a měly by v pohodě fungovat.\n"
+-" Judder_correction: Je-li povoleno 2-3 pulldown a je deketován filmový "
+-"materiál, je možné omezit rychlost snímků na původní použitou rychlost (24 "
+-"snímků/s). To způsobí, že snímky budou rovnoměrně rozložené v čase. Jejich "
+-"čas bude souhlasit a eliminuje se třesení.\n"
+-"\n"
+-" Use_progressive_frame_flag: Dobře zvládnuté streamy MPEG2 používají "
+-"příznak k indikaci postupného materiálu. Toto nastavení řídí, zda věříme či "
+-"nevěříme tomuto příznaku (některé ojedinělé chybné streamy mpeg2 ho "
+-"nastavují špatně).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 používá prokládaný obrazový formát, který má "
+-"velmi špatné svislé barevné rozlišení. Převzorkování barvy na vyšší "
+-"rozlišení pro účely korekce prokládání může způsobit vytvoření artefaktů "
+-"(např. barevné pruhy). Tuto volbu použijte k svislému rozmazání barvy po "
+-"korekci prokládání, což odstraní tyto artefakty. Varování: náročné na CPU.\n"
+-"\n"
+-" Cheap_mode: Toto přeskočí nákladnou konverzi obrazu YV12->YUY2 a rutiny "
+-"tvtime/dscaleru budou používány, jako by stále zpracovávaly obrazy YUY2."
+-"Samozřejmě to není správně, ne všechny body budou vyhodnoceny algoritmem pro "
+-"rozhodování o oblastech ke korekci a barva bude zpracována odděleně. Nicméně "
+-"toto dovolí lidem s ne tak rychlými systémy vyzkoušet si algoritmus korekce "
+-"prokládání, v kompromisu mezi kvalitou využitím CPU.\n"
+-"\n"
+-"Metody korekce prokládání: (ne všechny metody jsou k dispozici pro všechny "
+-"platformy)\n"
+-"\n"
+-"(FIXME: vysvětlit každou metodu, zkontrolovat dokumentace tvtime/dscaler ... "
+-"už jsem líný) (pozn. překlad.: a bylo by to vytížení i pro mě :-))\n"
+-"\n"
+-"* Používá několik algoritmů z projektů tvtime a dscaler.\n"
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr "tvtime: Nejsou k dispozici žádné metody korekce prokládání, konec.\n"
++"Specifikujte bázovou část jména zvukového zařízení, ke kterému se přidá "
++"číslo OSS zařízení, aby se získalo celé jméno zařízení.\n"
++"Vyberte \"auto\", jestliže chcete, aby xine automaticky zjistilo správné "
++"nastavení."
+
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
+-msgstr "snímků generovaných za sekundu"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
++msgstr "číslo zvukového zařízení OSS, -1 pro žádné číslo"
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:745
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+-"S více snímky za sekundu bude animace hladší a rychlejší, ale také to bude "
+-"vyžadovat více výkonu CPU."
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr "šířka obrazu Goomu"
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr "Šířka generovaného obrazu v pixelech."
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
+-msgstr "výška obrazu Goomu"
++"Plné jméno zvukového zařízení je vytvořeno zřetězením jména zařízení OSS a "
++"čísla zvukového zařízení.\n"
++"Jestliže nepotřebujete číslo, protože jste spokojeni s výchozím zařízením "
++"systému, nastavte ho na -1.\n"
++"Rozsah této hodnoty je -1 nebo 0-15. Toto nastavení je ignorováno, pokud je "
++"jméno zvukového zařízení nastaveno na \"auto\"."
+
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
+-msgstr "Výška generovaného obrazu v pixelech."
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++msgstr ""
++"audio_oss_out: audio.device.oss_device_name = auto, zkouší se zařízení\n"
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
+-msgstr "metoda konverze barev"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
++msgstr "audio_oss_out: automatická zkouška zvukového zařízení selhala\n"
+
+-#: src/post/goom/xine_goom.c:219
+-msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
+-msgstr ""
+-"Můžete vybrat metodu konverze barevného prostoru použitou goomem.\n"
+-"Výběry k dispozici by měly být samovysvětlující."
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
++msgstr "audio_oss_out: použije se zařízení >%s<\n"
+
+-#: src/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+-"Mosaico dělá jednoduché efekty obraz v obrazu.\n"
+-"\n"
+-"Parametry\n"
+-" pip_num: počet obrazových slotů, na které použít následující nastavení\n"
+-" x: x-ová souřadnice levého horního rohu obrazu\n"
+-" y: y-ová souřadnice levého horního rohu obrazu\n"
+-" w: šířka obrazu\n"
+-" h: výška obrazu\n"
++"audio_oss_out: otevírání zvukového zařízení %s selhalo:\n"
++"%s\n"
+
+-#: src/post/mosaico/switch.c:230
+-msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
+-msgstr ""
+-"Přepínač může být použit pro rychlé přepínání mezi vícero vstupy.\n"
+-"\n"
+-"Parametry\n"
+-" select: počet vstupů, které projdou na výstup\n"
++#: src/audio_out/audio_oss_out.c:800
++msgid "a/v sync method to use by OSS"
++msgstr "metoda synchronizace zvuku a videa použitá OSS"
+
+-#: src/post/planar/boxblur.c:103
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Box blur does a simple blurring of the image.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+-msgstr ""
+-"Box blur provádí jednoduché rozmazání obrazu.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-"Parametry:\n"
+-" Radius: rozměr filtru\n"
+-" Power: jak často by měl být filtr použit\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"* boxblur mplayeru (C) 2002 Michael Niedermayer\n"
+-
+-#: src/post/planar/denoise3d.c:136
+-msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+-"Tento filter má za cíl snížit šum obrazu produkováním vyhlazených snímků a "
+-"děláním nehybného obrazu skutečně nehybným (to by mělo zvýšit "
+-"komprimovatelnost). Může být zadáno od 0 do 3 parametrů. Jestliže vynecháte "
+-"parametr, bude odhadnuta přiměřená hodnota.\n"
+-"\n"
+-"Parametry\n"
+-" Luma: prostorová intenzita světlosti (implicitní = 4)\n"
+-" Chroma: prostorová intenzita sytosti (implicitní = 3)\n"
+-" Time: dočasná intenzita (implicitní = 6)\n"
++"xine může k zachování synchronizace zvuku a videa používat různé metody. "
++"Které nastavení funguje nejlépe záleží na ovladači OSS a zvukovém hardware, "
++"který používáte. Pokud narazíte na problémy se synchronizací, vyzkoušejte "
++"různé metody.\n"
+ "\n"
+-"* denoise3d mplayeru (C) 2003 Daniel Moreno\n"
+-
+-#: src/post/planar/eq.c:186
+-msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
++"Význam hodnot je následující:\n"
+ "\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
++"auto\n"
++"xine zkusí automaticky zjistit optimální nastavení\n"
+ "\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
++"getodelay\n"
++"k dosažení věrné synchronizace zvuku a videa používá ioctl "
++"SNDCTL_DSP_GETODELAY dokonce, když ovladač tvrdí, že nepodporuje přehrávání "
++"v reálném čase\n"
+ "\n"
+-"* mplayer's eq (C) Richard Felker\n"
+-msgstr ""
+-"Softwarový ekvalizér s interaktivním ovládáním tak jako u hardwarového "
+-"ekvalizéru pro karty, které nepodporují řízení jasu a kontrastu hardwarově.\n"
+-"Parametry\n"
+-" světlost\n"
+-" kontrast\n"
++"getoptr\n"
++"k dosažení věrné synchronizace zvuku a videa používá ioctl "
++"SNDCTL_SDP_GETOPTR dokonce, když ovladač podporuje preferované ioctl "
++"SNDCTL_DSP_GETODELAY\n"
+ "\n"
+-"Poznámka: K nastavení těchto parametrů je možné použít okno ovládání "
+-"frontendů.\n"
++"softsync\n"
++"používá softwarovou synchronizaci se systémovými hodinami; zvuk a video se "
++"mohou vzájemně dostat mimo synchronizaci, jestliže rychlost hodin v systému "
++"přesně nesouhlasí s rychlostí přehrávání zvukové karty\n"
+ "\n"
+-"* eq mplayeru (C) Richard Felker\n"
++"probebuffer\n"
++"při inicializaci se zkouší velikost vyrovnávací paměti zvukové karty, aby se "
++"vypočetlo zpoždění synchronizace zvuku a videa; toto vyzkoušejte, jestliže "
++"váš systém nepodporuje žádné ioctl reálného času a zjistíte, že je po "
++"dlouhém přehrávání špatná synchronizace"
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"Alternativní softwarový ekvalizér, který pro jednoduchou úpravu světlosti, "
+-"kontrastu a sytosti používá vyhledávací tabulky. Je to velmi pomalé, ale "
+-"umožňuje to navíc gama korekci.\n"
+-"Poznamenejme ještě, že se používá stejný kód optimalizovaný pro MMX jako u "
+-"'eq', pokud jsou všechny hodnoty gama 1.0.\n"
+-"\n"
+-"Parametry\n"
+-" gama\n"
+-" jas\n"
+-" kontrast\n"
+-" sytost\n"
+-" rgama (gama pro červenou složku)\n"
+-" ggama (gama pro zelenou složku)\n"
+-" bgama (gama pro modrou složku)\n"
+-"\n"
+-"Rozsahy hodnot jsou 0.1 - 10 pro gamy, -2 - 2 pro kontrast (negativní "
+-"hodnoty mají za následek negativní obraz), -1 - 1 pro jas a 0 - 3 pro "
+-"sytost.\n"
+-"\n"
+-"* eq2 mplayeru (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
++" audio_oss_out: ...místo toho se použijí pro soft-sync systémové hodiny "
++"reálného času\n"
++" audio_oss_out: ...mohou zde být problémy se synchronizací zvuku a videa\n"
+
+-#: src/post/planar/expand.c:223
++#: src/audio_out/audio_oss_out.c:856
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "zpoždění zvukového výstupu OSS (upraví synchronizaci zvuku a videa)"
++
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++"If you experience audio being not in sync with the 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 ""
+-"Modul expand je navržen tak, aby přijímal snímky s libovolnými poměry stran "
+-"a konvertval je na poměr 4:3 přidáním černých pruhů nahoru a dolů. To dovolí "
+-"posunout OSD a titulky tak, že nezasahují do obrazu.\n"
+-"\n"
+-"Parametry (FIXME: lepší nápověda)\n"
+-" Enable_automatic_shift: Povolí automatické posunutí titulků\n"
+-" Overlay_y_offset: Ruční posun titulků svisle\n"
+-"\n"
++"Pokud zjistíte, že zvuk není synchronizovaný s videem, můžete to kompenzovat "
++"zadáním pevného posunu.\n"
++"Jednotka hodnoty je jeden tik PTS, což je 1/90000 sekundy."
+
+-#: src/post/planar/pp.c:108
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+-"libpostprocess modul FFmpeg.\n"
+-"\n"
+-"Parametry\n"
+-"\n"
++"audio_oss_out: synchronizace reálného času zvukového zařízení zakázána...\n"
++" audio_oss_out: ...zkouší se velikost výstupní vyrovnávací paměti: "
+
+-#: src/post/planar/pp.c:114
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"%d bytů\n"
++"audio_oss_out: ...mohou zde být problémy se synchronizací zvuku a videa\n"
+
+-#: src/post/planar/unsharp.c:219
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
++msgstr "uspořádání reproduktorů"
++
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+-"Rozostřovací maska / gausovské rozmazání\n"
+-"Je možné nastavit šířku a výšku matice s lichými velikostmi v obou směrech "
+-"(min = 3x3, max = 13x11 nebo 11x13, obvykle něco mezi 3x3 až 7x7) a poměrné "
+-"množství ostrosti/rozmazání, které se má přidat k obrazu (rozumný rozsah by "
+-"měl být -1.5 - 1.5).\n"
+-"\n"
+-"Parametry\n"
+-"\n"
+-" Luma_matrix_width: Šířka matice (musí být lichá)\n"
+-"\n"
+-" Luma_matrix_height: Výška matice (musí být lichá)\n"
+-"\n"
+-" Luma_amount: Poměrné množství ostrosti nebo rozmazání (=0 zakázat, <0 "
+-"rozmazat, >0 zostřit)\n"
+-"\n"
+-" Chroma_matrix_width: Šířka matice (musí být lichá)\n"
+-"\n"
+-" Chroma_matrix_height: Výška matice (musí být lichá)\n"
+-"\n"
+-" Chroma_amount: Poměrné množství ostrosti nebo rozmazání (=0 zakázat, <0 "
+-"rozmazat, >0 zostřit)\n"
+-"\n"
++"Vyberte, jak jsou uspořádány vaše reproduktory. To určuje, které "
++"reproduktory xine použije pro výstup zvuku. Jednotlivé hodnoty jsou:\n"
+ "\n"
+-"* unsharp mplayeru (C) 2002 Rémi Guyomarch\n"
++"Mono 1.0: Máte pouze jeden reproduktor.\n"
++"Stereo 2.0: Máte dva reproduktory na levý a pravý kanál.\n"
++"Headphones 2.0: Používáte sluchátka.\n"
++"Stereo 2.1: Máte dva reproduktory na levý a pravý kanál a jeden sobwoofer na "
++"nízké frekvence.\n"
++"Surround 3.0: Máte tři reproduktory na levý, pravý a zadní kanál.\n"
++"Surround 4.0: Máte čtyři reproduktory na přední levý a pravý kanál a na "
++"zadní levý a pravý kanál.\n"
++"Surround 4.1: Máte čtyři reproduktory na přední levý a pravý kanál a na "
++"zadní levý a pravý kanál a jeden subwoofer na nízké frekvence.\n"
++"Surround 5.0: Máte pět reproduktorů na přední levý, střední a pravý kanál a "
++"zadní levý a pravý kanál.\n"
++"Surround 5.1: Máte pět reproduktorů na přední levý, střední a pravý kanál a "
++"zadní levý a pravý kanál a jeden subwoofer na nízké frekvence.\n"
++"Surround 6.0: Máte šest reproduktorů na přední levý, střední a pravý kanál a "
++"zadní levý, střední a pravý kanál.\n"
++"Surround 6.1: Máte šest reproduktorů na přední levý, střední a pravý kanál a "
++"zadní levý, střední a pravý kanál a jeden subwoofer na nízké frekvence.\n"
++"Surround 7.1: Máte sedm reproduktorů na přední levý, střední a pravý kanál, "
++"levý a pravý kanál a zadní levý, střední a pravý kanál a jeden subwoofer na "
++"nízké frekvence.\n"
++"Pass Through: Váš zvukový systém obdrží ze xine nedekódovaný digitální zvuk. "
++"Na digitální výstup vaší zvukové karty potřebujete připojit digitální "
++"surround dekodér schopný dekódovat formáty, které chcete přehrát."
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
++msgstr "číslo zvukového mixeru OSS, -1 pro žádné"
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
++"Plné jméno zařízení mixeru se vytvoří tak, že se vezme jméno zařízení OSS, "
++"\"dsp\" se nahradí \"mixer\" a přidá se číslo mixeru.\n"
++"Pokud nepotřebujete číslo, protože jste spokojeni s výchozím nastavením "
++"mixovacího zařízení v systému, nastavte tuto volbu na -1.\n"
++"Rozsah této hodnoty je -1 nebo 0-15. Toto nastavení je ignorováno, pokud je "
++"jméno zvukového zařízení OSS nastaveno na \"auto\"."
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "výstupní modul videa xine použije knihovnu ascii-art"
+-
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "výstupní modul videa xine použije knihovnu Color AsCii Art"
+-
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr "výstupní modul videa xine použije knihovnu DirectFB"
++#: src/audio_out/audio_oss_out.c:1074
++#, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "audio_oss_out: open() mixer %s selhalo: %s\n"
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "výstupní modul videa xine pro win32 používající directx"
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače OSS"
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+-msgstr ""
+-"video_out_fb: jsou podporovány pouze pravé barvy (truecolor/directcolor) (%"
+-"d).\n"
+-" Zkontrolujte 'fbset -i' nebo zkuste 'fbset -depth 16'.\n"
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "audio_sun_out: otevírání zvukového zařízení %s selhalo: %s\n"
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-msgid "framebuffer device name"
+-msgstr "jméno zařízení framebufferu"
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
++msgstr "jméno zvukového zařízení Sun"
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"Specifies the file name for the framebuffer device to be used.\n"
++"Specifies the file name for the Sun audio device to be used.\n"
+ "This setting is security critical, because when changed to a different file, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+-"Specifikuje jméno souboru pro framebuffer, které se má použít.\n"
++"Specifikuje jméno souboru zvukového zařízení Sun, které se má použít.\n"
+ "Toto nastavení je kritické s ohledem na bezpečnost, protože při změně na "
+ "jiný soubor může být xine použito k vyplnění tohoto souboru libovolným "
+-"obsahem. A tak by jste si měli být jistí, že hodnota, kterou zadáváte, "
+-"skutečně je náležité zařízení framebufferu."
++"obsahem. A tak by jste si měli být jisti, že hodnota, kterou zadáváte, je "
++"skutečně náležité zvukové zařízení Sun."
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+-msgstr "video_out_fb: Váš videorežim nebyl rozpoznán, bohužel.\n"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++msgstr "výstupní zvukový modul použije zvuková zařízení/ovladače sun"
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
+-msgstr "korekce jasu"
++#: src/audio_out/audio_irixal_out.c:385
++msgid "irixal audio output maximum gap length"
++msgstr "maximální mezera zvukového výstupu irixalu"
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+-"Korekce jasu může být použita na světlejší nebo tmavší obraz. Změní se "
+-"úroveň černé bez úpravy kontrastu, ale omezí se tím tónový rozsah."
++"Můžete uvézt maximální posuv mezi zvukem a videem, který bude xine tolerovat "
++"před tím, než se je pokusí znovu synchronizovat.\n"
++"Jednotka této hodnoty je jeden tik PTS, což je 1/90000 sekundy."
+
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
+-msgstr "video_out_fb: je k dispozici %d video RAM bufferů.\n"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "zvukový výstupní modul xine použije IRIX libaudio"
+
+-#: src/video_out/video_out_fb.c:938
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
++msgstr "fiktivní modul zvukového výstupu xine"
++
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
++msgstr "modul zvukového výstupu xine použije artsd"
++
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
++msgstr "audio_alsa_out: Již otevřeno...PROČ!"
++
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
+-msgstr ""
+-"VAROVÁNÍ: video_out_fb: Buffery s nulami jsou ZAKÁZÁNY, protože je k "
+-"dispozici\n"
+-" pouze %d bufferů, což je méně než doporučovaných %d bufferů.\n"
+-" Mohlo by pomoci snížení rozlišení bufferu.\n"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgstr "audio_alsa_out: snd_pcm_open() na %s selhalo: %s\n"
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+-"VAROVÁNÍ: video_out_fb: Buffery s nulami jsou ZAKÁZÁNY, protože ovladač "
+-"jádra\n"
+-" nepodporuje \"screen panning\" (použito pro přepínání snímků).\n"
++"audio_alsa_out: >>> zkontrolujte, jestli už jiný program nepoužívá PCM <<<\n"
+
+-#: src/video_out/video_out_fb.c:1016
++#: src/audio_out/audio_alsa_out.c:406
+ #, c-format
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+-"VAROVÁNÍ: video_out_fb: současná hloubka displeje je %d. Pro lepší výkon\n"
+-" je doporučována hloubka 16 bitů/bod!\n"
+-"\n"
+-
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
+-msgstr "výstupní modul videa xine použije zařízení framebuffer"
+-
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
+-msgstr "výstupní modul videa xine, které nezobrazuje nic"
++"audio_alsa_out: přerušena konfigurace tohoto PCM: žádná konfigurace není k "
++"dispozici: %s\n"
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
+-msgstr "renderer OpenGL"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
++msgstr "uvědomit o změnách hardwarový mixer"
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+-"Modul OpenGL poskytuje několik renderovacích modulů:\n"
+-"\n"
+-"2D_Textures\n"
+-"Tento modul zavádí obraz jako 2D textury a renderuje texturovaný plát.\n"
+-"Toto je typicky nejrychlejší metoda.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"Tento modul používá k renderování obrázků glDraw().\n"
+-"Urychlované pouze v několika ovladačích.\n"
+-"Neinterpoluje škálování.\n"
+-"\n"
+-"Cylinder\n"
+-"Zobrazuje obrázky na rotačním válci. Hezký efekt :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Zobrazuje obrázky odražené v otáčejícím se anuloidu. Hezký způsob =)"
++"Když se změní hardwarový mixer, vaše aplikace obdrží upozornění, a tak může "
++"za běhu aktualizovat svoji grafickou reprezentaci nastavení mixeru."
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
+-msgstr "minimální rychlost snímků OpenGL"
++#: src/audio_out/audio_alsa_out.c:1327
++#, c-format
++msgid "snd_lib_error_set_handler() failed: %d"
++msgstr "snd_lib_error_set_handler() selhalo: %d"
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
++msgstr "zvuková karta umožňuje provádět mmap"
++
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+-"Minimální rychlost snímků animačních renderovacích podprogramů.\n"
+-"Ignorováno u statických renderovacích podprogramů.\n"
++"Toto povolte, pokud vaše zvuková karta a ovladač ALSA podporují I/O mapované "
++"do paměti.\n"
++"Můžete to zkusit povolit a zkontrolovat, zda vše funguje. Pokud ano, zlepší "
++"toto nastavení výkon."
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
+-msgstr "povolit dvojité bufferování"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "zařízení použité pro mono výstup"
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1345
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"V případě dvojitého bufferování u OpenGL to odstraňuje nejen trhavé "
+-"artefakty,\n"
+-"ale také to velmi redukuje třepotání.\n"
+-"Nemělo by to mít žádný dopad na výkon."
+-
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
+-msgstr "výstupní modul videa xine použije rozšíření MIT X shared memory"
+-
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
+-msgstr "video_out_pgx32: Chyba: nelze zpoužít DGA drawable okno videa\n"
+-
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "video_out_dxr3: Chyba: selhalo ioctl, špatné zařízení (%s)\n"
++"xine použije toto zařízení ALSA pro výstup zvuku mono.\n"
++"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+-msgstr "video_out_pgx32: Chyba: '%s' není zařízení framebufferu pgx32\n"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "zařízení použité pro stereo výstup"
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1354
++msgid ""
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Chyba: nelze použít DGA drawable pro okno videa\n"
+-"\n"
++"xine použije toto zařízení ALSA pro výstup zvuku stereo.\n"
++"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_pgx64.c:300
+-#, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "video_out_pgx64: Chyba: nelze otevřít zařízení framebufferu '%s'\n"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "zařízení použité pro čtyřkanálový výstup"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Chyba: ioctl selhalo (VIS_GETIDENTIFIER), špatné zařízení (%"
+-"s)\n"
++"xine použije toto zařízení ALSA pro výstup surround zvuku 4kanálově (4.0).\n"
++"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "zařízení použité pro 5.1-kanálový výstup"
++
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Chyba: '%s' není zařízení framebufferu xvr100/pgx64/pgx24\n"
++"xine použije toto zařízení ALSA pro výstup surround zvuku 5kanálově s LFE "
++"(5.1).\n"
++"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_pgx64.c:341
++#: src/audio_out/audio_alsa_out.c:1383
+ msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Chyba: překrývání videa ja na této obrazovce již používáno\n"
+-
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
+-msgstr "video_out_pgx64: Chyba: nelze nastavit vlastnosti okna\n"
+-
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
+-msgstr "video_out_pgx64: Varování: málo videopaměti, multi-buffering zakázán\n"
++"xine použije toto zařízení ALSA pro výstup nedekódovaného surround zvuku. "
++"Může to být použito vnějšími surround dekodéry.\n"
++"Informace o zařízeních ALSA naleznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
+-msgstr "video_out_pgx64: Chyba: nedostatek videopaměti\n"
++#: src/audio_out/audio_alsa_out.c:1403
++#, c-format
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "snd_cm_open() selhalo:%d:%s\n"
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
+-msgstr ""
+-"video_out_pgx64: Varování: málo videopaměti, double-buffering zakázán\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
++msgstr ">>> Zkontrolujte, jestli už jiný program nepoužívá PCM <<<\n"
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
+-msgstr "video_out_pgx64: Chyba: selhalo ioctl (FBIOGATTR)\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
++msgstr "audio_alsa_out : podporované režimy jsou "
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
+-msgstr "hodnota klíčové barvy překrývání"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
++msgstr "8bitový"
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
+-msgstr ""
+-"Barevný klíč je použit k tomu, aby se řeklo grafické kartě, kam může "
+-"zobrazit obraz videa. Pokud vidíte video zobrazované skrz jiná okna, "
+-"vyzkoušejte jiné hodnoty."
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
++msgstr "16bitový"
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
+-msgstr "jas videa"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
++msgstr "24bitový"
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
+-msgstr "Jas videoobrazu."
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
++msgstr "32bitový"
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
+-msgstr "sytost videa"
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
++msgstr "mono"
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
+-msgstr "Sytost videoobrazu."
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
++msgstr "stereo"
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
+-msgstr "povolit klíčování barvou"
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
++msgstr "4kanálový"
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
+-msgstr ""
+-"Raději kreslit grafiku OSD nahoře na klíčové barvě overlay než ji míchat do "
+-"každého snímku."
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
++msgstr "(4kanálový není povolen v konfiguraci xine)"
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
+-msgstr "povolit multi-buffering"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
++msgstr "4.1kanálový"
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
+-msgstr "Multi buffering zvýší výkon na úkor využití více grafické paměti."
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
++msgstr "(4.1kanálový není povolen v konfiguraci xine)"
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
+-msgstr "použít hardwarovou akceleraci videa, je-li k dispozici"
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
++msgstr "5kanálový"
+
+-#: src/video_out/video_out_sdl.c:480
+-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 ""
+-"Pokud to systém podporuje, bude použita harwarová akcelerace vašeho "
+-"grafického hardwaru. Nemuselo by to správně fungovat, proto to můžete "
+-"zakázat, pokud by to fungovalo chybně."
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
++msgstr "(5kanálový není povolen v kondifuraci xine)"
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+-msgstr "SDL musí emulovat 16bitové povrchy, to vše zpomalí.\n"
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
++msgstr "5.1kanálový"
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
+-msgstr "video_out_sdl: celoobrazovkový režim NENÍ podporován\n"
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
++msgstr "(5.1kanálový není povolen v konfiguraci xine)"
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "výstupní modul videa xine použije Simple Direct Media Layer"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
++msgstr "a/52 a DTS pass-through\n"
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr ""
+-"výstupní modul videa xine použije knihovnu Libstk Surface Set-top Toolkit"
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++msgstr "(a/52 a DTS pass-through nejsou povoleny v konfiguraci xine)\n"
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
+-msgstr ""
+-"video_out_syncfb: chyba. (formát YUY2 není podporován vaší grafickou "
+-"kartou)\n"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "mixovací zařízení alsa"
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_alsa_out.c:1551
++msgid ""
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_syncfb: chyba. (formát YV12 není podporován vaší grafickou "
+-"kartou)\n"
++"ke změně hlasitosti použije xine toto zařízení mixeru ALSA.\n"
++"Informace o zařízeních ALSA nalzeznete v dokumentaci k ALSA."
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
+-msgstr ""
+-"video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:0 (3 roviny))\n"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače alsa"
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
+-msgstr ""
+-"video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:0 (2 roviny))\n"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
++msgstr "Chyba"
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
+-msgstr "video_out_syncfb: info. (modul SyncFB podporuje YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
++msgstr "úspěch"
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
+-msgstr "video_out_syncfb: info. (modul SyncFB podporuje YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
++msgstr "přístup odepřen"
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
+-msgstr "video_out_syncfb: info. (modul SyncFB podporuje RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
++msgstr "zdroj je již používán"
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
+-msgstr ""
+-"video_out_syncfb: ruší se. (modul SyncFB nepodporuje YV12, YUY2 ani RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
++msgstr "objekt již byl inicializován"
+
+-#: src/video_out/video_out_syncfb.c:983
+-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 ""
+-"video_out_syncfb: info. (nebude k dispozici řízení jasu a kontrastu, protože "
+-"se zdá, že je váš modul jádra SyncFB zastaralý. Informace o tom, jak ho "
+-"aktualizovat, získáte z README.syncfb.)\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
++msgstr "uvedený wave formát není podporován"
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
+-msgstr "Výchozí počet opakování snímku"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
++msgstr "paměťový buffer byl ztracen a musí být obnoven"
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
+-msgstr "Toto určuje, kolikrát po sobě se bude jeden videosnímek zobrazovat."
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
++msgstr "požadované řízení bufferu není k dispozici"
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
+-msgstr ""
+-"výstupní modul videa xine použije modul SyncFB pro karty Matrox G200/G400"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
++msgstr "neurčená chyba uvnitř sybsystéme DirectSound"
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
+-msgstr "Jméno zařízení SyncFB"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
++msgstr "hardwarové zařízení DirectSound není k dispozici"
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
+-msgstr ""
+-"Specifikuje jméno souboru pro SyncFB (TeleTux), které se má použít.\n"
+-"Toto nastavení je kritické s ohledem na bezpečnost, protože při změně na "
+-"jiný soubor může být xine použito k vyplnění tohoto souboru libovolným "
+-"obsahem. A tak by jste si měli být jisti, že hodnota, kterou zadáváte, je "
+-"skutečně náležité zařízení framebufferu."
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
++msgstr "pro stávající stav objektu není funkce platná"
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
+-msgstr "intenzita červené"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
++msgstr "byl předán neplatný parametr"
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
+-msgstr "Intenzita červené barevné složky."
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
++msgstr "objekt nepodporuje agregaci"
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
+-msgstr "intenzita zelené"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
++msgstr "není k dispozici žádný zvukový ovladač k použití"
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
+-msgstr "Intenzita zelené barevné složky."
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
++msgstr "požadované COM rozhraní není k dispozici"
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
+-msgstr "intenzita modré"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
++msgstr "jiná aplikace má vyšší úroveň priority"
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
+-msgstr "Intenzita modré barevné složky."
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
++msgstr "nedostatek paměti"
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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 ""
+-"Dvojité bufferování synchronizuje aktualizaci obrazu videa s překreslováním "
+-"úplné obrazovky (\"vertikální zpětný běh paprsku\"). Toto eliminuje blikání "
+-"a trhané artefakty, ale bude použito více grafické paměti."
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
++msgstr "pro tuto funkci nízká úroveň priority"
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
+-msgstr "video_out_vidix: adaptér podporuje formát yuy2\n"
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
++msgstr "DirectSound nebyl inicializován"
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
+-msgstr "video_out_vidix: adaptér podporuje formát yv12\n"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
++msgstr "funkce není podporována"
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
+-msgstr "video_out_vidix: Máte špatnou verzi knihovny VIDIX\n"
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
++msgstr "neznámá chyba"
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
+-msgstr "video_out_vidix: Nelze nalézt fungující ovladač VIDIX\n"
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
++msgstr "Nepodařilo se vytvořit objekt direct sound."
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
+-msgstr "video_out_vidix: použije se ovladač: %s od %s\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
++msgstr "Nelze nastavit cooperativní úroveň direct sound."
+
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
+-msgstr "klíčová barva překrývání videa červené složky"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
++msgstr "Nepodařilo se vytvořit sekundární buffer direct sound"
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
+-msgstr ""
+-"Klíčová barva je používána k informování grafické karty, kam vykreslit obraz "
+-"videa. Jestliže zjistíte, že se okna stávají transparentní, vyzkoušejte jiné "
+-"hodnoty."
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
++msgstr "Nepodařilo se vytvořit poziční události bufferu."
+
+-#: src/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
+-msgstr "klíčová barva překrývání videa zelené složky"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
++msgstr "Nepodařilo se získat rozhraní na upozorňování (notification interface)"
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
+-msgstr "klíčová barva překrývání videa modré složky"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
++msgstr "Nepodařilo se nastavit pozice upozorňování"
+
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "výstupní modul videa xine použije libvidix pro X11"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
++msgstr "Nelze přehrát zvukový buffer"
+
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
+-msgstr "výstupní modul videa xine použije libvidix pro linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
++msgstr "Nelze zastavit zvukový buffer"
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: chyba sdílené paměti během alokování obrázku\n"
+-"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
++msgstr "Nelze získat pozici bufferu"
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: %s: alokování obrázku\n"
+-"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
++msgstr "Nelze nastavit pozici bufferu"
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: chyba sdílené paměti (chyba adresy) během alokování obrázku\n"
+-"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
++msgstr "Nelze nastavit hlasitost zvuku"
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: chyba x11 během vytváření XImage ve sdílené paměti\n"
+-"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
++msgstr ": buffer ztracen, zkusí se obnovit\n"
+
+-#: src/video_out/video_out_xshm.c:1138
+-#, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
+-"\n"
+-"\n"
+-"VAROVÁNÍ: hloubka současného displeje je %d. Pro lepší výkon\n"
+-"je doporučována hloubka 16 bitů/bod!\n"
+-"\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
++msgstr "Nešlo zamknou buffer direct sound"
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
+-"video_out_xshm: Rozšíření MIT shared memory není na displeji přítomno.\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
++msgstr "Nešlo odemknout buffer direct sound"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr "video_out_xshm: váš videorežim nebyl rozpoznán, bohužel :-(\n"
++#: src/audio_out/audio_directx2_out.c:540
++msgid "Unable to create primary direct sound buffer."
++msgstr "Nepodařilo se vytvořit primární buffer direct sound."
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: XvShmCreateImage selhalo\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
++msgstr ": kurzor přehrávání přeběhl, resetování bufferů\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: funkce XvShmCreateImage vrátila nulovou velikost\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:651
++#, c-format
++msgid ": delayed by %ld msec\n"
++msgstr ": zpožděno o %ld ms\n"
+
+-#: src/video_out/video_out_xv.c:305
++#: src/audio_out/audio_directx2_out.c:755
+ #, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: chyba sdílené paměti v shmget: %s\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++msgid ": can't create pthread condition: %s\n"
++msgstr ": nelze vytvořit pthread condition: %s\n"
+
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: chyba x11 během vytváření XImage\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/audio_out/audio_directx2_out.c:759
++#, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr ": nelze vytvořit pthread mutex: %s\n"
+
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
+-msgstr "video_out_xv: Rozšíření Xv není přítomno.\n"
++#: src/audio_out/audio_directx2_out.c:766
++#, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr ": nelze vytvořit vlákno bufferu: %s\n"
+
+-#: src/video_out/video_out_xv.c:1304
+-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 ""
+-"video_out_xv: Rozšíření Xv je přítomno, ale nepodařilo se nalézt použitelný "
+-"port yuv12.\n"
+-" Vypadá to, jako by váš grafický hardwarový ovladač "
+-"nepodporoval Xv?!\n"
++#: src/audio_out/audio_directx2_out.c:873
++#, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr ": nelze zlikvidovat vlákno bufferu: %s\n"
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-"video_out_xv: pro hardwarovou konverzi barevného prostoru a škálování se "
+-"použije Xv port %ld z adaptéru %s.\n"
++msgid ": can't destroy pthread condition: %s\n"
++msgstr ": nelze zlikvidovat pthread condition: %s\n"
+
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
+-msgstr "klíčová barva pro automatické vykreslování"
++#: src/audio_out/audio_directx2_out.c:883
++#, c-format
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr ": nelze zlikvidovat pthread mutex: %s\n"
+
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
+-msgstr "Přimět Xv automaticky kreslit svou klíčovou barvu."
++#: src/audio_out/audio_directx2_out.c:943
++#, c-format
++msgid ": unknown control command %d\n"
++msgstr ": neznámý řídicí příkaz: %d\n"
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
+-msgstr "bilineární režim škálování"
++#: src/audio_out/audio_directx2_out.c:996
++msgid "second xine audio output plugin using directx"
++msgstr "druhý modul zvukového výstupu xine používající DirectX"
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
+-msgstr ""
+-"Vybere bilineární režim škálování pro karty Permedia. Jednotlivé hodnoty "
+-"jsou:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - zakázat bilineární filtrování\n"
+-"1 - povolit bilineární filtrování\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - zakázat bilineární filtrování\n"
+-"1 - horizontální lineární filtrování\n"
+-"2 - povolit plné bilineární filtrování"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgstr "audio_esd_out: připojuje se k serveru ESD %s: %s\n"
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje formát yv12.\n"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
++msgstr "audio_esd_out: připojuje se k serveru ESD...\n"
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje formát yuy2.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgstr "audio_esd_out: nelze se připojit k ESD serveru %s: %s\n"
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
+-msgstr "obcházet chybu zarovnávání rozteče"
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "zpoždění zvukového výstupu esd (upraví synchronizaci zvuku a videa)"
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
+-msgstr ""
+-"Některé chybové ovladače videa potřebují ke správně funkci tento workaround."
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
++msgstr "modul zvukového výstupu xine použije esound"
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
+-msgstr "metoda korekce prokládání (zavrženo)"
++#: src/audio_out/audio_coreaudio_out.c:452
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "modul zvukového výstupu xine pro Coreaudio/Mac OS X"
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
+-"Tato položka nastavení konfigurace je zavržena. Měli byste používat nové "
+-"nastavení dodatečné korekce prokládání.\n"
+-"\n"
+-"Ze starých časů analogové televize, kde by měly být sudé a liché řádky "
+-"zobrazovány v různých časech, pochází myšlenka zvýšit hladkost pohybu "
+-"zaznamenáváním řádek v různých časech. Tomu se říká \"prokládání\". Ale "
+-"naneštěstí, dnešní zobrazovače zobrazují všechny sudé a liché řádky najednou "
+-"jako jeden kompletní snímek (tzv. \"postupný zobrazovač\"), což má za "
+-"následek ošklivé chyby známé jako hřebenové artefakty. Softwarová korekce "
+-"prokládání je způsob, jak redukovat tyto artefakty. Jednotlivé hodnoty "
+-"jsou:\n"
+-"\n"
+-"none\n"
+-"Zakáže softwarovou korekci prokládání.\n"
+-"\n"
+-"bob\n"
+-"Interpoluje mezi řádky pohyblivých částí obrazu.\n"
+-"\n"
+-"weave\n"
+-"Podobné jako bob, ale se snahou zachovat plné rozlišení, lepší u velkých "
+-"detailů v ne moc pohyblivých scénách.\n"
+-"\n"
+-"greedy\n"
+-"Velmi dobrý přizpůsobivý korektor prokládání, ale potřebuje velký výkon "
+-"CPU.\n"
+-"\n"
+-"onefield\n"
+-"Interpoluje vždy a redukuje svislé rozlišení.\n"
+-"\n"
+-"onefieldxv\n"
+-"Stejné jako onefield, ale interpoluje hardwarově.\n"
+-"\n"
+-"linearblend\n"
+-"K odstranění hřebenových artefaktů použije lehké rozmazání. Dobré výsledky "
+-"se střední zátěží CPU."
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
++msgstr "modul zvukového výstupu xine pro win32 používající directx"
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "výstupní modul videa xine použije rozšíření MIT X video"
++#: src/audio_out/audio_file_out.c:362
++msgid "xine file audio output plugin"
++msgstr "modul zvukového výstupu xine do souboru"
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "výstupní modul videa xine použije X video rozšíření XvMC"
++#: src/audio_out/audio_polyp_out.c:489
++msgid "device used for polypaudio"
++msgstr "zařízení použité pro polyaudio"
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
+-msgstr "video_out_xvmc: rozšíření XvMC není přítomno.\n"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
++msgstr "pro nastavení polyaudio sink zařízení použijte 'server[:sink]'"
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
+-"video_out_xvmc: rozšíření Xv je přítomno, ale nebyl nalezen použitelný port "
+-"yuv12\n"
++#: src/audio_out/audio_polyp_out.c:535
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "modul zvukového výstupu xine používající zvukový server polyaudio"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:347
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-"video_out_xvmc: pro hardwarovou konverzi barevného prostoru a škálování\n"
+-" se použije Xv port %ld z adaptéru %s\n"
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr " idct a akcelerace kompenzace pohybu\n"
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr " pouze akcelerace kompenzace pohybu\n"
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
+-msgstr " žádná podpora XvMC\n"
++msgid "audio_decoder: no plugin available to handle '%s'\n"
++msgstr "audio_decoder: není k dispozici žádný modul ke zpracování '%s'\n"
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+-msgstr " S Overlay = %d; UnsignedIntra = %d.\n"
+-
+-#: src/video_out/video_out_xxmc.c:601
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: XvShmCreateImage selhalo\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
++msgstr "audio_decoder: chyba, neznámý typ bufferu: %08x\n"
+
+-#: src/video_out/video_out_xxmc.c:611
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: funkce XvShmCreateImage vrátila nulovou velikost\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
++msgstr "počet bufferů zvuku"
+
+-#: src/video_out/video_out_xxmc.c:619
+-#, fuzzy, c-format
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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 ""
+-"video_out_xv: chyba sdílené paměti v shmget: %s\n"
+-"video_out_xv: => rozšíření MIT Shared Memory se nepoužije.\n"
++"Počet bufferů zvuku (každý o velikosti 8k), které xine použije ve své "
++"vnitřní frontě. Vyšší hodnoty znamenají hladší přehrávání u nespolehlivých "
++"vstupů, ale také zvýšené zpoždění a spotřebu paměti."
+
+-#: src/video_out/video_out_xxmc.c:651
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: chyba x11 během vytváření XImage ve sdílené paměti\n"
+-"video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
++#: src/xine-engine/video_decoder.c:373
++#, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
++msgstr "video_decoder: není k dispozici žádný modul ke zpracování '%s'\n"
+
+-#: src/video_out/video_out_xxmc.c:2158
+-#, fuzzy
+-msgid "video_out_xxmc: Xv extension not present.\n"
+-msgstr "video_out_xvmc: rozšíření XvMC není přítomno.\n"
++#: src/xine-engine/video_decoder.c:447
++#, c-format
++msgid "video_decoder: error, unknown buffer type: %08x\n"
++msgstr "video_decoder: chyba, neznámý typ bufferu: %08x\n"
+
+-#: src/video_out/video_out_xxmc.c:2195
+-#, fuzzy
+-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 ""
+-"video_out_xv: Rozšíření Xv je přítomno, ale nepodařilo se nalézt použitelný "
+-"port yuv12.\n"
+-" Vypadá to, jako by váš grafický hardwarový ovladač "
+-"nepodporoval Xv?!\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
++msgstr "počet bufferů videa"
+
+-#: src/video_out/video_out_xxmc.c:2204
+-#, fuzzy, c-format
++#: src/xine-engine/video_decoder.c:484
+ msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-"video_out_xv: pro hardwarovou konverzi barevného prostoru a škálování se "
+-"použije Xv port %ld z adaptéru %s.\n"
+-
+-#: src/video_out/video_out_xxmc.c:2380
+-#, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje formát yv12.\n"
+-
+-#: src/video_out/video_out_xxmc.c:2385
+-#, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje formát yuy2.\n"
+-
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++"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 ""
++"Počet bufferů videa (každý o velikosti 8k), které xine použije ve své "
++"vnitřní frontě. Vyšší hodnoty znamenají hladší přehrávání u nespolehlivých "
++"vstupů, ale také zvýšené zpoždění a spotřebu paměti."
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
++msgstr "Stávající konfigurační soubor byl upraven novější verzí xine."
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
++"configfile: VAROVÁNÍ: zálohování konfiguračního souboru do %s selhalo\n"
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
++msgstr "configfile: VAROVÁNÍ: vaše konfigurace nebude uložena\n"
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
+-msgstr ""
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgstr "configfile: VAROVÁNÍ: zápis konfigurace do %s selhal\n"
+
+-#: src/video_out/video_out_xxmc.c:2429
+-msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
++"configfile: VAROVÁNÍ: odstraní se pravděpodobně poškozený konfigurační "
++"soubor %s\n"
+
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: rozšíření XShape není k dispozici. Overlay bez změn měřítka "
+-"zakázán.\n"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
++msgstr "configfile: VAROVÁNÍ: měli byste zkontrolovat záložní soubor %s\n"
+
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr "x11osd: chyba vytvoření okna. Overlay bez změn měřítka zakázán.\n"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgstr "configfile: údaj '%s' nesmí být modifikován z MRL\n"
+
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
+-msgstr "x11osd: chyba vytváření mapy bodů. Overlay bez změn měřítka zakázán.\n"
++#: src/xine-engine/info_helper.c:204
++msgid "info_helper: can't find out current locale character set\n"
++msgstr "info_helper: nelze zjistit aktuální kódovou stránku\n"
+
+-#: src/video_out/x11osd.c:349
++#: src/xine-engine/info_helper.c:212
+ #, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
+-msgstr "x11osd: overlay bez změn měřítka vytvořen (režim %s).\n"
++msgid ""
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgstr "info_helper: nepodporovaná konverze %s -> UTF-8, nebude prováděna\n"
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
+-msgstr "audio_decoder: není k dispozici žádný modul ke zpracování '%s'\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
++msgstr "selhalo získání stavu soketu"
+
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
+-msgstr "audio_decoder: chyba, neznámý typ bufferu: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
++msgstr "io_helper: Přístup odepřen\n"
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
+-msgstr "počet bufferů zvuku"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
++msgstr "io_helper: Soubor nenalezen\n"
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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 ""
+-"Počet bufferů zvuku (každý o velikosti 8k), které xine použije ve své "
+-"vnitřní frontě. Vyšší hodnoty znamenají hladší přehrávání u nespolehlivých "
+-"vstupů, ale také zvýšené zpoždění a spotřebu paměti."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
++msgstr "io_helper: Spojení odmítnuto\n"
+
+ #: src/xine-engine/audio_out.c:1045
+ msgid ""
+@@ -4293,62 +4151,341 @@
+ msgstr ""
+ "audio_out: Litujeme, toto by se nemělo přihodit. Prosím restartujte xine.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
+-msgstr "Stávající konfigurační soubor byl upraven novější verzí xine."
++# This message should match with FAQ_cs.
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d snímků předaných, %d snímků přeskočených, %d snímků zahozených\n"
+
+-#: src/xine-engine/configfile.c:1006
++# This message should match with FAQ_cs.
++#: src/xine-engine/video_out.c:739
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
+-"configfile: VAROVÁNÍ: zálohování konfiguračního souboru do %s selhalo\n"
++"video_out: zahození obrazu s pts %<PRId64>, protože je příliš starý "
++"(rozdíl : %<PRId64>).\n"
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
+-msgstr "configfile: VAROVÁNÍ: vaše konfigurace nebude uložena\n"
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr "procento přeskočených snímků, které se bude tolerovat"
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/video_out.c:1740
++msgid ""
++"When more than this percentage of frames are not shown, because they were "
++"not decoded in time, xine sends a notification."
++msgstr ""
++"Pokud se nezobrazí více než toto procento snímků, protože nebyly včas "
++"dekódovány, pošle xine hlášení."
++
++#: src/xine-engine/video_out.c:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr "procentní tolerance zahozených snímků"
++
++#: src/xine-engine/video_out.c:1746
++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 ""
++"Pokud se nezobrazí více než toto procento snímků, protože nebyly včas "
++"naplánovány k zobrazení, pošle xine hlášení."
++
++#: src/xine-engine/video_out.c:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++"video_out: Litujeme, toto by se nemělo přihodit. Prosím restartujte xine.\n"
++
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
++msgstr ": funkce open() by nikdy neměla být volána\n"
++
++#: src/xine-engine/input_cache.c:323
++msgid ": input plugin not defined!\n"
++msgstr ": vstupní modul není definován!\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr "xine: chyba během zpracování MRL\n"
++
++#: src/xine-engine/xine.c:681
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
+-msgstr "configfile: VAROVÁNÍ: zápis konfigurace do %s selhal\n"
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: nelze nalézt vstupní modul: %s\n"
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:689
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: vstupní modul nemůže otevřít MRL [%s]\n"
++
++#: src/xine-engine/xine.c:707
++#, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: nelze nalézt vstupní modul pro MRL [%s]\n"
++
++#: src/xine-engine/xine.c:733
++#, c-format
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine: selhalo spuštění demultiplexoru %s\n"
++
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
++msgstr "xine: připojen ripovací vstupní modul\n"
++
++#: src/xine-engine/xine.c:774
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "xine: chyba otevírání instance ripovacího vstupního modulu\n"
++
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine: selhalo spuštění posledního vyzkoušeného demultiplexoru %s\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr "ignoruje se video\n"
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr "ignoruje se zvuk\n"
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr "ignorují se titulky\n"
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr "vstupní modul cache zakázán\n"
++
++#: src/xine-engine/xine.c:944
++#, c-format
++msgid "subtitle mrl opened '%s'\n"
++msgstr "otevřeno MRL titulků '%s'\n"
++
++#: src/xine-engine/xine.c:948
++msgid "xine: error opening subtitle mrl\n"
++msgstr "xine: chyba otevírání MRL titulků\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr "xine: chyba během zpracování MRL\n"
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
++#, c-format
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
++msgstr "xine: změna volby '%s' z MRL naní povolena\n"
++
++#: src/xine-engine/xine.c:1007
++#, c-format
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: nelze nalézt demultiplexor pro >%s<\n"
++
++#: src/xine-engine/xine.c:1023
++#, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: nalezen demultiplexní modul: %s\n"
++
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr "xine: selhalo spuštění demultiplexoru\n"
++
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: žádný dostupný demultiplexor\n"
++
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: selhalo spuštění demultiplexoru\n"
++
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
+-"configfile: VAROVÁNÍ: odstraní se pravděpodobně poškozený konfigurační "
+-"soubor %s\n"
++"xine: Uvedený adresář pro ukládání \"%s\" by mohl znamenat bezpečnostní "
++"riziko.\n"
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr "Uvedený adresář pro ukládání by mohl znamenat bezpečnostní riziko."
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr "xine: locale není podporováno knihovnou C\n"
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr "strategie zjištování formátu dat"
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
++"xine poskytuje různé metody k detekci formátu multimédia, které se má "
++"přehrát. Jednotlivé hodnoty jsou:\n"
++"default\n"
++"Nejprve zkusit detekovat podle obsahu, pak podle přípony jména souboru.\n"
++"\n"
++"reverse\n"
++"Nejprve zkusit detekovat podle přípony jména souboru, pak podle obsahu.\n"
++"\n"
++"content\n"
++"Detekovat pouze podle obsahu.\n"
++"\n"
++"extension\n"
++"Detekovat pouze podle přípony jména souboru.\n"
++
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
++msgstr "adresář pro ukládání dat"
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++"Při použití funkce ukládání toku dat budou soubory zapisovány pouze do "
++"tohoto adresáře.\n"
++"Toto nastavení je kritické z hlediska bezpečnosti, protože při změně na jiný "
++"adresář může xine vyplňovat soubory v tomto adresáři libovolným obsahem. "
++"Proto byste si měli být jisti, že je v uvedeném adresáři bezproblémový "
++"jakýkoliv obsah v jakémkoliv souboru."
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr "povolit implicitní změny v konfiguraci (např. pomocí MRL)"
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++"Pokud je povoleno, dovolíte xine měnit vaši konfiguraci bez výslovných akcí "
++"z vaší strany. Budou vykonány např. změny konfigurace žádané z MRL nebo "
++"vložené do playlistu.\n"
++"Toto nastavení je kritické z hlediska bezpečnosti, protože xine může "
++"přijímat MRL nebo playlist z nedůvěryhodných vzdálených zdrojů. Pokud jim "
++"dovolíte libovolně měnit vaši konfiguraci, můžete skončit s úplně rozhozeným "
++"xine."
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "zprávy"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "modul"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr "trasování"
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
+-msgstr "configfile: VAROVÁNÍ: měli byste zkontrolovat záložní soubor %s\n"
++msgid "font '%s-%d' already loaded, weird.\n"
++msgstr "font '%s-%d' je již nahrán, divné.\n"
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/osd.c:678
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+-msgstr "configfile: údaj '%s' nesmí být modifikován z MRL\n"
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr "načítání fontu '%s' selhalo (%d < %d)\n"
+
+-#: src/xine-engine/info_helper.c:204
+-#, fuzzy
+-msgid "info_helper: can't find out current locale character set\n"
+-msgstr "osd: nelze zjistit aktuální kódovou stránku\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr "nesprávná verze u fontu '%s'. očekávána %d, nalezena %d.\n"
+
+-#: src/xine-engine/info_helper.c:212
+-#, fuzzy, c-format
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr "osd: nelze inicializovat knihovnu ft2\n"
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr "osd: chyba načítání fontu %s pomocí ft2\n"
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr "osd: chyba při nastavování velikosti fontu (font není škálovatelný?)\n"
++
++#: src/xine-engine/osd.c:901
++#, c-format
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++"osd: neznámá sekvence začínající bytem 0x%02X v kódování \"%s\", přeskočí "
++"se\n"
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
++msgstr "osd: nelze zjistit aktuální kódovou stránku\n"
++
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+ msgstr "osd: nepodporovaná konverze %s -> %s, nebude prováděna\n"
+
+-#: src/xine-engine/input_cache.c:164
+-#, fuzzy
+-msgid ": open() function should never be called\n"
+-msgstr "input_rip: funkce open() by nikdy neměla být volána\n"
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr "osd: font není definován\n"
+
+-#: src/xine-engine/input_cache.c:323
+-#, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "input_rip: vstupní modul není definován!\n"
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr "osd: chyba načítaní glyfu\n"
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr "osd: chyba v renderování glyfu\n"
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr "osd: chyba načítání glyfu %i\n"
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr "osd: chyba při renderování\n"
++
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr "paleta (popředí-okraj-pozadí) použitá na titulky a OSD"
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
++"Paleta on-screen-display a některých formátů titulků, které samy o sobě "
++"nespecifikují žádnou barvu. Paleta je uvedena ve formě: popředí-okraj-pozadí."
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, c-format
+@@ -4362,8 +4499,8 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
+-msgstr "input_rip: chyba zápisu %<PRIiMAX> bytů do souboru: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
++msgstr "input_rip: chyba zápisu %<PRIdMAX> bytů do souboru: %s\n"
+
+ #: src/xine-engine/input_rip.c:181
+ msgid "input_rip: open() function should never be called\n"
+@@ -4380,8 +4517,8 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
+-msgstr "input_rip: zahozeno %<PRIiMAX> bytů\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
++msgstr "input_rip: zahozeno %<PRIdMAX> bytů\n"
+
+ #: src/xine-engine/input_rip.c:546
+ msgid "input_rip: input plugin not defined!\n"
+@@ -4424,22 +4561,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_rip: chyba otevírání souboru %s: %s\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr "selhalo získání stavu soketu"
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr "io_helper: Přístup odepřen\n"
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr "io_helper: Soubor nenalezen\n"
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr "io_helper: Spojení odmítnuto\n"
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -4548,12 +4669,12 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: použije se demultiplexor '%s'\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "load_plugins: nelze načíst zvukový modul <%s>\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+@@ -4561,155 +4682,6 @@
+ "load_plugins: automatické testování zvukového výstupu nenašlo žádný "
+ "použitelný zvukový ovladač.\n"
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr "font '%s-%d' je již nahrán, divné.\n"
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr "načítání fontu '%s' selhalo (%d < %d)\n"
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr "nesprávná verze u fontu '%s'. očekávána %d, nalezena %d.\n"
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr "osd: nelze inicializovat knihovnu ft2\n"
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr "osd: chyba načítání fontu %s pomocí ft2\n"
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr "osd: chyba při nastavování velikosti fontu (font není škálovatelný?)\n"
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-"osd: neznámá sekvence začínající bytem 0x%02X v kódování \"%s\", přeskočí "
+-"se\n"
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr "osd: nelze zjistit aktuální kódovou stránku\n"
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr "osd: nepodporovaná konverze %s -> %s, nebude prováděna\n"
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr "osd: font není definován\n"
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr "osd: chyba načítaní glyfu\n"
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr "osd: chyba v renderování glyfu\n"
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr "osd: chyba načítání glyfu %i\n"
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr "osd: chyba při renderování\n"
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr "paleta (popředí-okraj-pozadí) použitá na titulky a OSD"
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-"Paleta on-screen-display a některých formátů titulků, které samy o sobě "
+-"nespecifikují žádnou barvu. Paleta je uvedena ve formě: popředí-okraj-pozadí."
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr "video_decoder: není k dispozici žádný modul ke zpracování '%s'\n"
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr "video_decoder: chyba, neznámý typ bufferu: %08x\n"
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr "počet bufferů videa"
+-
+-#: src/xine-engine/video_decoder.c:484
+-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 ""
+-"Počet bufferů videa (každý o velikosti 8k), které xine použije ve své "
+-"vnitřní frontě. Vyšší hodnoty znamenají hladší přehrávání u nespolehlivých "
+-"vstupů, ale také zvýšené zpoždění a spotřebu paměti."
+-
+-# This message should match with FAQ_cs.
+-#: src/xine-engine/video_out.c:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d snímků předaných, %d snímků přeskočených, %d snímků zahozených\n"
+-
+-# This message should match with FAQ_cs.
+-#: src/xine-engine/video_out.c:739
+-#, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out: zahození obrazu s pts %<PRId64>, protože je příliš starý "
+-"(rozdíl : %<PRId64>).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr "procento přeskočených snímků, které se bude tolerovat"
+-
+-#: src/xine-engine/video_out.c:1740
+-msgid ""
+-"When more than this percentage of frames are not shown, because they were "
+-"not decoded in time, xine sends a notification."
+-msgstr ""
+-"Pokud se nezobrazí více než toto procento snímků, protože nebyly včas "
+-"dekódovány, pošle xine hlášení."
+-
+-#: src/xine-engine/video_out.c:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr "procentní tolerance zahozených snímků"
+-
+-#: src/xine-engine/video_out.c:1746
+-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 ""
+-"Pokud se nezobrazí více než toto procento snímků, protože nebyly včas "
+-"naplánovány k zobrazení, pošle xine hlášení."
+-
+-#: src/xine-engine/video_out.c:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-"video_out: Litujeme, toto by se nemělo přihodit. Prosím restartujte xine.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr "horizontální pozice obrazu ve výstupním okně videa"
+@@ -4764,226 +4736,470 @@
+ "videovýstupy jako je XShm, kde není škálování obrazu hardwarově urychlováno, "
+ "může toto dramaticky snížit využití CPU."
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
+-msgstr "xine: chyba během zpracování MRL\n"
+-
+-#: src/xine-engine/xine.c:667
+-#, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: nelze nalézt vstupní modul: %s\n"
+-
+-#: src/xine-engine/xine.c:675
+-#, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: vstupní modul nemůže otevřít MRL [%s]\n"
+-
+-#: src/xine-engine/xine.c:693
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: nelze nalézt vstupní modul pro MRL [%s]\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++msgstr "libareal: (audio) Nelze zjistit symboly - nekompatibilní dll: %s\n"
+
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine: selhalo spuštění demultiplexoru %s\n"
+-
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
+-msgstr "xine: připojen ripovací vstupní modul\n"
+-
+-#: src/xine-engine/xine.c:760
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "xine: chyba otevírání instance ripovacího vstupního modulu\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
++msgstr "libareal: selhala inicializace dekodéru, chybový kód: 0x%x\n"
+
+-#: src/xine-engine/xine.c:791
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine: selhalo spuštění posledního vyzkoušeného demultiplexoru %s\n"
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
+-msgstr "ignoruje se video\n"
+-
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
+-msgstr "ignoruje se zvuk\n"
+-
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
+-msgstr "ignorují se titulky\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgstr "libareal: nastavení esence dekodéru selhalo, chybový kód: 0x%x\n"
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
+-msgstr "vstupní modul cache zakázán\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgstr "libareal: jejda, real může mít více než 2 kanály?\n"
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
+-msgstr "otevřeno MRL titulků '%s'\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
++msgstr "cesta ke kodekům Real Playeru"
+
+-#: src/xine-engine/xine.c:934
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "xine: chyba otevírání MRL titulků\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
++msgstr ""
++"Pokud máte nainstalovaný RealPLayer, uveďte zde cestu k adresáři s jeho "
++"kodeky. Adresář s kodeky můžete jednoduše nalézt hledáním souboru \"drv3."
++"so.6.0\", který je v něm. Pokud bude moci xine nalézt kodeky RealPlayeru, "
++"použije je pro vás k dekódování RealPlayer obsahu. Více informací, jak "
++"nainstalovat kodeky, získáte ve xine FAQ."
+
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
+-msgstr "xine: chyba během zpracování MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++msgstr "libreal: Chyba hledání symbolů! (nekompatibilita verzí?)\n"
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
+-msgstr "xine: změna volby '%s' z MRL naní povolena\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
++msgstr ""
++"Mosaico dělá jednoduché efekty obraz v obrazu.\n"
++"\n"
++"Parametry\n"
++" pip_num: počet obrazových slotů, na které použít následující nastavení\n"
++" x: x-ová souřadnice levého horního rohu obrazu\n"
++" y: y-ová souřadnice levého horního rohu obrazu\n"
++" w: šířka obrazu\n"
++" h: výška obrazu\n"
+
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: nelze nalézt demultiplexor pro >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
++msgstr ""
++"Přepínač může být použit pro rychlé přepínání mezi vícero vstupy.\n"
++"\n"
++"Parametry\n"
++" select: počet vstupů, které projdou na výstup\n"
+
+-#: src/xine-engine/xine.c:1009
+-#, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: nalezen demultiplexní modul: %s\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
++msgstr ""
++"libpostprocess modul FFmpeg.\n"
++"\n"
++"Parametry\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine: selhalo spuštění demultiplexoru\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: žádný dostupný demultiplexor\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
++"Softwarový ekvalizér s interaktivním ovládáním tak jako u hardwarového "
++"ekvalizéru pro karty, které nepodporují řízení jasu a kontrastu hardwarově.\n"
++"Parametry\n"
++" světlost\n"
++" kontrast\n"
++"\n"
++"Poznámka: K nastavení těchto parametrů je možné použít okno ovládání "
++"frontendů.\n"
++"\n"
++"* eq mplayeru (C) Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: selhalo spuštění demultiplexoru\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
++msgstr ""
++"Modul expand je navržen tak, aby přijímal snímky s libovolnými poměry stran "
++"a konvertval je na poměr 4:3 přidáním černých pruhů nahoru a dolů. To dovolí "
++"posunout OSD a titulky tak, že nezasahují do obrazu.\n"
++"\n"
++"Parametry (FIXME: lepší nápověda)\n"
++" Enable_automatic_shift: Povolí automatické posunutí titulků\n"
++" Overlay_y_offset: Ruční posun titulků svisle\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+-"xine: Uvedený adresář pro ukládání \"%s\" by mohl znamenat bezpečnostní "
+-"riziko.\n"
++"Tento filter má za cíl snížit šum obrazu produkováním vyhlazených snímků a "
++"děláním nehybného obrazu skutečně nehybným (to by mělo zvýšit "
++"komprimovatelnost). Může být zadáno od 0 do 3 parametrů. Jestliže vynecháte "
++"parametr, bude odhadnuta přiměřená hodnota.\n"
++"\n"
++"Parametry\n"
++" Luma: prostorová intenzita světlosti (implicitní = 4)\n"
++" Chroma: prostorová intenzita sytosti (implicitní = 3)\n"
++" Time: dočasná intenzita (implicitní = 6)\n"
++"\n"
++"* denoise3d mplayeru (C) 2003 Daniel Moreno\n"
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
+-msgstr "Uvedený adresář pro ukládání by mohl znamenat bezpečnostní riziko."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++msgstr ""
++"Box blur provádí jednoduché rozmazání obrazu.\n"
++"\n"
++"Parametry:\n"
++" Radius: rozměr filtru\n"
++" Power: jak často by měl být filtr použit\n"
++"\n"
++"* boxblur mplayeru (C) 2002 Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
+-msgstr "xine: locale není podporováno knihovnou C\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++msgstr ""
++"Alternativní softwarový ekvalizér, který pro jednoduchou úpravu světlosti, "
++"kontrastu a sytosti používá vyhledávací tabulky. Je to velmi pomalé, ale "
++"umožňuje to navíc gama korekci.\n"
++"Poznamenejme ještě, že se používá stejný kód optimalizovaný pro MMX jako u "
++"'eq', pokud jsou všechny hodnoty gama 1.0.\n"
++"\n"
++"Parametry\n"
++" gama\n"
++" jas\n"
++" kontrast\n"
++" sytost\n"
++" rgama (gama pro červenou složku)\n"
++" ggama (gama pro zelenou složku)\n"
++" bgama (gama pro modrou složku)\n"
++"\n"
++"Rozsahy hodnot jsou 0.1 - 10 pro gamy, -2 - 2 pro kontrast (negativní "
++"hodnoty mají za následek negativní obraz), -1 - 1 pro jas a 0 - 3 pro "
++"sytost.\n"
++"\n"
++"* eq2 mplayeru (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
+-msgstr "strategie zjištování formátu dat"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
++msgstr ""
++"Rozostřovací maska / gausovské rozmazání\n"
++"Je možné nastavit šířku a výšku matice s lichými velikostmi v obou směrech "
++"(min = 3x3, max = 13x11 nebo 11x13, obvykle něco mezi 3x3 až 7x7) a poměrné "
++"množství ostrosti/rozmazání, které se má přidat k obrazu (rozumný rozsah by "
++"měl být -1.5 - 1.5).\n"
++"\n"
++"Parametry\n"
++"\n"
++" Luma_matrix_width: Šířka matice (musí být lichá)\n"
++"\n"
++" Luma_matrix_height: Výška matice (musí být lichá)\n"
++"\n"
++" Luma_amount: Poměrné množství ostrosti nebo rozmazání (=0 zakázat, <0 "
++"rozmazat, >0 zostřit)\n"
++"\n"
++" Chroma_matrix_width: Šířka matice (musí být lichá)\n"
++"\n"
++" Chroma_matrix_height: Výška matice (musí být lichá)\n"
++"\n"
++" Chroma_amount: Poměrné množství ostrosti nebo rozmazání (=0 zakázat, <0 "
++"rozmazat, >0 zostřit)\n"
++"\n"
++"\n"
++"* unsharp mplayeru (C) 2002 Rémi Guyomarch\n"
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+-"xine poskytuje různé metody k detekci formátu multimédia, které se má "
+-"přehrát. Jednotlivé hodnoty jsou:\n"
+-"default\n"
+-"Nejprve zkusit detekovat podle obsahu, pak podle přípony jména souboru.\n"
++"Zdokonalený modul tvtime/deinterlacer s pulldown detekcí\n"
++"Tento modul má za cíl poskytnout mechanizmy korekce prokládání srovnatelné s "
++"vysoce kvalitními postupnými přehrávači DVD a takzvanými \"zdvojovači řádek"
++"\" (line-doublers) pro použití s počítačovými monitory, projektory a jinými "
++"postupnými zobrazovacími zařízeními.\n"
+ "\n"
+-"reverse\n"
+-"Nejprve zkusit detekovat podle přípony jména souboru, pak podle obsahu.\n"
++"Parametry\n"
+ "\n"
+-"content\n"
+-"Detekovat pouze podle obsahu.\n"
++" Method: Vybrat metodu (algoritmus), kterou použít. Vysvětlení všech metod "
++"je dále.\n"
+ "\n"
+-"extension\n"
+-"Detekovat pouze podle přípony jména souboru.\n"
++" Enabled: Povolit nebo zakázat modul.\n"
++"\n"
++" Pulldown: Vybrat detekční algoritmus 2-3 pulldown. Filmy s rychostí 24 "
++"snímků/s, které byly konvertovány do NTSC mohou být detekovány a "
++"inteligentně rekonstruovány do původních (neprokládaných) snímků.\n"
++"\n"
++" Framerate_mode: Vybráním 'full' se bude korigovat prokládání každého "
++"půlsnímku do unikátního snímku. Získá se tím televizní nebo ještě vyšší "
++"kvalita. Tato funkce účinně zdvojnásobí rychlost snímků, což zlepší "
++"hladkost. Poznamenejme však, že plných 59.94 snímků/s nelze dosáhnout s "
++"neupraveným jádrem Linuxu 2.4 (to používá frekvenci přerušení časovače 100 "
++"Hz). Novější jádra RedHatu a 2.6 jádra používají vyšší nastavení HZ (512 a "
++"1000, v pořadí) a měly by v pohodě fungovat.\n"
++" Judder_correction: Je-li povoleno 2-3 pulldown a je deketován filmový "
++"materiál, je možné omezit rychlost snímků na původní použitou rychlost (24 "
++"snímků/s). To způsobí, že snímky budou rovnoměrně rozložené v čase. Jejich "
++"čas bude souhlasit a eliminuje se třesení.\n"
++"\n"
++" Use_progressive_frame_flag: Dobře zvládnuté streamy MPEG2 používají "
++"příznak k indikaci postupného materiálu. Toto nastavení řídí, zda věříme či "
++"nevěříme tomuto příznaku (některé ojedinělé chybné streamy mpeg2 ho "
++"nastavují špatně).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 používá prokládaný obrazový formát, který má "
++"velmi špatné svislé barevné rozlišení. Převzorkování barvy na vyšší "
++"rozlišení pro účely korekce prokládání může způsobit vytvoření artefaktů "
++"(např. barevné pruhy). Tuto volbu použijte k svislému rozmazání barvy po "
++"korekci prokládání, což odstraní tyto artefakty. Varování: náročné na CPU.\n"
++"\n"
++" Cheap_mode: Toto přeskočí nákladnou konverzi obrazu YV12->YUY2 a rutiny "
++"tvtime/dscaleru budou používány, jako by stále zpracovávaly obrazy YUY2."
++"Samozřejmě to není správně, ne všechny body budou vyhodnoceny algoritmem pro "
++"rozhodování o oblastech ke korekci a barva bude zpracována odděleně. Nicméně "
++"toto dovolí lidem s ne tak rychlými systémy vyzkoušet si algoritmus korekce "
++"prokládání, v kompromisu mezi kvalitou využitím CPU.\n"
++"\n"
++"Metody korekce prokládání: (ne všechny metody jsou k dispozici pro všechny "
++"platformy)\n"
++"\n"
++"(FIXME: vysvětlit každou metodu, zkontrolovat dokumentace tvtime/dscaler ... "
++"už jsem líný) (pozn. překlad.: a bylo by to vytížení i pro mě :-))\n"
++"\n"
++"* Používá několik algoritmů z projektů tvtime a dscaler.\n"
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
+-msgstr "adresář pro ukládání dat"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
++msgstr "tvtime: Nejsou k dispozici žádné metody korekce prokládání, konec.\n"
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+-"Při použití funkce ukládání toku dat budou soubory zapisovány pouze do "
+-"tohoto adresáře.\n"
+-"Toto nastavení je kritické z hlediska bezpečnosti, protože při změně na jiný "
+-"adresář může xine vyplňovat soubory v tomto adresáři libovolným obsahem. "
+-"Proto byste si měli být jisti, že je v uvedeném adresáři bezproblémový "
+-"jakýkoliv obsah v jakémkoliv souboru."
++"Tento filtr bude provádět časové natahování - sekvence se přehraje rychleji "
++"nebo pomaleji podle násobku. Rozteč je volitelně zachovávána, takže je možné "
++"např. použít tento filter ke shlédnutí filmu v kratším čase, než byl původně "
++"natočen.\n"
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
+-msgstr "povolit implicitní změny v konfiguraci (např. pomocí MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++msgstr ""
++"Funkce upmixu, např. vzít vstup stereo a vydat výstup Surround 5.1.\n"
++"Parametry\n"
++" cut_off_freq\n"
++"\n"
++"Poznámka: K nastavení těchto parametrů je možné použít řídící okno "
++"frontendu.\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr "snímků generovaných za sekundu"
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+-"Pokud je povoleno, dovolíte xine měnit vaši konfiguraci bez výslovných akcí "
+-"z vaší strany. Budou vykonány např. změny konfigurace žádané z MRL nebo "
+-"vložené do playlistu.\n"
+-"Toto nastavení je kritické z hlediska bezpečnosti, protože xine může "
+-"přijímat MRL nebo playlist z nedůvěryhodných vzdálených zdrojů. Pokud jim "
+-"dovolíte libovolně měnit vaši konfiguraci, můžete skončit s úplně rozhozeným "
+-"xine."
++"S více snímky za sekundu bude animace hladší a rychlejší, ale také to bude "
++"vyžadovat více výkonu CPU."
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "zprávy"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr "šířka obrazu Goomu"
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "modul"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr "Šířka generovaného obrazu v pixelech."
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
+-msgstr "trasování"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
++msgstr "výška obrazu Goomu"
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
+-msgstr "metoda memcpy použitá xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
++msgstr "Výška generovaného obrazu v pixelech."
+
+-#: src/xine-utils/memcpy.c:482
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
++msgstr "metoda konverze barev"
++
++#: src/post/goom/xine_goom.c:219
+ msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+-"Kopírování objemných paměťových bloků je jednou z nejnáročnějších operací na "
+-"dnešních počítačích. Proto xine poskytuje různé vyladěné metody, které "
+-"provádějí toto kopírování. Obvykle je nejlepší metoda deketována automaticky."
++"Můžete vybrat metodu konverze barevného prostoru použitou goomem.\n"
++"Výběry k dispozici by měly být samovysvětlující."
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
+-msgstr "Výkonnostní testování metod memcpy (menší je lepší):\n"
++#~ msgid "audio_oss_out: open() %s failed: %s\n"
++#~ msgstr "audio_oss_out: open() %s selhalo: %s\n"
+
+ #~ msgid "display DVB channel name"
+ #~ msgstr "zobrazovat jméno kanálu DVB"
+@@ -4995,11 +5211,13 @@
+ #~ "Toto zobrazí jméno aktuálního kanálu v OSD xine. Tlačítko volby 7 to "
+ #~ "dočasně zakáže."
+
+-#~ msgid "xine video output plugin using OpenGL - TNG"
+-#~ msgstr "výstupní modul videa xine použije OpenGL"
++# FIXEM: correct the original
++#~ msgid ""
++#~ "A Comma separated list of domain names, where the proxy is to be ignored."
++#~ msgstr "Seznam domén oddělený čárkami, kde nebude použito proxy."
+
+-#~ msgid "audio_oss_out: open() %s failed: %s\n"
+-#~ msgstr "audio_oss_out: open() %s selhalo: %s\n"
++#~ msgid "selection has no DEFAULT entry"
++#~ msgstr "výběr nemá položku VÝCHOZÍ"
+
+ #~ msgid ""
+ #~ "You can disable video scaling globally. The image will then no longer "
+@@ -5010,9 +5228,8 @@
+ #~ "přizpůsobován na velikost okna videa, což může dramaticky snížit využití "
+ #~ "CPU."
+
+-# standarní hláška hstrerror
+-#~ msgid "No error"
+-#~ msgstr "Žádná chyba"
++#~ msgid "xine video output plugin using OpenGL - TNG"
++#~ msgstr "výstupní modul videa xine použije OpenGL"
+
+ # standarní hláška hstrerror
+ #~ msgid "Unknown host"
+@@ -5030,9 +5247,6 @@
+ #~ msgid "Host name lookup failure"
+ #~ msgstr "Zjišťování jména selhalo"
+
+-#~ msgid "Unknown error"
+-#~ msgstr "Neznámá chyba"
+-
+ #~ msgid "device used for 5+ channel output"
+ #~ msgstr "zařízení použité pro 5+ kanálový výstup"
+
+@@ -5297,9 +5511,6 @@
+ #~ msgid "Default active stream"
+ #~ msgstr "Přednastavená aktivní sekvence"
+
+-#~ msgid "video_out: can't create thread (%s)\n"
+-#~ msgstr "video_out: nelze vytvořit vlákno (%s)\n"
+-
+ #~ msgid "input not seekable, can not handle!\n"
+ #~ msgstr "u tohoto vstupu není nastavitelná pozice, nelze zpracovat!\n"
+
+@@ -5404,9 +5615,6 @@
+ #~ msgid "OUCH - dropped input packet %d %d\n"
+ #~ msgstr "JEJDA - zahozen vstupní paket %d %d\n"
+
+-#~ msgid "unable to allocate input buffer.\n"
+-#~ msgstr "nelze alokovat vstupní vyrovnávací paměť.\n"
+-
+ #~ msgid "demux_mpgaudio: no audio driver!\n"
+ #~ msgstr "demux_mpgaudio: žádný zvukový ovladač!\n"
+
+--- ./po/de.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/de.po 2005-02-12 22:28:46.000000000 +0000
+@@ -5,8 +5,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib 1.0.0rc2\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2004-09-16 18:46+0200\n"
+ "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n"
+ "Language-Team: German <de@li.org>\n"
+@@ -15,624 +16,1293 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
+-msgstr "audio_alsa_out:Bereits geöffnet...WARUM?"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
++msgstr "Standardzeitspanne in Sekunden bis zum Ausblenden des Untertitels"
+
+-#: src/audio_out/audio_alsa_out.c:390
++#: src/libsputext/demux_sputext.c:1507
++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 ""
++"Einige Untertitelformate geben keine explizite Dauer für die Untertitel an. "
++"Für diese kann eine Standardzeitspanne angegeben werden. Wird Null "
++"angegeben, werden die Untertitel solange angezeigt, bis sie vom nächsten "
++"ersetzt werden."
++
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
++msgstr "Untertitelgröße"
++
++#: src/libsputext/xine_decoder.c:901
++msgid ""
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
++msgstr ""
++"Passt die Untertitelgröße an. Diese Einstellung ist relativ zur Fenstergröße."
++
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
++msgstr "Vertikaler Versatz für Untertitel"
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
++msgstr ""
++"Passt den vertikalen Versatz der Untertitel an. Diese Einstellung ist "
++"relativ zur Fenstergröße."
++
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
++msgstr "Zeichensatz für Untertitel"
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++"Ein Zeichensatz aus xines font-Verzeichnis zur Anzeige von Untertiteln."
++
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr "Zeichenkodierung für Untertitel"
++
++#: src/libsputext/xine_decoder.c:923
++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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
++msgstr ""
++"Die Kodierung der Untertitel im Datenstrom. Diese Einstellung wird bei der "
++"Darstellung von nicht-ASCII-Zeichen benutzt. Falls nicht-ASCII-Zeichen "
++"anders als erwartet dargestellt werden, fragen Sie den Ersteller der "
++"Untertitel nach der verwendeten Kodierung."
++
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr "Benutze unskaliertes OSD falls möglich"
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++"Das unskalierte OSD wird unabhängig vom Videobild erzeugt und ist immer "
++"scharf, sogar falls das Video vergrößert wird. Es sieht besser aus, "
++"funktioniert aber nicht mit jeder Grafikhardware. Die Alternative ist ein "
++"skaliertes OSD, welches verwischt, wenn ein Video mit niedriger Auflösung "
++"bildschirmfüllend angezeigt wird; allerdings funktioniert sie mit allen "
++"Grafikkarten."
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+-msgstr "audio_alsa_out: snd_pcm_open() von %s schlug fehl: %s\n"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_audio_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
+
+-#: src/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+-"audio_alsa_out: >>> Überprüfen Sie, ob ein anderen Programm PCM bereits "
+-"benutzt<<<\n"
++"ffmpeg_audio_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
+
+-#: src/audio_out/audio_alsa_out.c:405
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr "ffmpeg_audio_dec: Konnte Dekoder nicht öffnen\n"
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
++
++#: src/libffmpeg/video_decoder.c:153
++#, fuzzy
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n"
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr "ffmpeg_video_dec: Direktausgabe aktiviert\n"
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) schlug fehl.\n"
++
++#: src/libffmpeg/video_decoder.c:714
+ #, c-format
+-msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_video_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+-"audio_alsa_out: Kaputte Konfiguration für dieses PCM: Keine Konfiguration "
+-"verfügbar: %s\n"
++"ffmpeg_video_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
+-msgstr "Änderungen an Hardwaremixer melden"
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr "Qualität der MPEG-4 Nachbearbeitungsstufe"
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+-"Wenn sich die Einstellungen des Hardwaremixers ändern wird die Anwendung "
+-"benachrichtigt, damit sie die grafische Darstellung des Mixers direkt "
+-"aktualisieren kann."
++"Die Umfang der Nachbearbeitung bei MPEG-4 Videos kann angepasst werden.\n"
++"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastunga. Niedrige "
++"Werte können zu Defekten wie Artefakte führen. Bei hochqualitativen Inhalten "
++"kann zu starke Nachbearbeitung das Bild durch zu starkes verwischen "
++"verschlechtern."
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libffmpeg/dvaudio_decoder.c:303
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
+-msgstr "snd_lib_error_set_handler() schlug fehl: %d"
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr "dvaudio: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
+-msgstr "Soundkarte unterstützt mmap "
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr "libavcodec MPEG Ausgangsbitrate (kBit/s)"
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+-"Aktivieren Sie dies, falls Ihre Soundkarte und der ALSA-Treiber memory "
+-"mapped IO unterstützen.\n"
+-"Sie können dies aktivieren und testen, ob alles funktioniert. Falls ja, "
+-"erhöht es die Leistung."
++"Bitrate für die MPEG-Enkodierungsbibliothek libavcodec zur DXR3 Enkodierung. "
++"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastung.\n"
++"Diese Einstellung ist nur wirksam, wenn der Modus für konstante Qualität "
++"deaktiviert ist."
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "Gerät für Monoausgabe"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr "Modus für konstante Qualität"
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+-"xine benutzt diese ALSA-Gerät für die Monoausgabe.\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Falls aktiviert benutzt libavcodec einen Modus für konstante Qualität, bei "
++"der Bilder je nach Komplexität dynamische komprimiert werden. Anderenfalls "
++"benutzt libavcodec eine Modus mit konstanter Bitrate."
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "Gerät für Stereoausgabe"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
++msgstr "Minimale Kompression"
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr "Minimale Kompression für ein Bild im Modus konstanter Qualität"
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr "Maximaler Quantisierer"
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr "Maximale Kompression für ein Bild im Modus konstanter Qualität"
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr "HILFE! Ein nur-Mono-Audiogerät?!\n"
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr "A/52 Lautstärke"
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+-"xine benutzt diese ALSA-Gerät für die Stereoausgabe.\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Mit A/52 Audio kann die Lautstärke auf Dekoderebene verändert werden. Dies "
++"hat den Vorteil, daß die Audiodaten bereits für die spezifische Lautstärke "
++"dekodiert sind und nachfolgende Operationen wie Heruntermischen direkt mit "
++"diesen Audiodaten arbeiten können."
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "Gerät für 4-Kanalausgabe"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
++msgstr "Benutze dynamische A/52 Bereichskomprimierung"
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+-"xine benutzt diese ALSA-Gerät für die 4-Kanalausgabe (4.0 Raumklang).\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Dynamische Bereichskomprimierung reduziert den dynamischen Bereich des Tons: "
++"Laute Geräusche klingen leiser und leise Geräusche klingen lauter. Dies "
++"ermöglicht ein besseres Verständnis des Tons in lauten Umgebungen, ohne "
++"dabei andere zu stören."
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "Gerät für 5.1-Kanalausgabe"
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
++msgstr "Heruntermischen zu Zweikanal Stereo Raumklang"
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+-"xine benutzt diese ALSA-Gerät für die 5-Kanalausgabe mit Bassbox (5.1 "
+-"Raumklang).\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Aktivieren sie dies, falls Sie Mehrkanal-Raumklang anhören wollen, aber nur "
++"zwei Lautsprecher oder einen Surround-Dekodierer haben, der Matrix-Surround-"
++"Dekodierung wie ProLogic unterstützt, damit die zusätzlichen Kanäle in das "
++"Stereo-Signal gemixt werden."
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr "xines Methode zum Kopieren von Speicher"
++
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+-"xine benutzt diese ALSA-Gerät für die unkodierte Ausgabe von digitalen "
+-"Raumklang. Dies kann von externen Dekodern benutzt werden.\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Das Kopieren von großen Speicherblöcken ist eine der teuersten Operationen "
++"in heutigen Computern. Deshalb unterstützt xine verschiedene optimierte "
++"Methoden für dieses Kopieren, von denen normalerweise automatisch die beste "
++"gewählt wird."
+
+-#: src/audio_out/audio_alsa_out.c:1398
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr "Geschwindigkeitsvergleich der memcpy-Methoden (klein ist besser):\n"
++
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
++msgstr "libfaad: libfaad faadDecOpne() schlug fehl.\n"
++
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
++msgstr "libfaad: libfaad faacDecInit2 schlug fehl.\n"
++
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr "libfaad: libfaad faacDecInit schlug fehl.\n"
++
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
++msgstr "Zeichensatz für externe Untertitel"
++
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr "Vertikaler Versatz für Untertitel (Relativ zu Fenstergröße)"
++
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
++msgstr "Zeichenkodierung für Untertitel"
++
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "demux_qt: Kann neuen Thread (%s) nicht erzeugen\n"
++
++#: src/libmusepack/xine_decoder.c:237
+ #, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "snd_pcm_open() schlug fehl:%d:%s\n"
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
+-msgstr ">>> Überprüfen Sie, ob ein anderen Programm bereis PCM benutzt <<<\n"
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
+-msgstr "Lautsprecherplazierung"
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
++msgstr "Untertitel in MEPG-2-Strömen anzeigen"
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
++msgstr "Untertitel sollen Hörgeschädigten helfen."
++
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
++msgstr "Untertitelschema für Vordergrund-/Hintergrundfarbe"
++
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
++msgstr "Wählen Sie eine Darstellung für Untertitel."
++
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
++msgstr "Standard Zeichensatz für Untertitel"
++
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
++msgstr "Wählen Sie den Zeichensatz für standard Untertiteltexte."
++
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
++msgstr "Italic Zeichensatz für Untertitel"
++
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
++msgstr "Wählen Sie den Zeichensatz für kursive Untertiteltexte."
++
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
++msgstr "Zeichensatzgröße für Untertitel"
++
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
++msgstr "Wählen Sie die Zeichensatzgröße für Untertiteltexte."
++
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
++msgstr "Zentrieren von Untertiteln"
++
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
++msgstr ""
++"Falls aktiviert werden die Zeilen des Untertitels jeweils mittig "
++"ausgerichtet."
++
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
++msgstr "xine Videoausgabe benutzt DirectFB-Bibliothek"
++
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
++msgstr "Farbschlüssel für Overlay"
++
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
++msgstr ""
++"Der Farbschlüssel wird benutzt, um der Grafikkarte mitzuteilen, wo das Video "
++"eingeblendet werden kann. Probieren Sie verschiedenen Werte, falls einige "
++"Fenster durchscheinend werden."
++
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
++msgstr "automatischer Farbschlüssel"
++
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
++msgstr "Veranlasst Xv automatisch den Farbschlüssel zu zeichnen."
++
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr "Doppelpufferung benutzen"
++
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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 ""
++"Doppelpufferung synchronisiert das Aktualisieren des Videobildes mit der "
++"Darstellung des gesamten Bildschirms (\"Strahlenrücklauf\"). Dies verhindert "
++"Flackern und Fransenbildung, benötigt aber mehr Grafikspeicher."
++
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr "Deinterlace-Methode (veraltet)"
++
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
++msgid ""
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
+ "\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
+ msgstr ""
+-"Wählen Sie, wie Ihre Lautsprecher angeordnet sind. Darüber wird gerählt, "
+-"welche Lautsprecher xine für die Ausgabe verwendet. Mögliche Werte sind:\n"
++"Die Konfigurationseinstellung ist veraltet; Sie sollten stattdessen die "
++"Einstellungen der Deinterlacing Nachbearbeitung verwenden.\n"
+ "\n"
+-"Mono 1.0: Sie haben nur einen Lautsprecher.\n"
+-"Stereo 2.0: Sie haben zwei Lautsprecher für den linken und rechten Kanal.\n"
+-"Headphones 2.0: Sie benutzen einen Kopfhörer.\n"
+-"Stereo 2.1: Sie haben zwei Lautsprecher für den linken und rechten Kanal und "
+-"einen Subwoofer für tiefe Frequenzen.\n"
+-"Surround 3.0: Sie haben drei Lautsprecher für den linken, rechten und "
+-"Rückkanal.\n"
+-"Surround 4.0: Sie haben vier Lautsprecher für den jeweils linken und rechten "
+-"Front- bzw. Rückkanal.\n"
+-"Surround 4.1: Sie haben vier Lautsprecher für den jeweils linken und rechten "
+-"Front- bzw. Rückkanal sowie einen Subwoofer für tiefe Frequenzen.\n"
+-"Surround 5.0: Sie haben fünf Lautsprecher für links, mitte, rechts und "
+-"hinten links und hinten rechts.\n"
+-"Surround 5.1: Sie haben fünf Lautsprecher für links, mitte, rechts und "
+-"hinten links und hinten rechts sowie einen Subwoofer für tiefe Frequenzen.\n"
+-"Surround 6.0: Sie haben sechs Lautsprecher für jeweils links, mitte und "
+-"rechts Front- bzw. Rückkanal.\n"
+-"Surround 6.1: Sie haben sechs Lautsprecher für jeweils links, mitte und "
+-"rechts Front- bzw. Rückkanal sowie einen Subwoofer für tiefe Frequenzen."
+-"frequencies.\n"
+-"Surround 7.1: Sie haben sieben Lautsprecher für links, mitte und rechts, "
+-"mitte links und rechts, hinten links und rechts sowie einen Subwoofer für "
+-"tiefe Frequenzen.\n"
+-"Pass Through: Ihr Soundsystem erhähl unkodierte digitale Signale von xine. "
+-"Sie benötigen einen digitalen Raumklangdekoder, der alle Formate dekodieren "
+-"kann, die Sie über den digitalen Ausgang Ihrer Soundkarte abspielen wollen."
++"In den Anfangstagen des analogen Fernsehens wurden die geraden und ungeraden "
++"Zeilen des Videobildes zu verschiedenen Zeiten aufgenommen und angezeigt, um "
++"Bewegungen flüssiger darzustellen. Dies nennt man \"interlacing\". "
++"Unglücklicherweise zeigen heutige Bildschirme sowohl gerade und ungerade "
++"Zeilen immer gleichzeitig als vollständiges Bild an, genannt \"progressiv\", "
++"was zu Kammartefakten genannten Bildfehlern führt. Softwareinterlacing ist "
++"ein Ansatz, diese Artefakte zu reduzieren. Die Werte bedeuten:\n"
++"\n"
++"none\n"
++"Deaktiviert Softwaredeinterlacing.\n"
++"\n"
++"bob\n"
++"Interpoliert zwischen den Linien in bewegten Teilen des Bildes.\n"
++"\n"
++"weave\n"
++"Ähnlich wie bob, mit der Tendez, die volle Auflösung zu erhalten, besser für "
++"hohe Details in Szenen mit wenig Bewegung.\n"
++"\n"
++"greedy\n"
++"Sehr guter adaptiver Deinterlacer, der aber viel CPU-Leistung benötigt.\n"
++"\n"
++"onefield\n"
++"Interpoliert immer und reduziert die vertikale Auflösung.\n"
++"\n"
++"onefieldxv\n"
++"Wie onefield, benutzt aber die Hardware zur Interpolation.\n"
++"\n"
++"linearblend\n"
++"Verwischt das Bild vertikal, um Kammartefakte zu entfernen. Gute Resultate "
++"bei mittlerer CPU-Auslastung."
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
+-msgstr "audio_alsa_out : Unterstützte Modi sind "
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "xine Videoausgabe benutzt XvMC XVideo-Erweiterung"
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
+-msgstr "8Bit "
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
+-msgstr "16Bit "
++#: src/video_out/video_out_xvmc.c:1797
++msgid ""
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
++msgstr ""
++"video_out_xvmc: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
++"YUV12-Port gefunden.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
+-msgstr "24Bit "
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
++msgstr ""
++"video_out_xvmc: Benutze Xv-Port %ld von Adapter %s for Hardware-"
++"Farbraumtransformation und Skalierung\n"
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
+-msgstr "32Bit "
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr " IDCT und Bewegungskompensationsbeschleunigung \n"
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
+-msgstr "Mono "
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr " nur Bewegungskompensationsbeschleunigung\n"
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
+-msgstr "Stereo "
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr " Keine XvMC-Unterstützung \n"
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
+-msgstr "4-Kanal "
++#: src/video_out/video_out_xvmc.c:1816
++#, c-format
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgstr " Mit Überlagerung = %d; UnsignedIntra = %d.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
+-msgstr "(4-Kanal nicht aktiviert in xine Konfiguration) "
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr "Rot-Intensität"
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
+-msgstr "4.1-Kanal "
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr "Die Intensität rotet Farbanteile"
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
+-msgstr "(4.1-Kanal nicht aktiviert in xine Konfiguration) "
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr "Grün-Intensität"
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
+-msgstr "5-Kanal "
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr "Die Intensität grüner Farbanteile"
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
+-msgstr "(5-Kanal nicht aktiviert in xine Konfiguration) "
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr "Blau-Intensität"
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
+-msgstr "5.1-Kanal "
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr "Die Intensität blauer Farbanteile"
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
+-msgstr "(5.1-Kanal nicht aktiviert in xine Konfiguration) "
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr "video_out_vidix: Adapter unterstützt das YUY2 Format\n"
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
+-msgstr "a/52 und DTS pass-through\n"
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr "video_out_vidix: Adapter unterstützt das YV12 Format\n"
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+-msgstr "(a/52 und DTS pass-through nicht aktiviert in xine Konfiguration)\n"
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr "video_out_vidix: Sie haben die falsche Version der VIDIX-Bibliothek\n"
+
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "ALSA Mixergerät"
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr "video_out_vidix: Kein funktionierende VIDIX-Treiber gefunden\n"
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_vidix.c:1107
++#, c-format
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr "video_out_vidix: Benutzer Treiber: %s von %s\n"
++
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
++msgstr "Rot-Komponente des Farbschlüssels für Overlays"
++
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
++msgstr "Grün-Komponente des Farbschlüssels für Overlays"
++
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
++msgstr "Blau-Komponente des Farbschlüssels für Overlays"
++
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr "xine Videoausgabe benutzt libvidix für X11"
++
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++msgid "framebuffer device name"
++msgstr "Framebuffer Gerät"
++
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+-"xine benutzt dieses ALSA Mixergerät, um die Lautstärke zu ändern.\n"
+-"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
++"Gibt den Namen für das Sun Framebuffer-Gerät an.\n"
++"Diese Einstellung ist Sicherheitskritisch, da falls sie auf eine andere "
++"Datei geändert wird, xine diese mit willkürlichen Inhalt überschreibt. Sie "
++"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das "
++"Framebuffer-Gerät bezeichnet."
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+-msgstr "xine Soundausgabe benutzt ALSA-kompatibles Gerät/Treiber"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr "xine Videoausgabe benutzt libvidix für Linux Framebuffer"
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "xine Soundausgabe benutzt kde artsd"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: XShape-Erweiterung nicht verfügbar. Unskalierte Überlagerung "
++"deaktiviert.\n"
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "xine Soundausgabe benutzt Coreaudio/Mac OS X"
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: Fehler bei Fenstererstellung. Unskalierte Überlagerung deaktiviert.\n"
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "xine Soundausgabe benutzt directx für win32"
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: Fehler bei Bitmapstellung. Unskalierte Überlagerung deaktiviert.\n"
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+-msgstr "audio_esd_out: Verbinde ESD Server %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
++msgstr "x11osd: Unskaliertes Overlay erzeugt (%s Modus).\n"
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
+-msgstr "audio_esd_out: Verbinde ESD Server...\n"
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "xine Videoausgabe benutzt ASCII-Art Bibliothek"
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++"video_out_pgx64: Fehler: DGA Zeichenfläche für Videofenster nicht bekommen\n"
++
++#: src/video_out/video_out_pgx64.c:300
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+-msgstr "audio_esd_out: Kann ESD Server %s nicht verbinden: %s\n"
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "video_out_pgx64: Fehler: Kann Framebuffer Gerät '%s' nicht öffnen\n"
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "Verzögerung der esd Audioausgabe (Verändert A/V Synchronisation)"
++#: src/video_out/video_out_pgx64.c:307
++#, c-format
++msgid ""
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++msgstr ""
++"video_out_pgx64: Fehler: ioctl(VIS_GETIDENTIFIER) schlug fehl, fehlerhaftes "
++"Gerät (%s)\n"
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
++#: src/video_out/video_out_pgx64.c:320
++#, c-format
+ msgid ""
+-"If you experience audio being not in sync with the 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."
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+-"Falls Sie feststellen, daß Ton und Bild nicht synchron sind, können Sie hier "
+-"einen Versatz zur Kompensierung eingeben.\n"
+-"Die Einheit dieses Wertes ist ein \"PTS-Tick\", was dem 90.000stel einer "
+-"Sekunde entspricht."
++"video_out_pgx64: Fehler: '%s' ist kein xvr100/pgx64/pgx24 Framebuffer Gerät\n"
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
+-msgstr "xine Soundausgabe benutzt esound"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++msgstr ""
++"video_out_pgx64: Fehler: Video-Overlay auf diesem Schirm ist bereits "
++"benutzt\n"
+
+-#: src/audio_out/audio_file_out.c:362
+-msgid "xine file audio output plugin"
+-msgstr "xine Date Soundausgabe"
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++"video_out_pgx64: Fehler: Fenstereigenschaften kónnen nicht gesetzt werden\n"
+
+-#: src/audio_out/audio_irixal_out.c:385
+-msgid "irixal audio output maximum gap length"
+-msgstr "Maximal erlaubte Differenz für IRIXAL Soundausgabe"
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++"video_out_pgx64: Warnung: Wenig Videospeicher, Mehrfachpufferung "
++"deaktiviert\n"
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr "video_out_pgx64: Fehler: Ungenügend Videospeicher\n"
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++"video_out_pgx64: Warnung: Wenig Videospeicher, Doppelpufferung deaktiviert\n"
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr "video_out_pgx64: Fehler: ioctl(FBIOGATTR) schlug fehl\n"
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+-"Sie können den maximalen Versatz zwischen Audio und Video angeben, den xine "
+-"toleriert, bevor sie resynchronisiert werden.\n"
+-"Die Einheit dieses Wertes ist ein \"PTS-Tick\", was dem 90.000stel einer "
+-"Sekunde entspricht."
++"Der Farbschlüssel wird benutzt, um der Grafikkarte mitzuteilen, wo das Video "
++"eingeblendet werden kann. Probieren Sie verschiedenen Werte, falls das Video "
++"bei anderen Fenstern durchscheint."
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "xine Soundausgabe benutzt IRIX-kompatibles Gerät/Treiber"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
++msgstr "Videohelligkeit"
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
+-msgstr "xine Dummy Soundausgabe"
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr "Die Helligkeit des Videos."
+
+-#: src/audio_out/audio_oss_out.c:191
+-#, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
+-msgstr "audio_oss_out: Öffne Audiogerät %s: %s\n"
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr "Videosättigung"
+
+-#: src/audio_out/audio_oss_out.c:213
+-#, c-format
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr "Die Sättigung des Videos."
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr "Benutze Farbschlüssel"
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+-"audio_oss_out: Warnung: Abtastrate %d Hz nicht unterstützt, versuche 44100 "
+-"Hz\n"
++"OSD-Grafiken werden an den Stellen des Farbschlüssels dargestellt, anstatt "
++"sie in jedes Bild einzublenden."
+
+-#: src/audio_out/audio_oss_out.c:225
+-#, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+-msgstr "audio_oss_out: Audiodatenrate: %d gefordert, %d genutzt von Gerät\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
++msgstr "Mehrfachpufferung benutzen"
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
+-msgstr "OSS Audio-Gerätename"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
++msgstr ""
++"Mehrfachpufferung erhöht die Leistung auf Kosten eines erhöhten Verbrauchs "
++"von Grafikspeicher."
+
+-#: src/audio_out/audio_oss_out.c:737
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr "xine Videoausgabe benutzt LibStk Surface Set-top Toolkit"
++
++#: src/video_out/video_out_xxmc.c:601
++#, fuzzy
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+-"Spezifizieren Sie den Basisgerätenamen, an den die OSS-Gerätenummer "
+-"angehängt wird, um den vollen Gerätenamen zu erhalten.\n"
+-"Wählen Sie \"auto\", falls xine automatisch die korrekte Einstellung wählen "
+-"soll."
++"video_out_xv: XvShmCreateImage schlug fehl\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
+-msgstr "OSS Audio-Gerätename, -1 für keinen"
++#: src/video_out/video_out_xxmc.c:611
++#, fuzzy
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: XvShmCreateImage lieferte Größe 0 zurück\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_xxmc.c:619
++#, fuzzy, c-format
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+-"Der Audio-Gerätename wird durch Aneinanderhängen des OSS-Gerätenamens und "
+-"der Audio-Gerätenummer gebildet.\n"
+-"Wenn Sie keine Nummer benötigen (weil alles bereits funktioniert), benutzen "
+-"Sie -1.\n"
+-"Der gültige Bereich ist -1 oder 0-15. Diese Einstellung wird ignoriert, "
+-"falls OSS Audio-Gerätenamen auf \"auto\" steht."
++"video_out_xv: Shared-Memory-Fehler bei shmget: %s\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+-msgstr "audio_oss_out: audio.device.oss_device_name = auto, suche Geräte\n"
++#: src/video_out/video_out_xxmc.c:651
++#, fuzzy
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
++"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
+-msgstr "audio_oss_out: Automatische Suche nach Audiogeräten schlug fehl\n"
++#: src/video_out/video_out_xxmc.c:2158
++#, fuzzy
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n"
+
+-#: src/audio_out/audio_oss_out.c:773
+-#, c-format
+-msgid "audio_oss_out: using device >%s<\n"
+-msgstr "audio_oss_out: Benutze Gerät >%s<\n"
++#: src/video_out/video_out_xxmc.c:2195
++#, fuzzy
++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 ""
++"video_out_xv: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
++"YUV12-Port gefunden.\n"
++" Unterstützt die Grafikhardware evtl. kein Xv?!\n"
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
+-#, c-format
++#: src/video_out/video_out_xxmc.c:2204
++#, fuzzy, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+-"audio_oss_out: Öffnen des Audiogeräts %s schlug fehl:\n"
+-"%s\n"
++"video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
++"Farbraumtransformation und Skalierung.\n"
+
+-#: src/audio_out/audio_oss_out.c:800
+-msgid "a/v sync method to use by OSS"
+-msgstr "A/V Synchronisationmethode für OSS"
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
++msgstr "Bilinearer Skalierungsmodus"
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
+-"\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++"Wählt den bilinearen Skalierungsmodus bei Permedia Karten. Die Werte "
++"bedeuten:\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"Permedia 2\n"
++"0 - deaktiviert bilineares Filtern\n"
++"1 - aktiviert bilineares Filtern\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
++"Permedia 3\n"
++"0 - deaktiviert bilineares Filtern\n"
++"1 - horizontales lineares Filtern\n"
++"2 - aktiviert volles bilineares Filtern"
++
++#: src/video_out/video_out_xxmc.c:2380
++#, fuzzy
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n"
++
++#: src/video_out/video_out_xxmc.c:2385
++#, fuzzy
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n"
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr "pitch alignment Abhilfe"
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr "Einige fehlerhafte Videotreiber benötigen dies zur korrekten Funktion."
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
+ msgstr ""
+-"xine kann verschiedene Methoden benutzen, um Audio und Video zu "
+-"synchronisieren. Welche Einstellung am besten ist hängt vom OSS Treiber und "
+-"der benutzten Soundhardware ab. Versuchen Sie verschiedene Methoden, falls "
+-"Sie Synchronisationsprobleme bemerken.\n"
+-"\n"
+-"Die Bedeutung der Werte ist wie folgt:\n"
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "xine Videoausgabe benutzt 'MIX XVideo' Erweiterung"
++
++#: src/video_out/video_out_xshm.c:190
++msgid ""
++"video_out_xshm: shared memory error when allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: Shared-Memory-Fehler beim Speicherbelegen\n"
++"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++
++#: src/video_out/video_out_xshm.c:206
++#, c-format
++msgid ""
++"video_out_xshm: %s: allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: %s: Belege Bild\n"
++"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++
++#: src/video_out/video_out_xshm.c:216
++msgid ""
++"video_out_xshm: shared memory error (address error) when allocating image \n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: Shared-Memory-Fehler (Adressfehler) beim Belegen des Bilds\n"
++"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++
++#: src/video_out/video_out_xshm.c:233
++msgid ""
++"video_out_xshm: x11 error during shared memory XImage creation\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
++"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++
++#: src/video_out/video_out_xshm.c:1138
++#, c-format
++msgid ""
+ "\n"
+-"auto\n"
+-"xine versucht automatisch die besten Einstellungen zu erkennen\n"
+ "\n"
+-"getodelay\n"
+-"Benutzt ioctl(SNDCTL_DSP_GETODELAY) zur A/V Synchronisation selbst dann, "
+-"wenn der Treiber Unterstützung zur Echtzeitwiedergabe nicht anbietet\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"getoptr\n"
+-"Benutzt ioctl(SNDCTL_DSP_GETOPTR) zur A/V Synchronisation selbst dann, wenn "
+-"der Treiber das bevorzugte ioctl(SNDCTL_DSP_GETODELAY) anbietet\n"
++msgstr ""
+ "\n"
+-"softsync\n"
+-"Benutzt Softwaresynchronisation mit der Systemuhr; Audio und Video können "
+-"weit auseinanderdriften, wenn die Systemuhrgeschwindigkeit nicht exakt mit "
+-"der Wiedergabegeschwindigkeit der Soundkarte übereinstimmt\n"
+ "\n"
+-"probebuffer\n"
+-"Testet die Puffergröße der Soundkarte bei der Initialisierung, um die "
+-"Verzögerung zur A/V Synchronisation zu berechnen. Versuchen Sie dies, falls "
+-"Ihr System keine ioctls zu Echtzeitwiedergabe anbietet und "
+-"Synchronisationsprobleme nach langer Wiedergabe auftreten."
++"WARNUNG: Aktuelle Farbtiefe ist %d. Für bessere Leistung wird eine Farbtiefe "
++"von 16 bpp empfohlen!\n"
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++msgstr ""
++"video_out_xshm: MIT-Shared-Memory-Erweiterung für Anzeige nicht vorhanden.\n"
++
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
++"video_out_xshm: Der Videomodus wurde nicht erkannt, Entschuldigung :-(\n"
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr "Helligkeitskorrektur"
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+-"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
+-"audio_oss_out: ...System-Realzeituhr wird zur soft-Synchronisation benutzt\n"
+-"audio_oss_out: ...es könnn Audio/Video-Synchronisationsprobleme auftreten\n"
++"Die Helligkeitskorrektur kann benutzt werden, um ein Bild aufzuhellen oder "
++"zu verdunkeln. Sie verändert den Schwarzlevel ohne den Kontrast zu "
++"beeinflussen, limitiert aber den Tonumfang."
+
+-#: src/audio_out/audio_oss_out.c:856
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "Verzögerung der OSS Audioausgabe (Verändert A/V Synchronisation)"
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr "xine Videoausgabe benutzt 'MIX X Shared Memory' Erweiterung"
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_fb.c:762
++#, c-format
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+-"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
+-"audio_oss_out: ...Untersuche Größe des Ausgabepuffers: "
++"video_out_fb: Nur packed truecolor/directcolor wird unterstützt (%d).\n"
++" Überprüden Sie 'fbset -i' oder versuchen Sie 'fbset -depth 16'.\n"
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr "video_out_fb: Ihr Videomodues wurde nicht erkannt, Entschuldigung.\n"
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr "video_out_fb: %d Video-Ram-Puffer sind verfügbar.\n"
++
++#: src/video_out/video_out_fb.c:938
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+-"%d Bytes\n"
+-"audio_oss_out: ...es könnn Audio/Video-Synchronisationsprobleme auftreten\n"
++"WARNUNG: video_out_fb: Null-Kopie-Puffer sind DEAKTIVIERT, weil nur %d "
++"Puffer\n"
++" verfügbar sind, was weniger als die empfohlenen %d Puffer sind. "
++"Verringern\n"
++" der Framebuffer-Auflösung kann helfen.\n"
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
+-msgstr "OSS Mixernummer, -1 für keine"
++#: src/video_out/video_out_fb.c:949
++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 ""
++"WARNUNG: video_out_fb: Null-Kopie-Puffer sind DEAKTIVIERT, weil der Kernel-"
++"Treiber\n"
++" kein screen-panning unterstützt (benutzt für Bildwechsel).\n"
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:1016
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+-"Der Mixer-Gerätename wird durch Ersetzen von \"dsp\" durch \"mixer\" im OSS "
+-"Audio-Gerätenamen und durch Anhängen der Mixernummer gebildet.\n"
+-"Wenn Sie keine Nummer benötigen (weil alles bereits funktioniert), benutzen "
+-"Sie -1.\n"
+-"Der gültige Bereich ist -1 oder 0-15. Diese Einstellung wird ignoriert, "
+-"falls OSS Audio-Gerätenamen auf \"auto\" steht."
++"WARNUNG: video_out_fb: Momentane Farbtiefe ist %d. Für bessere Leistung wird "
++"eine Farbtiefe von 16 bpp empfohlen!\n"
+
+-#: src/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr "xine Videoausgabe benutzt Linux Framebuffer"
++
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr "Benutze Hardwarebeschleunigung falls verfügbar"
++
++#: src/video_out/video_out_sdl.c:480
++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 ""
++"Falls Ihr System es unterstützt, wird die Hardwarebeschleunigung Ihrer "
++"Grafikhardware benutzt. Falls es nicht funktioniert, können Sie dies "
++"deaktivieren."
++
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr "SDL muß eine 16 Bit Ausgabe emulieren, was alles verlangsamt.\n"
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr "video_out_sdl: Vollbildmodus wird NICHT unterstützt\n"
++
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "xine Videoausgabe benutzt 'Simple Direct Media Layer'"
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr "xine Videoausgabe benutzt für win32 benutzt directx"
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr "xine Videoausgabe zeigt nichts an"
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "xine Videoausgabe benutzt Farb-ASCII-Art Bibliothek"
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++"video_out_pgx32: Fehler: DGA Zeichenfläche für Videofenster nicht bekommen\n"
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "audio_oss_out: open() Mixer %s schlug fehl: %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "video_out_pgx32: Fehler: ioctl schlug fehl, fehlerhaftes Gerät (%s)\n"
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+-msgstr "xine Soundausgabe benutzt OSS-kompatibles Gerät/Treiber"
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++msgstr "video_out_pgx32: Fehler: '%s' ist kein pgx32 Framebuffer Gerät\n"
+
+-#: src/audio_out/audio_polyp_out.c:489
+-#, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "Gerät für CD-Audio"
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/alphablend.c:1768
++msgid ""
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
+-#, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "xine Soundausgabe benutzt esound"
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: XvShmCreateImage schlug fehl\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: XvShmCreateImage lieferte Größe 0 zurück\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "audio_sun_out: Öffnen des Audiogeräts %s schlug fehl: %s\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: Shared-Memory-Fehler bei shmget: %s\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
+-msgstr "Sun Audio-Gerätename"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
++"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr "video_out_xv: Xv-Erweiterung nicht vorhanden.\n"
++
++#: src/video_out/video_out_xv.c:1304
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
++"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 ""
++"video_out_xv: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
++"YUV12-Port gefunden.\n"
++" Unterstützt die Grafikhardware evtl. kein Xv?!\n"
++
++#: src/video_out/video_out_xv.c:1313
++#, c-format
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++"video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
++"Farbraumtransformation und Skalierung.\n"
++
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n"
++
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n"
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++"video_out_syncfb: Fehler. (YUY2 wird von der Grafikkarte nicht unterstützt)\n"
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++"video_out_syncfb: Fehler. (YV12 wird von der Grafikkarte nicht unterstützt)\n"
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++"video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:0 (3 Ebenen))\n"
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++"video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:0 (2 Ebenen))\n"
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:2)\n"
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt YUY2)\n"
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++"video_out_syncfb: Abbruch. (SyncFB unterstützt weder YV12, YUY2 noch "
++"RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:983
++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 ""
++"video_out_syncfb: Info. (Helligkeit-/Kontraststeuerung nicht verfügbar, weil "
++"das SyncFB-Kernelmodul veraltet scheint. Lesen Sie bitte README.syncfb zu "
++"Updateinformationen.)\n"
++
++#: src/video_out/video_out_syncfb.c:1007
++msgid "default number of frame repetitions"
++msgstr "Standardanzahl von Bildwiederholungen"
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr "Gibt an, wie oft ein einzelnes Videobild fortlaufend angezeigt wird."
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr "xine Videoausgabe benutzt SyncFB-Modul für Matrox G200/G400-Karten"
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr "SyncFB Gerätename"
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+-"Gibt den Namen für das Sun Audiogerät an.\n"
++"Gibt den Namen für das SyncFB (TeleTux) Gerät an.\n"
+ "Diese Einstellung ist Sicherheitskritisch, da falls sie auf eine andere "
+ "Datei geändert wird, xine diese mit willkürlichen Inhalt überschreibt. Sie "
+-"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das Sun "
+-"Audiogerät bezeichnet."
+-
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+-msgstr "xine Soundausgabe benutzt SUN-kompatibles Gerät/Treiber"
+-
+-#: src/demuxers/demux_asf.c:468
+-#, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
+-msgstr "demux_asf: Warnung: Datenstrom id=%d ist verschlüsselt.\n"
++"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das "
++"Framebuffer-Gerät bezeichnet."
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
+-msgstr "Medienstrom gestört/verschlüsselt"
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: Falsche ASX Version: %s\n"
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
+-msgstr "Stelle Index wiederher..."
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
+-#, fuzzy, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
+-msgstr "demux_avi: Ungültiges AVI-Paket \"%c%c%c%c\" an Position %lld\n"
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: AVI-Index ist fehlerhaft\n"
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, fuzzy, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
+ msgstr ""
+-"demux_avi: Positionierung zum nächsten Paket (Position %lld) schlug fehl\n"
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr "ogg: vorbis Tonspur erkannt, aber kein Heder im Datenstrom gefunden.\n"
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -642,20 +1312,19 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr "Nicht erkanntes FILM-Paket\n"
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr "iff-8svx/16sv: Unbekannte Kompression: %d\n"
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
+-msgstr "iff-ilbm: Unbekannte Kompression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgstr ""
++"Unbekannter VOC-Blocktyp (0x%02X); bitte bei den xine-Entwicklern melden\n"
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
+-msgstr "iff: Unbekanntes Paket: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgstr ""
++"Unbekannter VOC-Kompressionstyp (0x%02X); bitte bei den xine-Entwicklern "
++"melden\n"
+
+ #: src/demuxers/demux_mpeg_block.c:296
+ #, c-format
+@@ -686,6 +1355,29 @@
+ "demux_mpeg_block: Warnung: PES-Header deutet an, das dieser Datenstrom "
+ "verschlüsselt sein könnte (Verschlüsselungsmodus %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr "demux_asf: Warnung: Datenstrom id=%d ist verschlüsselt.\n"
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr "Medienstrom gestört/verschlüsselt"
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: Falsche ASX Version: %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr "demux_snd: Ungültige Header-Parameter\n"
++
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_snd: Unbekannter Audiotyp: %d\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -726,32 +1418,24 @@
+ "Entwicklern melden.\n"
+ "melden\n"
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr "ogg: vorbis Tonspur erkannt, aber kein Heder im Datenstrom gefunden.\n"
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
+-msgstr "demux_snd: Ungültige Header-Parameter\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
++msgstr "Stelle Index wiederher..."
+
+-#: src/demuxers/demux_snd.c:149
+-#, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_snd: Unbekannter Audiotyp: %d\n"
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
++#, fuzzy, c-format
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
++msgstr "demux_avi: Ungültiges AVI-Paket \"%c%c%c%c\" an Position %lld\n"
+
+-#: src/demuxers/demux_voc.c:105
+-#, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+-msgstr ""
+-"Unbekannter VOC-Blocktyp (0x%02X); bitte bei den xine-Entwicklern melden\n"
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: AVI-Index ist fehlerhaft\n"
+
+-#: src/demuxers/demux_voc.c:120
+-#, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
++#: src/demuxers/demux_avi.c:850
++#, fuzzy, c-format
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
+ msgstr ""
+-"Unbekannter VOC-Kompressionstyp (0x%02X); bitte bei den xine-Entwicklern "
+-"melden\n"
++"demux_avi: Positionierung zum nächsten Paket (Position %lld) schlug fehl\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -762,638 +1446,457 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr "demux_wc3movie: Beim Laden der Palette ist ein Problem aufgetreten\n"
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
+-msgstr "DXR3 Gerätenummer"
++#: src/demuxers/demux_iff.c:235
++#, c-format
++msgid "iff-8svx/16sv: unknown compression: %d\n"
++msgstr "iff-8svx/16sv: Unbekannte Kompression: %d\n"
+
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-"Falls Sie mehr als eine DXR3 in Ihrem Computer haben, können Sie hier "
+-"angeben, welche benutzt werden soll."
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
++msgstr "iff-ilbm: Unbekannte Kompression: %d\n"
+
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+-msgstr "dxr3_decode_spu: Öffnen des SPU-Geräts %s (%s) schlug fehl\n"
++msgid "iff: unknown Chunk: %s\n"
++msgstr "iff: Unbekanntes Paket: %s\n"
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
+-msgstr "Angeforderter Knopf nicht verfügbar\n"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
++msgstr "bitplane: Fehler beim ByteRun1-Dekomprimieren\n"
+
+-#: src/dxr3/dxr3_decode_video.c:250
+-#, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+-msgstr "dxr3_decode_video: Öffnen des Steuer-Geräts %s (%s) schlug fehl\n"
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++msgstr "bitplane: Anim Opt 1 wird momentan nicht unterstützt\n"
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
+-msgstr "Benutze Pan & Scan Informationen"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++msgstr "bitplane: Anim Opt 2 wird momentan nicht unterstützt\n"
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+-msgstr ""
+-"\"Pan & Scan\" ist ein spezieller Darstellungsmodus, der manchmal in MPEG "
+-"kodiertem Material verwendet wird. Sie können hier wählen, wie solche "
+-"Inhalte behandelt werden sollen.\n"
+-"\n"
+-"only when forced\n"
+-"Pan & Scan nur dann benutzen, wenn die Verwendung vorgeschrieben ist.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Pan & Scan dann benutzen, wenn entsprechende Informationen in den MPEG "
+-"Videostrom eingebettet sind.\n"
+-"use DVB hint\n"
+-"Pan & Scan dann benutzen, wenn entsprechende Informationen in den DVB "
+-"Datenstrom eingebettet sind. Dies benutzt den Active Fromat Descriptor "
+-"(AFD), der in manchen europäischen DVB Datenströmen benutzt wird."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++msgstr "bitplane: Anim ASCIIJ wird momentan nicht unterstützt\n"
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
+-msgstr "Versuche Video mit jedem Bild zu synchonisieren"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
++msgstr "bitplane: Dieser anim-Type wird momentan nicht unterstützt\n"
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"Zeitmarken zur Synchronisationen für jedes Frame erzeugen. Normalerweise ist "
+-"dies nicht nötig, da es zur Synchronisation ausreicht, wenn nur ab und zu "
+-"Zeitmarken erzeugt werden.\n"
+-"Dies ist nur für progressive Videos (die meisten PAL Filme) relevant."
++"w32codec: ICOpen schlug fehl! Unbekannter Codec %08lx / falsche Parameter?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
+-msgstr "Benutze weichen Wiedergabemodus"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++msgstr ""
++"w32codec: ICDecompressGetFormat (%.4s %08lx/%d) schlug fehl: Fehler %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
+-msgstr "Das Aktivieren dieser Option sorgt für eine flüssigere Wiedergabe."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgstr "w32codec: ICDecompressQuery schlug fehl: Fehler %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
+-msgstr "Korrigiere Framedauer in kaputten Streams"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgstr "w32codec: ICDecompressBegin schlug fehl: Fehler %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:288
++#: src/libw32dll/w32codec.c:685
++#, c-format
+ msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"Aktiviert eine Logik zur Korrektur falscher Framedauern in einigen MPEG "
+-"Videos mit falschen Bildwiederholratencodes. Momentan ist eine Korrektur für "
+-"NTSC Ströme implementiert, die fälschlicherweise als PAL markeirt sind. "
+-"Aktivieren Sie dier nur, wenn Sie einen solchen Datenstrom antreffen."
++"w32codec: DS_VideoDecoder schlug fehl! Unbekannter Codec %08lx / falsche "
++"Parameter?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:696
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "dxr3_decode_video: Öffnen des Video-Geräts %s (%s) schlug fehl\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
+-msgstr "dxr3_decode_video: Schreibzugriff würde blockieren. Leeren\n"
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgstr ""
++"w32codec: DMO_VideoDecoder schlug fehl! Unbekannter Codec %08lx / falsche "
++"Parameter?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
+-msgstr "dxr3_decode_video: Schreibzugriff auf Video-Gerät schlug fehl (%s)\n"
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
++msgstr "w32codec: Dekoder startete nicht. Ist '%s' installiert?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgstr "w32codec: (ACM_Decoder) Unpassendes Audioformat\n"
++
++#: src/libw32dll/w32codec.c:1216
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+-msgstr "dxr3_decode_video: WARNUNG: Unbekannter Code für Wiederholrate %d\n"
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgstr "w32codec: (ACM_Decoder) acmStreamOpen Fehler %d\n"
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+-msgstr ""
+-"dxr3_decode_video: WARNUNG: Korrigiere Code für Wiederholrate von PAL zu "
+-"NTSC\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
++msgstr "w32codec: Fehler beim Initialisieren von DirectShow Audio\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
+-msgstr "dxr3_mpeg_encoder: Initialisierung von librte schlug fehl\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
++msgstr "w32codec: Fehler beim Initialisieren von DMO Audio\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
++msgstr "Pfad zu win32-Codecs"
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+-"dxr3_mpeg_encoder: rte unterstützt nur Videoformate, die Vielfache von 16 "
+-"sind\n"
++"Geben Sie hier den Pfad zu den Windows oder Apple Quicktime Codec-Paketen "
++"an, falls sie installiert sind. Falls xine die Windows oder Apple Quicktime "
++"Codecs findet, verwendet xine diese zum dekodieren von verschiedenen Windows "
++"Media- oder Quicktime Datenströmen. Konsultieren Sie die xine FAQ für "
++"weitere Informationen, wie die Codecs zu installieren sind."
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+-msgstr "dxr3_mpeg_encoder: rte-Kontext konnte nicht geholt werden.\n"
++#: src/input/input_rtp.c:182
++#, c-format
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
+-msgstr "dxr3_mpeg_encoder: CODEC konnte nicht erzeugt werden.\n"
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
++msgstr "IP-Adresse für Multicast\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
+-msgstr "Bitrate der librte MPEG Wiedergabe (kBit/s)"
++#: src/input/input_rtp.c:201
++#, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
+-msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
+-msgstr ""
+-"Bitrate für die MPEG-Enkodierungsbibliothek librte zur DXR3 Enkodierung. "
+-"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastung."
++#: src/input/input_rtp.c:209
++#, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:216
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+-msgstr "dxr3_mpeg_encoder: Konnte Kontext nicht initialisieren: %s\n"
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:236
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr "dxr3_mpeg_encoder: Kodierung kann nicht gestartet werden: %s\n"
++msgid "Can't find address for iface %s:%s\n"
++msgstr "Adresse für iface %s nicht gefunden:%s\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+-msgstr "dxr3_mpeg_encoder: FAME-Bibliothek konnte nicht gestartet werden\n"
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) abgbrochen (multicast Kernel?): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
+-msgstr "fame-MPEG-Enkodierungsqualität"
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "Kann '%s' nicht auflösen.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
+-msgstr ""
+-"Die Enkodierungsqualität für die MPEG-Enkodierungsbibliothek libfame. "
+-"Niedrige Werte sind schneller, produzieren aber Artefakte. Höhere Werte "
+-"verwessern die Qualität zu Lasten der CPU-Belastung."
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "Kann keine Verbindung zu '%s' herstellen.\n"
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
+-msgstr "SCR-Plugin Priorität"
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
++msgstr "recv(): %s.\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
+-msgstr ""
+-"Priorität für das DXR3 SCR-Plugin. Werte kleiner 5 führen dazu, daß die UNIX "
+-"Systemuhr zur Synchronisation benutzt wird; Werte größer 5 erzwingen die "
+-"Verwendung der internen Uhr der DXR3 als Synchronisationsquelle."
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
++msgstr "RTP: Stoppe Lese-Thread...\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
+-msgstr "Vertausche gerade und ungerade Zeilen"
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
++msgstr "RTP: Lese-Thread terminiert\n"
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
+-msgstr ""
+-"Vertauscht die geraden und ungeraden Zeiler des Bildes.\n"
+-"Aktivieren Sie diese Option für nicht-MPEG-Material, welches ein vertikales "
+-"Zittern am Bildschirm zeigt."
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
++msgstr "Öffne >Dateiname:%s Port:%d Schnittstelle:%s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
+-msgstr "Schwarze Balken zur Korrektur des Seitenverhältnisses hinzufügen"
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: Kann neuen Thread (%s) nicht erstellen\n"
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
+-msgstr ""
+-"Fügt dem Bild schwarze Balden hinzu, falls die Karte das Seitenverhältnisses "
+-"nicht direkt verarbeiten kann. Dies ist zum wahren korrekter "
+-"Bildeigenschaften nötig."
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "Mit xine ausgeliefertes RTP und UDP Plugin"
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr "Benutze weichen Wiedergabemodus für MPEG-kodierte Wiedergabe"
++#: src/input/mmsh.c:232
++msgid "libmmsh: send error\n"
++msgstr "libmmsh: Sendefehler\n"
+
+-#: src/dxr3/video_out_dxr3.c:272
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
+-msgstr ""
+-"Das Aktivieren dieser Option sorgt für eine flüssigere Wiedergabe von nicht-"
+-"MPEG-Inhalten."
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
++msgstr "libmmsh: Fehlerhaftes Empfangsformat\n"
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "video_out_dxr3: Öffnen des Steuer-Geräts %s (%s) schlug fehl\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "libmmsh: 3xx Weiterleitung nicht implementiert: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "video_out_dxr3: Öffnen des Video-Geräts %s (%s) schlug fehl\n"
+-
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
+-msgstr "Der Enkodierer für nicht-MPEG-Inhalte"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "libmmsh: http-Status ungleich 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
+-msgstr ""
+-"Anderer als MPEG-Inhalte müssen eine zusätzliche Reenkodierungsstufe "
+-"durchlaufen, da die DXR3 nur MPEG verarbeiten kann.\n"
+-"Je nach dem was xine unterstützt, kann diese Einstellung \"fame\", \"rte\" "
+-"\"libavcodec\" oder \"none\" sein.\n"
+-"Der \"libavcoder\" benutzt das ffmpeg Plugin, das bereits mit xine "
+-"ausgeliefert wird, so daß keine zusätzlichen Bibliotheken gebraucht werden. "
+-"libavcoder liefert sogar eine sehr hohe Qualität bei niedriger CPU "
+-"Belastung, weshalb libavcodec besonders empfohlen wird.\n"
+-"\"fame\" und \"rte\" werden noch angeboten, aber die xine-Unterstützung für "
+-"sie ist veraltet und evtl. sogar defekt."
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "libmmsh: Weiterleitung nicht implementiert\n"
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+-msgstr ""
+-"video_out_dxr3: MPEG-Kodierer libavcodec konnte nicht initialisiert werden.\n"
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
++msgstr "Kontaktiere MMS Server (über HTTP)..."
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+-msgstr "video_out_dxr3: MPEG-Kodierer rte konnte nicht initialisiert werden.\n"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
++msgstr "Ungültige URL\n"
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+-msgstr ""
+-"video_out_dxr3: MPEG-Kodierer fame konnte nicht initialisiert werden.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
++msgstr "Nichtunterstütztes Protokoll\n"
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: MPEG-Kodierung deaktiviert.\n"
+-"video_out_dxr3: Das ist unproblematisch für MPEG-Videos wie DVDs, aber\n"
+-"video_out_dxr3: Sie können keine nicht-MPEG-Inhalte mit diesem Video-"
+-"Treiber\n"
+-"video_out_dxr3: wiedergeben. Lesen Sie README.dxr3, um einen Kodierer zu "
+-"konfigurieren.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
++msgstr "Konnte kein Gerät mit einer VCD finden"
+
+-#: src/dxr3/video_out_dxr3.c:367
+-msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: Kein MPEG-Kodierer mitübersetzt.\n"
+-"video_out_dxr3: Das ist unproblematisch für MPEG-Videos wie DVDs, aber\n"
+-"video_out_dxr3: Sie können keine nicht-MPEG-Inhalte mit diesem Video-"
+-"Treiber\n"
+-"video_out_dxr3: wiedergeben. Lesen Sie README.dxr3, um einen Kodierer zu "
+-"konfigurieren.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
++msgstr "Es wurde ein NULL-Klassenparameter übergeben"
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
+-msgstr "Videoausgabemodus (TV oder Overlay)"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
++msgstr "Ungültiger Eintragstyp"
+
+-#: src/dxr3/video_out_dxr3.c:383
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+-"Legt fest, wie die DXR3 das endgültige Video ausgeben soll. Gültige Werte "
+-"sind:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Video wird nur über den TV-Ausgang ausgegeben. Dieser Modus wird für normale "
+-"4:3 Fernseher benutzt. Anamorphische (16:9) Videos werden gestaucht "
+-"wiedergegeben, Pan&Scan-Material wird links und rechts beschnitten. Dies ist "
+-"die Standardeinstellung zum Fernsehen und verhält sich wie ein "
+-"eigenständiger DVD Player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Video wird nur über den TV-Ausgang ausgegeben. Dieser Modus wird für 16:9 "
+-"Breitbildfernseher benutzt. Anamorphische und Pan&Scan-Inhalte füllen das "
+-"ganz Bildschirm aus, aber das Seitenverhältnis muß manuell auf 16:9 gestellt "
+-"werden.\n"
+-"letterboxed overlay\n"
+-"Overlay Videoausgabe auf dem Computerbildschirm mit optionaler "
+-"Sofortumschaltung auf TV-Ausgabe durch Verstecken des Videofensters. Das "
+-"Overlay wird mit schwarzen Rändern angezeigt, falls es anamorph (16:9) ist.\n"
+-"Diese Einstellung ist nur in den seltenen Fällen nützlich, wenn DVD "
+-"Untertitel nur korrekt im \"letterboxed\"-Modus dargestellt werden. Ein "
+-"gutes Beispiel dafür ist die animierte Kommentatorensilhouletten in "
+-"\"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Videoausgabe auf dem Computerbildschirm mit optionaler "
+-"Sofortumschaltung auf TV-Ausgabe durch Verstecken des Videofensters. Dies "
+-"ist die Standardvariante bei DXR3 Overlays."
+-
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
+-msgstr "Farbwert für Overlay"
++"Video-CD Plugin mit PBC und Unterstützung für (X)VCD, (X)SVCD, HQVCD, "
++"CVD, ... "
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
+-msgstr ""
+-"Hexadezimaler RGB-Wert für Farbschlüssel.\n"
+-"Sie können verschiedene Werte probieren, falls bei der Benutzung des DXR3-"
+-"Overlaymodus Fenster transparent werden."
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
++msgstr "Auswahl hat keinen RETURN-Eintrag"
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
+-msgstr "Farbvarianz für Overlay"
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++#, fuzzy
++msgid "DEFAULT selected, but PBC is not on."
++msgstr "DEFAULT ausgewählt, aber PBC ist nicht an."
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
+-msgstr ""
+-"Ein höherer Wert vergrößert die Toleranz für deb Farbschüssel.\n"
+-"Sie können niedrigere Werte probieren, falls bei der Benutzung des DXR3-"
+-"Overlaymodus Fenster transparent werden; bei zu niedrigen Werten können "
+-"teile der Bildränder verschwinden."
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
++msgstr "Auswahl hat keinen NEXT-Eintrag"
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
+-msgstr "Beschneidet den Overlaybereich oben und unten"
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
++msgstr "Auswahl hat keinen PREVIOUS-Eintrag"
+
+-#: src/dxr3/video_out_dxr3.c:442
+-msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
+-msgstr ""
+-"Entfernt eine Pixelzeile am oberen und unteren Rand des Overlays. Aktivieren "
+-"Sie dies, falls Sie grüne Linien am oberen oder unteren Rand sehen."
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
++msgstr "Unbekannter Ereignistyp"
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+-msgstr "video_out_dxr3: Starten Sie autocal, Überlagerung deaktiviert\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
++msgstr "Die vorherige Nachricht hat einen unbekannten Log-Level"
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
+-msgstr "Bevorzugter TV-Modues"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
++msgstr "Standardtyp für die Benuztung bei automatischer VCD-Wiedergabe"
+
+-#: src/dxr3/video_out_dxr3.c:456
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+-"Wählt den TV-Modus der DXR3. Die Werte bedeuten:\n"
+-"\n"
+-"ntsc: NTSC bei 60Hz\n"
+-"pal: PAL bei 50Hz\n"
+-"pal60: PAL bei 60Hz\n"
+-"default: Einstellungen der Karte beibehalten"
++"Welches Wiedergabegerät benutzt werden soll, falls keins in der MRL "
++"angegeben ist (z.B. vcd:// oder vcd:///dev/dvd:)"
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
+-msgstr "video_out_dxr3: Setzen des Videomodus schlug fehl.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
++msgstr "Zu benutzendes Standard CD-Laufwerk, wenn keins angegeben ist"
+
+-#: src/dxr3/video_out_dxr3.c:708
++#: src/input/vcd/xineplug_inp_vcd.c:1713
+ msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
+-msgstr ""
+-"video_out_dxr3: Benötige einen MPEG-Kodierer zum Abspielen von nicht-MPEG-"
+-"Videos on dxr3\n"
+-"video_out_dxr3: Lesen Sie README.dxr3 für Details.\n"
+-
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+-"video_out_dxr3: Fehler beim Lesen der Überlagerungsdatei. Starten Sie "
+-"autocal!\n"
++"Welches Laufwerk benutzt werden soll, falls kein angegeben ist. Falls die "
++"Einstellung leer ist, wird xine nach CD-Laufwerken suchen."
+
+-#: src/input/input_cdda.c:1494
+-#, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "%s: Kann keine Verbindung zu '%s:%d' aufbauen\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
++msgstr "Positiver Schieberbereich"
+
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cdda: Verbindung zum CDDB-Server '%s:%d' steht.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
++msgstr "Der Bereich, den der Positionsschieber bei Wiedergabe repräsentiert."
+
+-#: src/input/input_cdda.c:1545
+-#, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr ""
+-"input_cdda: Kann keine Verbindung zum CDDB-Server '%s:%d' (%s) herstellen.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
++msgstr "Vorzeitiges Caching benutzen?"
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
+-msgstr "CD Digital Audio (CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
++msgstr "Kann zu ruckliger Wiedergabe auf leistungsschwachen Rechnern führen."
+
+-#: src/input/input_cdda.c:2586
+-msgid "device used for CD audio"
+-msgstr "Gerät für CD-Audio"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
++msgstr "Automatisch Spur/Eintrag weiterschalten"
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1744
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
+-"Pfadangabe zum Gerät (normalerweise CD oder DVD Laufwerk), das zur "
+-"Wiedergabe von Audio-CDs benutzt werden soll."
++"Falls ausgewählt, wird automatisch zum nächsten Eintrag oder Spur "
++"weitergeschaltet. Wird nur benutzt, wenn die Wiedergabekontrolle PBC nicht "
++"aktiviert ist."
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
+-msgstr "CDDB abfragen"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr "'Ablegehnte' LIDs anzeigen"
+
+-#: src/input/input_cdda.c:2593
++#: src/input/vcd/xineplug_inp_vcd.c:1754
+ msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+-"Aktiviert CDDB-Abfragen zum abfragen von Titelinformationen für Audio-CDs.\n"
+-"Vergessen Sie nicht, daß sofern Sie keine private CDDB benutzen, diese "
+-"Informationen von einem Internetserver bezogen werden, der ein Profil Ihrer "
+-"Hörgewohnheiten erstellen kann."
++"Einige IDs in Wiedergabelisten (LIDs) sind als nicht-anzeigbar markiert. Bei "
++"Anwahl dieser Option werden sie trozem angezeigt und mit einem Stern (*) am "
++"Ende der MRL gekennzeichnet."
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
+-msgstr "CDDB Servername"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
++msgstr "Formatvorlage für Fenstertitle"
+
+-#: src/input/input_cdda.c:2601
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+-"Der CDDB-Server, von dem Titelinformationen bezogen werden.\n"
+-"Diese Einstellung ist Sicherheitskritisch, da der Server Informationen zu "
+-"Ihren Hörgewohnheiten erhält und bösartige Antworten senden kann. Geben Sie "
+-"nur einen Server ihres Vertrauens an."
++"Format für den GUI-Titel. Ähnlich dem UNIX-date-Kommando starten "
++"Formatfelder mit einem Prozentzeichen. Formatfelder sind %A, %C, %c, %F, %I, "
++"%L, %N, %P, %p, %S, %T, %V, %v, and %%."
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
+-msgstr "CDDB Serverport"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
++msgstr "Formatvorlage für Datenstrom-Kommentarfeld."
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
+-msgstr "Der Serverport, vom dem Titelinformationen bezogen werden sollen."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
++msgstr "Bitfeld für Fehlersuche"
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
+-msgstr "CDDB Cacheverzeichnis"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
++msgstr "Als Bitfeld interpretiert gibt der Wert eine Maske zur Fehlersuche an."
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
+-msgstr ""
+-"Die Antworten des CDDB-Servers werden in diesem Verzeichnis "
+-"zwischengepuffert.\n"
+-"Diese Einstellung ist Sicherheitskritisch, da Dateien mit unkontrollierten "
+-"Namen innerhalb dieses Verzeichnises angelegt werden. Stellen Sie sicher, "
+-"daß das Verzeichnis nur für CDDB Zwischenpufferung genutzt wird."
++#: src/input/vcd/vcdio.c:217
++#, fuzzy
++msgid "SEEK_CUR not implemented for non-zero offset"
++msgstr "SEEK_CUR nicht implementiert für Versatz != 0"
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
+-msgstr "Laufwerk auf diesen Faktor verlangsamen"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
++msgstr "SEEK_END noch nicht implementiert."
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
+-msgstr ""
+-"Da einige CD- und DVD-Laufwerke durch hohe Umdrehungsgeschwindigkeiten viel "
+-"Lärm produzieren, versucht xine sie zu bremsen. Für die Standardwiedergabe "
+-"von CDs und DVDs werden keine hohen Datenraten benötigt, die eine hohe "
+-"Umdrehungsgeschwindigkeiten erfordern, weshalb das bremsen keinen Einfluß "
+-"auf die Wiedergabeleistung haben sollte.\n"
+-"Ein Wert von Null deaktiviert das Bremsen."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
++msgstr "Suchen noch nicht implementiert für"
+
+-#: src/input/input_dvb.c:834
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
++msgstr "Fehlerhaften Elementtyp"
++
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
++msgstr "Fehlerhafte Eintragsnummer"
++
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
++msgstr "Fehlerhafte Segmentnummer"
++
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
++msgstr "Fehler beim lesen der aktuellen Segmentnummer"
++
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
++msgstr "Sollte bereis konvertiert worden sein"
++
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr "input_dvd: Gerät %s konnte zum Auswerfen nicht geöffnet werden\n"
++
++#: src/input/input_dvb.c:838
+ #, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_dvb: Öffnen der DVB-Kanaldatei '%s' schlug fehl\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_dvb: tuner_set_channel schlug fehl\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvb: Kann DVB-Gerät nicht öffnen\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr "input_dvb: Kanal %d außerhalb des Bereis, benutzt 0\n"
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_dvb: Suche nach Kanal %s\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+ "input_dvb: Keine exakte Übereinstimmung für %s gefunden: versuche teilweise "
+ "Übereinstimmung\n"
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_dvb: Übereinstimmung mit Kanal %s gefunden\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, fuzzy, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr "input_dvb: Kanal %s nicht in channels.conf gefunden, benutze Kanal 0\n"
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ #, fuzzy
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr "input_dvb: Ungültige Kanalspezifikation, benutze Kanal 0\n"
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr "input_dvb: Ungültige Kanalspezifikation, benutze Kanal 0\n"
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+@@ -1401,7 +1904,7 @@
+ "input_dvb: DVB-S MRL angegeben, aber Tuner scheint kein QPSK (DVB-S) zu "
+ "sein\n"
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+@@ -1409,28 +1912,28 @@
+ "input_dvb: DVB-T MRL angegeben, aber Tuner scheint kein OFDM (DVB-T) zu "
+ "sein\n"
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+ "input_dvb: DVB-C MRL angegeben, aber Tuner scheint kein QAM (DVB-C) zu sein\n"
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvb: Kann DVR-Gerät '%s' nicht öffnen\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: Kann neuen Thread (%s) nicht erstellen\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr "Benutze DVB 'center cutout' (Zoom)"
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+@@ -1438,58 +1941,58 @@
+ "Dies erlaubt Vollbildwiedergabe von 4:3 Inhalten, die in 16:9 übertragen "
+ "werden."
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "DVB (Digital TV) Plugin"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ #, fuzzy
+ msgid "Last DVB channel viewed"
+ msgstr "DVB Kanalnamen anzeigen"
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ #, fuzzy
+ msgid "Number of dvb card to use."
+ msgstr "Anzahl der Audiopuffer"
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr "input_dvd: Werte von \\beta werden dom erhöhen!\n"
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr "input_dvd: Fehler beim Lesen des nächsten Blocks von DVD (%s)\n"
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: Fehler beim Öffnen des DVD-Geräts\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ msgid "device used for DVD playback"
+ msgstr "Gerät für DVD Wiedergabe"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+@@ -1497,11 +2000,11 @@
+ "Pfadangabe zum Gerät (normalerweise ein DVD Laufwerk), das zur Wiedergabe "
+ "von DVDs benutzt werden soll."
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr "Pfad zum RAW-Device des DVD-Laufwerks"
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1519,11 +2022,11 @@
+ "Lesen Sie die Dokumentation zu RAW-Devices (man raw) für weitere "
+ "Informationen."
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr "CSS Entschlüsselungsmethode"
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+@@ -1534,11 +2037,11 @@
+ "Methoden, falls Probleme bei der Wiedergabe von verschlüsselten DVDs "
+ "auftreten."
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr "Pfad zum Titelschlüsselcache"
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1554,11 +2057,11 @@
+ "daß das Verzeichnis nur für die Zwischenpufferung von DVD Titelschlüssel "
+ "genutzt wird."
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr "Region (1-8), aus der der DVD Player zu kommen scheint"
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+@@ -1568,11 +2071,11 @@
+ "sich über ein falscher Regionscode beschwert wird. Dies hat nichts mit dem "
+ "Regionscode im DVD-Laufwerk zu tun, dies ist nur für die Software."
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr "Standardsprache für die DVD-Wiedergabe"
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+@@ -1582,11 +2085,11 @@
+ "DVD dies unterstützt, werden Menüs und Titel in dieser Sparche angezeigt.\n"
+ "Der Wert muß ein zweibuchstabiger ISO639-Sprachcode sein."
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr "Vorauseilendes Caching benutzen"
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+@@ -1596,11 +2099,11 @@
+ "Dies kann bei langsamen Laufwerken zu einer stotternden Wiedergabe führen, "
+ "verbessert aber den Einfluß von DVD-Ebenenwechseln bei schnellen Laufwerken."
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr "Einheit für die Überspringen-Aktion"
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1635,11 +2138,11 @@
+ "Überspringt eine DVD-Titel, was eine Struktureinheit ist, die einem "
+ "kompletten DVD Film entspricht"
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr "Einheit beim Suchen"
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1663,157 +2166,168 @@
+ "Der Suchbereich umfaßt ein DVD-Programm, was eine Navigationseinheit ist, "
+ "die einem Kapitel des aktuellen Films entspricht"
+
+-#: src/input/input_file.c:127
+-#, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: Lesefehler (%s)\n"
++#: src/input/input_stdin_fifo.c:161
++#, fuzzy, c-format
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr "Standardeingabe: Kann nicht zurückspulen! (%lld > %lld)\n"
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_file: Zugriff verweigert: >%s<\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "Standardeingabe: Öffnen von '%s' schlug fehl\n"
+
+-#: src/input/input_file.c:286
+-#, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: Datei nicht gefunden: >%s<\n"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr "Standardeingabe Streaming-Plugin"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr "Datei Plugin"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
++msgstr "MMS-Streaming-Plugin"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
+-msgstr "Startverzeichnis für Dateisuche"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
++msgstr "Netzwerkbandbreite"
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
+-msgstr "Die Dateiauswahl startet an dieser angegebenen Pfadposition"
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
++msgstr ""
++"Geben Sie hier die Bandbreite Ihrer Internetverbindung an. Dies wird "
++"benutzt, falls Streaming-Server verschiedene Versionen eines Datenstroms mit "
++"unterschiedlichen Bandbreitenanforderungen anbieten."
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
+-msgstr "Versteckte Dateien anzeigen"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
++msgstr "MMS-Protokoll"
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
+-msgstr "Fals aktiviert zeigt die Dateiauswahl auch versteckte Dateien."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
++msgstr ""
++"Wählt das Protokoll über MMS.\n"
++"TCP ist besser, aber hinter einer Firewall kann HTTP benötigt werden."
+
+-#: src/input/input_gnome_vfs.c:218
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "Mit xine ausgeliefertes gnome-vfs Plugin"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr "Puffern..."
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr "PNM Streaming-Plugin"
++
++#: src/input/input_http.c:174
+ #, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_http: gethostbyname(%s) schlug fehl: %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: Lesefehler %d\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr "Kontaktiere HTTP Server..."
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: Ungültige http-Antwort\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: 3xx Weiterleitung : >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: http-Status ungleich 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: Inhaltslänge = %Ld bytes\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr "http Plugin"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr "HTTP Proxy Rechnername"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr "Der Rechnername des HTTP Proxys."
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr "HTTP Proxy Portnummer"
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr "Die Portnummer des HTTP Proxys."
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr "HTTP Proxy Benutzername"
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr "Der Benutzername für den HTTP Proxy."
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr "HTTP Proxy Passwort"
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr "Das Passwort für den HTTP Proxy."
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++#, fuzzy
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr "Domains, die den HTTP Proxy umgehen"
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+-"Eine kommaseparierte Liste von Domainnamen, bei denen der Proxy ignoriert "
+-"werden soll."
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
+-msgstr "MMS-Streaming-Plugin"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
++msgstr "rtsp: Fehlerhafte mrl: %s\n"
+
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
+-msgstr "Netzwerkbandbreite"
++#: src/input/librtsp/rtsp.c:507
++#, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "rtsp: Kann keine Verbindung zu '%s' aufbauen\n"
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
+-"Geben Sie hier die Bandbreite Ihrer Internetverbindung an. Dies wird "
+-"benutzt, falls Streaming-Server verschiedene Versionen eines Datenstroms mit "
+-"unterschiedlichen Bandbreitenanforderungen anbieten."
++#: src/input/librtsp/rtsp_session.c:84
++#, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "rtsp_session: Kann keine Verbindung zum Server %s aufbauen\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
+-msgstr "MMS-Protokoll"
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
++msgstr "rtsp_session: Sitzung kann nicht eingerichtet werden.\n"
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
+-msgstr ""
+-"Wählt das Protokoll über MMS.\n"
+-"TCP ist besser, aber hinter einer Firewall kann HTTP benötigt werden."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
++msgstr "rtsp_session: RTSP-Servertyp '%s' wird nicht unterstützt. Ups.\n"
++
++#: src/input/input_gnome_vfs.c:218
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "Mit xine ausgeliefertes gnome-vfs Plugin"
+
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+@@ -1825,156 +2339,41 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: Kann '%s' nicht auflösen.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: Kann keine Verbindung zu '%s' herstellen.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "Mit xine ausgeliefertes net Plugin"
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr "PNM Streaming-Plugin"
+-
+-#: src/input/input_pvr.c:604
+-#, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_pvr: Fehler beim Erstellen der PVR-Datei (%s)\n"
+-
+-#: src/input/input_pvr.c:761
+-#, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_pvr: Fehler beim Öffnen der PVR-Datei (%s)\n"
+-
+-#: src/input/input_pvr.c:837
+-#, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_pvr: Lesefehler (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_pvr: Fehler beim Öffnen der Geräts %s\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: IVTV_IOC_G_CODEC schlug fehl, vielleicht API-Änderung?\n"
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: IVTV_IOC_S_CODEC schlug fehl, vielleicht API-Änderung?\n"
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr "WinTV-PVR 250/350 Plugin"
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr "Gerät für WinTV-PVR 250/350 (PVR) Plugin"
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr "Pfadangame zum Gerät der WinTV-Karte"
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr "IP-Adresse für Multicast\n"
+-
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr "Adresse für iface %s nicht gefunden:%s\n"
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) abgbrochen (multicast Kernel?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "Kann '%s' nicht auflösen.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "Kann keine Verbindung zu '%s' herstellen.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, c-format
+-msgid "recv(): %s.\n"
+-msgstr "recv(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr "RTP: Stoppe Lese-Thread...\n"
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr "RTP: Lese-Thread terminiert\n"
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr "Öffne >Dateiname:%s Port:%d Schnittstelle:%s<\n"
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: Kann neuen Thread (%s) nicht erstellen\n"
+-
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "Mit xine ausgeliefertes RTP und UDP Plugin"
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr "RTSP Streaming-Plugin"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
+-#, fuzzy, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
+-msgstr "Standardeingabe: Kann nicht zurückspulen! (%lld > %lld)\n"
++#: src/input/pnm.c:617
++#, c-format
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
++msgstr ""
++"input_pnm: Während dem Lesen ist eine Nachricht vom Server eingetroffen:\n"
++"%s\n"
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "Standardeingabe: Öffnen von '%s' schlug fehl\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_pnm: Kann keine Verbindung zu '%s' herstellen.\n"
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr "Standardeingabe Streaming-Plugin"
++#: src/input/pnm.c:766
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_pnm: Datenstrom konnte nicht eingerichtet werden\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -2016,6 +2415,119 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr "Pfad zum Video4Linux Radiogerät"
+
++#: src/input/mms.c:650
++msgid "Connecting MMS server (over tcp)..."
++msgstr "Kontaktiere MMS Server (über TCP)..."
++
++#: src/input/input_cdda.c:1494
++#, c-format
++msgid "%s: can't connect to %s:%d\n"
++msgstr "%s: Kann keine Verbindung zu '%s:%d' aufbauen\n"
++
++#: src/input/input_cdda.c:1540
++#, c-format
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cdda: Verbindung zum CDDB-Server '%s:%d' steht.\n"
++
++#: src/input/input_cdda.c:1545
++#, c-format
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++msgstr ""
++"input_cdda: Kann keine Verbindung zum CDDB-Server '%s:%d' (%s) herstellen.\n"
++
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
++msgstr "CD Digital Audio (CDDA)"
++
++#: src/input/input_cdda.c:2586
++msgid "device used for CD audio"
++msgstr "Gerät für CD-Audio"
++
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
++msgstr ""
++"Pfadangabe zum Gerät (normalerweise CD oder DVD Laufwerk), das zur "
++"Wiedergabe von Audio-CDs benutzt werden soll."
++
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
++msgstr "CDDB abfragen"
++
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
++msgstr ""
++"Aktiviert CDDB-Abfragen zum abfragen von Titelinformationen für Audio-CDs.\n"
++"Vergessen Sie nicht, daß sofern Sie keine private CDDB benutzen, diese "
++"Informationen von einem Internetserver bezogen werden, der ein Profil Ihrer "
++"Hörgewohnheiten erstellen kann."
++
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
++msgstr "CDDB Servername"
++
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
++msgstr ""
++"Der CDDB-Server, von dem Titelinformationen bezogen werden.\n"
++"Diese Einstellung ist Sicherheitskritisch, da der Server Informationen zu "
++"Ihren Hörgewohnheiten erhält und bösartige Antworten senden kann. Geben Sie "
++"nur einen Server ihres Vertrauens an."
++
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
++msgstr "CDDB Serverport"
++
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
++msgstr "Der Serverport, vom dem Titelinformationen bezogen werden sollen."
++
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
++msgstr "CDDB Cacheverzeichnis"
++
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
++msgstr ""
++"Die Antworten des CDDB-Servers werden in diesem Verzeichnis "
++"zwischengepuffert.\n"
++"Diese Einstellung ist Sicherheitskritisch, da Dateien mit unkontrollierten "
++"Namen innerhalb dieses Verzeichnises angelegt werden. Stellen Sie sicher, "
++"daß das Verzeichnis nur für CDDB Zwischenpufferung genutzt wird."
++
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
++msgstr "Laufwerk auf diesen Faktor verlangsamen"
++
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
++msgstr ""
++"Da einige CD- und DVD-Laufwerke durch hohe Umdrehungsgeschwindigkeiten viel "
++"Lärm produzieren, versucht xine sie zu bremsen. Für die Standardwiedergabe "
++"von CDs und DVDs werden keine hohen Datenraten benötigt, die eine hohe "
++"Umdrehungsgeschwindigkeiten erfordern, weshalb das bremsen keinen Einfluß "
++"auf die Wiedergabeleistung haben sollte.\n"
++"Ein Wert von Null deaktiviert das Bremsen."
++
+ #: src/input/input_vcd.c:849
+ msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+ msgstr "input_vcd: Ungültige MRL: Benutze vcdo:/<Track #>\n"
+@@ -2051,2072 +2563,1342 @@
+ "Pfadangabe zum Gerät (normalerweise CD oder DVD Laufwerk), das zur "
+ "Wiedergabe von Video-CDs benutzt werden soll."
+
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr "input_dvd: Gerät %s konnte zum Auswerfen nicht geöffnet werden\n"
+-
+-#: src/input/mms.c:646
+-msgid "Connecting MMS server (over tcp)..."
+-msgstr "Kontaktiere MMS Server (über TCP)..."
+-
+-#: src/input/mmsh.c:232
+-msgid "libmmsh: send error\n"
+-msgstr "libmmsh: Sendefehler\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr "libmmsh: Fehlerhaftes Empfangsformat\n"
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
++msgstr "RTSP Streaming-Plugin"
+
+-#: src/input/mmsh.c:283
++#: src/input/input_pvr.c:604
+ #, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "libmmsh: 3xx Weiterleitung nicht implementiert: >%d %s<\n"
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_pvr: Fehler beim Erstellen der PVR-Datei (%s)\n"
+
+-#: src/input/mmsh.c:290
++#: src/input/input_pvr.c:761
+ #, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "libmmsh: http-Status ungleich 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "libmmsh: Weiterleitung nicht implementiert\n"
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr "Kontaktiere MMS Server (über HTTP)..."
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr "Ungültige URL\n"
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr "Nichtunterstütztes Protokoll\n"
+-
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr "Puffern..."
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_pvr: Fehler beim Öffnen der PVR-Datei (%s)\n"
+
+-#: src/input/pnm.c:617
++#: src/input/input_pvr.c:837
+ #, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
+-msgstr ""
+-"input_pnm: Während dem Lesen ist eine Nachricht vom Server eingetroffen:\n"
+-"%s\n"
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_pvr: Lesefehler (%s)\n"
+
+-#: src/input/pnm.c:755
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+ #, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
+-msgstr "input_pnm: Kann keine Verbindung zu '%s' herstellen.\n"
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_pvr: Fehler beim Öffnen der Geräts %s\n"
+
+-#: src/input/pnm.c:766
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_pnm: Datenstrom konnte nicht eingerichtet werden\n"
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: IVTV_IOC_G_CODEC schlug fehl, vielleicht API-Änderung?\n"
+
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr "rtsp: Fehlerhafte mrl: %s\n"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: IVTV_IOC_S_CODEC schlug fehl, vielleicht API-Änderung?\n"
+
+-#: src/input/librtsp/rtsp.c:507
+-#, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "rtsp: Kann keine Verbindung zu '%s' aufbauen\n"
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
++msgstr "WinTV-PVR 250/350 Plugin"
+
+-#: src/input/librtsp/rtsp_session.c:84
+-#, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "rtsp_session: Kann keine Verbindung zum Server %s aufbauen\n"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
++msgstr "Gerät für WinTV-PVR 250/350 (PVR) Plugin"
+
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr "rtsp_session: Sitzung kann nicht eingerichtet werden.\n"
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
++msgstr "Pfadangame zum Gerät der WinTV-Karte"
+
+-#: src/input/librtsp/rtsp_session.c:135
++#: src/input/input_file.c:127
+ #, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr "rtsp_session: RTSP-Servertyp '%s' wird nicht unterstützt. Ups.\n"
+-
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr "SEEK_CUR nicht implementiert für Versatz != 0"
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
+-msgstr "SEEK_END noch nicht implementiert."
+-
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
+-msgstr "Suchen noch nicht implementiert für"
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: Lesefehler (%s)\n"
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
+-msgstr "Fehlerhaften Elementtyp"
++#: src/input/input_file.c:282
++#, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_file: Zugriff verweigert: >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
+-msgstr "Fehlerhafte Eintragsnummer"
++#: src/input/input_file.c:286
++#, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: Datei nicht gefunden: >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
+-msgstr "Fehlerhafte Segmentnummer"
++#: src/input/input_file.c:510
++msgid "file input plugin"
++msgstr "Datei Plugin"
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
+-msgstr "Fehler beim lesen der aktuellen Segmentnummer"
++#: src/input/input_file.c:872
++msgid "file browsing start location"
++msgstr "Startverzeichnis für Dateisuche"
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
+-msgstr "Sollte bereis konvertiert worden sein"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
++msgstr "Die Dateiauswahl startet an dieser angegebenen Pfadposition"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
+-msgstr "Konnte kein Gerät mit einer VCD finden"
++#: src/input/input_file.c:880
++msgid "list hidden files"
++msgstr "Versteckte Dateien anzeigen"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
+-msgstr "Es wurde ein NULL-Klassenparameter übergeben"
++#: src/input/input_file.c:881
++msgid ""
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
++msgstr "Fals aktiviert zeigt die Dateiauswahl auch versteckte Dateien."
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
+-msgstr "Ungültiger Eintragstyp"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
++msgstr "Vertausche gerade und ungerade Zeilen"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+-"Video-CD Plugin mit PBC und Unterstützung für (X)VCD, (X)SVCD, HQVCD, "
+-"CVD, ... "
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
+-msgstr "Auswahl hat keinen RETURN-Eintrag"
+-
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
+-msgstr "DEFAULT ausgewählt, aber PBC ist nicht an."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr "Auswahl hat keinen DEFAULT-Eintrag"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr "Auswahl hat keinen NEXT-Eintrag"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr "Auswahl hat keinen PREVIOUS-Eintrag"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr "Unbekannter Ereignistyp"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr "Die vorherige Nachricht hat einen unbekannten Log-Level"
++"Vertauscht die geraden und ungeraden Zeiler des Bildes.\n"
++"Aktivieren Sie diese Option für nicht-MPEG-Material, welches ein vertikales "
++"Zittern am Bildschirm zeigt."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
+-msgstr "Standardtyp für die Benuztung bei automatischer VCD-Wiedergabe"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
++msgstr "Schwarze Balken zur Korrektur des Seitenverhältnisses hinzufügen"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+-"Welches Wiedergabegerät benutzt werden soll, falls keins in der MRL "
+-"angegeben ist (z.B. vcd:// oder vcd:///dev/dvd:)"
++"Fügt dem Bild schwarze Balden hinzu, falls die Karte das Seitenverhältnisses "
++"nicht direkt verarbeiten kann. Dies ist zum wahren korrekter "
++"Bildeigenschaften nötig."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr "Zu benutzendes Standard CD-Laufwerk, wenn keins angegeben ist"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
++msgstr "Benutze weichen Wiedergabemodus für MPEG-kodierte Wiedergabe"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
++#: src/dxr3/video_out_dxr3.c:272
+ msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+-"Welches Laufwerk benutzt werden soll, falls kein angegeben ist. Falls die "
+-"Einstellung leer ist, wird xine nach CD-Laufwerken suchen."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr "Positiver Schieberbereich"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr "Der Bereich, den der Positionsschieber bei Wiedergabe repräsentiert."
++"Das Aktivieren dieser Option sorgt für eine flüssigere Wiedergabe von nicht-"
++"MPEG-Inhalten."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr "Vorzeitiges Caching benutzen?"
++#: src/dxr3/video_out_dxr3.c:280
++#, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "video_out_dxr3: Öffnen des Steuer-Geräts %s (%s) schlug fehl\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
+-msgstr "Kann zu ruckliger Wiedergabe auf leistungsschwachen Rechnern führen."
++#: src/dxr3/video_out_dxr3.c:288
++#, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "video_out_dxr3: Öffnen des Video-Geräts %s (%s) schlug fehl\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
+-msgstr "Automatisch Spur/Eintrag weiterschalten"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
++msgstr "Der Enkodierer für nicht-MPEG-Inhalte"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
++#: src/dxr3/video_out_dxr3.c:331
++#, fuzzy
+ msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+-"Falls ausgewählt, wird automatisch zum nächsten Eintrag oder Spur "
+-"weitergeschaltet. Wird nur benutzt, wenn die Wiedergabekontrolle PBC nicht "
+-"aktiviert ist."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
+-msgstr "'Ablegehnte' LIDs anzeigen"
++"Anderer als MPEG-Inhalte müssen eine zusätzliche Reenkodierungsstufe "
++"durchlaufen, da die DXR3 nur MPEG verarbeiten kann.\n"
++"Je nach dem was xine unterstützt, kann diese Einstellung \"fame\", \"rte\" "
++"\"libavcodec\" oder \"none\" sein.\n"
++"Der \"libavcoder\" benutzt das ffmpeg Plugin, das bereits mit xine "
++"ausgeliefert wird, so daß keine zusätzlichen Bibliotheken gebraucht werden. "
++"libavcoder liefert sogar eine sehr hohe Qualität bei niedriger CPU "
++"Belastung, weshalb libavcodec besonders empfohlen wird.\n"
++"\"fame\" und \"rte\" werden noch angeboten, aber die xine-Unterstützung für "
++"sie ist veraltet und evtl. sogar defekt."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+-"Einige IDs in Wiedergabelisten (LIDs) sind als nicht-anzeigbar markiert. Bei "
+-"Anwahl dieser Option werden sie trozem angezeigt und mit einem Stern (*) am "
+-"Ende der MRL gekennzeichnet."
++"video_out_dxr3: MPEG-Kodierer libavcodec konnte nicht initialisiert werden.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr "Formatvorlage für Fenstertitle"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++msgstr "video_out_dxr3: MPEG-Kodierer rte konnte nicht initialisiert werden.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+-"Format für den GUI-Titel. Ähnlich dem UNIX-date-Kommando starten "
+-"Formatfelder mit einem Prozentzeichen. Formatfelder sind %A, %C, %c, %F, %I, "
+-"%L, %N, %P, %p, %S, %T, %V, %v, and %%."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr "Formatvorlage für Datenstrom-Kommentarfeld."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
+-msgstr "Bitfeld für Fehlersuche"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
+-msgstr "Als Bitfeld interpretiert gibt der Wert eine Maske zur Fehlersuche an."
+-
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
+-msgstr "HILFE! Ein nur-Mono-Audiogerät?!\n"
+-
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
+-msgstr "A/52 Lautstärke"
++"video_out_dxr3: MPEG-Kodierer fame konnte nicht initialisiert werden.\n"
+
+-#: src/liba52/xine_decoder.c:781
++#: src/dxr3/video_out_dxr3.c:361
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+-"Mit A/52 Audio kann die Lautstärke auf Dekoderebene verändert werden. Dies "
+-"hat den Vorteil, daß die Audiodaten bereits für die spezifische Lautstärke "
+-"dekodiert sind und nachfolgende Operationen wie Heruntermischen direkt mit "
+-"diesen Audiodaten arbeiten können."
+-
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
+-msgstr "Benutze dynamische A/52 Bereichskomprimierung"
++"video_out_dxr3: MPEG-Kodierung deaktiviert.\n"
++"video_out_dxr3: Das ist unproblematisch für MPEG-Videos wie DVDs, aber\n"
++"video_out_dxr3: Sie können keine nicht-MPEG-Inhalte mit diesem Video-"
++"Treiber\n"
++"video_out_dxr3: wiedergeben. Lesen Sie README.dxr3, um einen Kodierer zu "
++"konfigurieren.\n"
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:367
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+-"Dynamische Bereichskomprimierung reduziert den dynamischen Bereich des Tons: "
+-"Laute Geräusche klingen leiser und leise Geräusche klingen lauter. Dies "
+-"ermöglicht ein besseres Verständnis des Tons in lauten Umgebungen, ohne "
+-"dabei andere zu stören."
++"video_out_dxr3: Kein MPEG-Kodierer mitübersetzt.\n"
++"video_out_dxr3: Das ist unproblematisch für MPEG-Videos wie DVDs, aber\n"
++"video_out_dxr3: Sie können keine nicht-MPEG-Inhalte mit diesem Video-"
++"Treiber\n"
++"video_out_dxr3: wiedergeben. Lesen Sie README.dxr3, um einen Kodierer zu "
++"konfigurieren.\n"
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
+-msgstr "Heruntermischen zu Zweikanal Stereo Raumklang"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
++msgstr "Videoausgabemodus (TV oder Overlay)"
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:383
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+-"Aktivieren sie dies, falls Sie Mehrkanal-Raumklang anhören wollen, aber nur "
+-"zwei Lautsprecher oder einen Surround-Dekodierer haben, der Matrix-Surround-"
+-"Dekodierung wie ProLogic unterstützt, damit die zusätzlichen Kanäle in das "
+-"Stereo-Signal gemixt werden."
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
+-msgstr "libfaad: libfaad faadDecOpne() schlug fehl.\n"
+-
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr "libfaad: libfaad faacDecInit2 schlug fehl.\n"
+-
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
+-msgstr "libfaad: libfaad faacDecInit schlug fehl.\n"
++"Legt fest, wie die DXR3 das endgültige Video ausgeben soll. Gültige Werte "
++"sind:\n"
++"\n"
++"letterboxed tv\n"
++"Video wird nur über den TV-Ausgang ausgegeben. Dieser Modus wird für normale "
++"4:3 Fernseher benutzt. Anamorphische (16:9) Videos werden gestaucht "
++"wiedergegeben, Pan&Scan-Material wird links und rechts beschnitten. Dies ist "
++"die Standardeinstellung zum Fernsehen und verhält sich wie ein "
++"eigenständiger DVD Player.\n"
++"\n"
++"widescreen tv\n"
++"Video wird nur über den TV-Ausgang ausgegeben. Dieser Modus wird für 16:9 "
++"Breitbildfernseher benutzt. Anamorphische und Pan&Scan-Inhalte füllen das "
++"ganz Bildschirm aus, aber das Seitenverhältnis muß manuell auf 16:9 gestellt "
++"werden.\n"
++"letterboxed overlay\n"
++"Overlay Videoausgabe auf dem Computerbildschirm mit optionaler "
++"Sofortumschaltung auf TV-Ausgabe durch Verstecken des Videofensters. Das "
++"Overlay wird mit schwarzen Rändern angezeigt, falls es anamorph (16:9) ist.\n"
++"Diese Einstellung ist nur in den seltenen Fällen nützlich, wenn DVD "
++"Untertitel nur korrekt im \"letterboxed\"-Modus dargestellt werden. Ein "
++"gutes Beispiel dafür ist die animierte Kommentatorensilhouletten in "
++"\"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Videoausgabe auf dem Computerbildschirm mit optionaler "
++"Sofortumschaltung auf TV-Ausgabe durch Verstecken des Videofensters. Dies "
++"ist die Standardvariante bei DXR3 Overlays."
+
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_audio_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
++msgstr "Farbwert für Overlay"
+
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:430
++msgid ""
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+-"ffmpeg_audio_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
+-
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_audio_dec: Konnte Dekoder nicht öffnen\n"
+-
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+-msgstr "dvaudio: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
+-
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
+-
+-#: src/libffmpeg/video_decoder.c:153
+-#, fuzzy
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
+-
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n"
+-
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
+-msgstr "ffmpeg_video_dec: Direktausgabe aktiviert\n"
+-
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
+-msgstr "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) schlug fehl.\n"
++"Hexadezimaler RGB-Wert für Farbschlüssel.\n"
++"Sie können verschiedene Werte probieren, falls bei der Benutzung des DXR3-"
++"Overlaymodus Fenster transparent werden."
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_video_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
++msgstr "Farbvarianz für Overlay"
+
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:435
++msgid ""
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+-"ffmpeg_video_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
++"Ein höherer Wert vergrößert die Toleranz für deb Farbschüssel.\n"
++"Sie können niedrigere Werte probieren, falls bei der Benutzung des DXR3-"
++"Overlaymodus Fenster transparent werden; bei zu niedrigen Werten können "
++"teile der Bildränder verschwinden."
+
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
+-msgstr "Qualität der MPEG-4 Nachbearbeitungsstufe"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
++msgstr "Beschneidet den Overlaybereich oben und unten"
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:442
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+-"Die Umfang der Nachbearbeitung bei MPEG-4 Videos kann angepasst werden.\n"
+-"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastunga. Niedrige "
+-"Werte können zu Defekten wie Artefakte führen. Bei hochqualitativen Inhalten "
+-"kann zu starke Nachbearbeitung das Bild durch zu starkes verwischen "
+-"verschlechtern."
++"Entfernt eine Pixelzeile am oberen und unteren Rand des Overlays. Aktivieren "
++"Sie dies, falls Sie grüne Linien am oberen oder unteren Rand sehen."
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
+-msgstr "libavcodec MPEG Ausgangsbitrate (kBit/s)"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++msgstr "video_out_dxr3: Starten Sie autocal, Überlagerung deaktiviert\n"
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
++msgstr "Bevorzugter TV-Modues"
++
++#: src/dxr3/video_out_dxr3.c:456
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+-"Bitrate für die MPEG-Enkodierungsbibliothek libavcodec zur DXR3 Enkodierung. "
+-"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastung.\n"
+-"Diese Einstellung ist nur wirksam, wenn der Modus für konstante Qualität "
+-"deaktiviert ist."
++"Wählt den TV-Modus der DXR3. Die Werte bedeuten:\n"
++"\n"
++"ntsc: NTSC bei 60Hz\n"
++"pal: PAL bei 50Hz\n"
++"pal60: PAL bei 60Hz\n"
++"default: Einstellungen der Karte beibehalten"
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
+-msgstr "Modus für konstante Qualität"
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
++msgstr "video_out_dxr3: Setzen des Videomodus schlug fehl.\n"
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:708
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+-"Falls aktiviert benutzt libavcodec einen Modus für konstante Qualität, bei "
+-"der Bilder je nach Komplexität dynamische komprimiert werden. Anderenfalls "
+-"benutzt libavcodec eine Modus mit konstanter Bitrate."
+-
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
+-msgstr "Minimale Kompression"
+-
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
+-msgstr "Minimale Kompression für ein Bild im Modus konstanter Qualität"
+-
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
+-msgstr "Maximaler Quantisierer"
+-
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
+-msgstr "Maximale Kompression für ein Bild im Modus konstanter Qualität"
+-
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+-msgstr "libareal: (Audio) Kann Symbole nicht auflösen - Inkompatible DLL: %s\n"
++"video_out_dxr3: Benötige einen MPEG-Kodierer zum Abspielen von nicht-MPEG-"
++"Videos on dxr3\n"
++"video_out_dxr3: Lesen Sie README.dxr3 für Details.\n"
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
+-msgstr "libareal: Dekoderinitialisierung schluf fehl, Fehlercode: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++msgstr ""
++"video_out_dxr3: Fehler beim Lesen der Überlagerungsdatei. Starten Sie "
++"autocal!\n"
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+-msgstr ""
+-"libareal: Einrichtung der Dekodervariante schlug fehl, Fehlercode: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgstr "dxr3_decode_spu: Öffnen des SPU-Geräts %s (%s) schlug fehl\n"
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
+-msgstr "libareal: Ups, Real ünterstützt mehr als 2 Kanäle?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
++msgstr "Angeforderter Knopf nicht verfügbar\n"
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
+-msgstr "Pfad zum Real-Player-Codecs"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
++msgstr "DXR3 Gerätenummer"
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+-"Geben Sie hier den Pfad zum codec-Verzeichnis von RealPlayer an, falls es "
+-"installiert ist. Sie können das codec-Verzeichnis einfach finden, in dem Sie "
+-"nach der Datei \"drv3.so.6.0\" in ihm suchen. Falls xine die RealPlayer-"
+-"Codecs findet, verwendet xine diese zum dekodieren von RealPlayer-Inhalten. "
+-"Konsultieren Sie die xine FAQ für weitere Informationen, wie die Codecs zu "
+-"installieren sind."
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+-msgstr "libreal: Kann Symbole nicht auflösen! (Version inkompatibel?)\n"
++"Falls Sie mehr als eine DXR3 in Ihrem Computer haben, können Sie hier "
++"angeben, welche benutzt werden soll."
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
+-msgstr "Untertitel in MEPG-2-Strömen anzeigen"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
++msgstr "dxr3_mpeg_encoder: Initialisierung von librte schlug fehl\n"
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr "Untertitel sollen Hörgeschädigten helfen."
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr "Untertitelschema für Vordergrund-/Hintergrundfarbe"
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr "Wählen Sie eine Darstellung für Untertitel."
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr "Standard Zeichensatz für Untertitel"
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr "Wählen Sie den Zeichensatz für standard Untertiteltexte."
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr "Italic Zeichensatz für Untertitel"
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
+-msgstr "Wählen Sie den Zeichensatz für kursive Untertiteltexte."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
++msgstr ""
++"dxr3_mpeg_encoder: rte unterstützt nur Videoformate, die Vielfache von 16 "
++"sind\n"
+
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
+-msgstr "Zeichensatzgröße für Untertitel"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++msgstr "dxr3_mpeg_encoder: rte-Kontext konnte nicht geholt werden.\n"
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
+-msgstr "Wählen Sie die Zeichensatzgröße für Untertiteltexte."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
++msgstr "dxr3_mpeg_encoder: CODEC konnte nicht erzeugt werden.\n"
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
+-msgstr "Zentrieren von Untertiteln"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
++msgstr "Bitrate der librte MPEG Wiedergabe (kBit/s)"
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+-"Falls aktiviert werden die Zeilen des Untertitels jeweils mittig "
+-"ausgerichtet."
+-
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
+-msgstr "Zeichensatz für externe Untertitel"
++"Bitrate für die MPEG-Enkodierungsbibliothek librte zur DXR3 Enkodierung. "
++"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastung."
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
+-msgstr "Vertikaler Versatz für Untertitel (Relativ zu Fenstergröße)"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgstr "dxr3_mpeg_encoder: Konnte Kontext nicht initialisieren: %s\n"
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
+-msgstr "Zeichenkodierung für Untertitel"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgstr "dxr3_mpeg_encoder: Kodierung kann nicht gestartet werden: %s\n"
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "demux_ts: Kann neuen Thread (%s) nicht erzeugen\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++msgstr "dxr3_mpeg_encoder: FAME-Bibliothek konnte nicht gestartet werden\n"
+
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
+-msgstr "Standardzeitspanne in Sekunden bis zum Ausblenden des Untertitels"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
++msgstr "fame-MPEG-Enkodierungsqualität"
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+-"Einige Untertitelformate geben keine explizite Dauer für die Untertitel an. "
+-"Für diese kann eine Standardzeitspanne angegeben werden. Wird Null "
+-"angegeben, werden die Untertitel solange angezeigt, bis sie vom nächsten "
+-"ersetzt werden."
++"Die Enkodierungsqualität für die MPEG-Enkodierungsbibliothek libfame. "
++"Niedrige Werte sind schneller, produzieren aber Artefakte. Höhere Werte "
++"verwessern die Qualität zu Lasten der CPU-Belastung."
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
+-msgstr "Untertitelgröße"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
++msgstr "SCR-Plugin Priorität"
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+-"Passt die Untertitelgröße an. Diese Einstellung ist relativ zur Fenstergröße."
+-
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
+-msgstr "Vertikaler Versatz für Untertitel"
++"Priorität für das DXR3 SCR-Plugin. Werte kleiner 5 führen dazu, daß die UNIX "
++"Systemuhr zur Synchronisation benutzt wird; Werte größer 5 erzwingen die "
++"Verwendung der internen Uhr der DXR3 als Synchronisationsquelle."
+
+-#: src/libsputext/xine_decoder.c:908
+-msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
+-msgstr ""
+-"Passt den vertikalen Versatz der Untertitel an. Diese Einstellung ist "
+-"relativ zur Fenstergröße."
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgstr "dxr3_decode_video: Öffnen des Steuer-Geräts %s (%s) schlug fehl\n"
+
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
+-msgstr "Zeichensatz für Untertitel"
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
++msgstr "Benutze Pan & Scan Informationen"
+
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/dxr3/dxr3_decode_video.c:257
++msgid ""
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+-"Ein Zeichensatz aus xines font-Verzeichnis zur Anzeige von Untertiteln."
++"\"Pan & Scan\" ist ein spezieller Darstellungsmodus, der manchmal in MPEG "
++"kodiertem Material verwendet wird. Sie können hier wählen, wie solche "
++"Inhalte behandelt werden sollen.\n"
++"\n"
++"only when forced\n"
++"Pan & Scan nur dann benutzen, wenn die Verwendung vorgeschrieben ist.\n"
++"\n"
++"use MPEG hint\n"
++"Pan & Scan dann benutzen, wenn entsprechende Informationen in den MPEG "
++"Videostrom eingebettet sind.\n"
++"use DVB hint\n"
++"Pan & Scan dann benutzen, wenn entsprechende Informationen in den DVB "
++"Datenstrom eingebettet sind. Dies benutzt den Active Fromat Descriptor "
++"(AFD), der in manchen europäischen DVB Datenströmen benutzt wird."
+
+-#: src/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
+-msgstr "Zeichenkodierung für Untertitel"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
++msgstr "Versuche Video mit jedem Bild zu synchonisieren"
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+-"Die Kodierung der Untertitel im Datenstrom. Diese Einstellung wird bei der "
+-"Darstellung von nicht-ASCII-Zeichen benutzt. Falls nicht-ASCII-Zeichen "
+-"anders als erwartet dargestellt werden, fragen Sie den Ersteller der "
+-"Untertitel nach der verwendeten Kodierung."
++"Zeitmarken zur Synchronisationen für jedes Frame erzeugen. Normalerweise ist "
++"dies nicht nötig, da es zur Synchronisation ausreicht, wenn nur ab und zu "
++"Zeitmarken erzeugt werden.\n"
++"Dies ist nur für progressive Videos (die meisten PAL Filme) relevant."
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
+-msgstr "Benutze unskaliertes OSD falls möglich"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
++msgstr "Benutze weichen Wiedergabemodus"
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
+-msgstr ""
+-"Das unskalierte OSD wird unabhängig vom Videobild erzeugt und ist immer "
+-"scharf, sogar falls das Video vergrößert wird. Es sieht besser aus, "
+-"funktioniert aber nicht mit jeder Grafikhardware. Die Alternative ist ein "
+-"skaliertes OSD, welches verwischt, wenn ein Video mit niedriger Auflösung "
+-"bildschirmfüllend angezeigt wird; allerdings funktioniert sie mit allen "
+-"Grafikkarten."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
++msgstr "Das Aktivieren dieser Option sorgt für eine flüssigere Wiedergabe."
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
+-msgstr "Pfad zu win32-Codecs"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
++msgstr "Korrigiere Framedauer in kaputten Streams"
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
+-msgstr ""
+-"Geben Sie hier den Pfad zu den Windows oder Apple Quicktime Codec-Paketen "
+-"an, falls sie installiert sind. Falls xine die Windows oder Apple Quicktime "
+-"Codecs findet, verwendet xine diese zum dekodieren von verschiedenen Windows "
+-"Media- oder Quicktime Datenströmen. Konsultieren Sie die xine FAQ für "
+-"weitere Informationen, wie die Codecs zu installieren sind."
+-
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+-"w32codec: ICOpen schlug fehl! Unbekannter Codec %08lx / falsche Parameter?\n"
++"Aktiviert eine Logik zur Korrektur falscher Framedauern in einigen MPEG "
++"Videos mit falschen Bildwiederholratencodes. Momentan ist eine Korrektur für "
++"NTSC Ströme implementiert, die fälschlicherweise als PAL markeirt sind. "
++"Aktivieren Sie dier nur, wenn Sie einen solchen Datenstrom antreffen."
+
+-#: src/libw32dll/w32codec.c:595
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+-msgstr ""
+-"w32codec: ICDecompressGetFormat (%.4s %08lx/%d) schlug fehl: Fehler %ld\n"
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "dxr3_decode_video: Öffnen des Video-Geräts %s (%s) schlug fehl\n"
+
+-#: src/libw32dll/w32codec.c:628
+-#, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+-msgstr "w32codec: ICDecompressQuery schlug fehl: Fehler %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
++msgstr "dxr3_decode_video: Schreibzugriff würde blockieren. Leeren\n"
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+-msgstr "w32codec: ICDecompressBegin schlug fehl: Fehler %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgstr "dxr3_decode_video: Schreibzugriff auf Video-Gerät schlug fehl (%s)\n"
+
+-#: src/libw32dll/w32codec.c:685
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
+-"w32codec: DS_VideoDecoder schlug fehl! Unbekannter Codec %08lx / falsche "
+-"Parameter?\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgstr "dxr3_decode_video: WARNUNG: Unbekannter Code für Wiederholrate %d\n"
+
+-#: src/libw32dll/w32codec.c:696
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+-"w32codec: DMO_VideoDecoder schlug fehl! Unbekannter Codec %08lx / falsche "
+-"Parameter?\n"
++"dxr3_decode_video: WARNUNG: Korrigiere Code für Wiederholrate von PAL zu "
++"NTSC\n"
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr "w32codec: Dekoder startete nicht. Ist '%s' installiert?\n"
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+-msgstr "w32codec: (ACM_Decoder) Unpassendes Audioformat\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgstr "audio_oss_out: Öffne Audiogerät %s: %s\n"
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+-msgstr "w32codec: (ACM_Decoder) acmStreamOpen Fehler %d\n"
+-
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
+-msgstr "w32codec: Fehler beim Initialisieren von DirectShow Audio\n"
+-
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
+-msgstr "w32codec: Fehler beim Initialisieren von DMO Audio\n"
+-
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
+-msgstr "bitplane: Fehler beim ByteRun1-Dekomprimieren\n"
+-
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+-msgstr "bitplane: Anim Opt 1 wird momentan nicht unterstützt\n"
+-
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+-msgstr "bitplane: Anim Opt 2 wird momentan nicht unterstützt\n"
+-
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+-msgstr "bitplane: Anim ASCIIJ wird momentan nicht unterstützt\n"
+-
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
+-msgstr "bitplane: Dieser anim-Type wird momentan nicht unterstützt\n"
+-
+-#: src/post/audio/stretch.c:264
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+-"Dieser Filter führt eine zeitliche Ausdehnung durch, was den Datenstrom um "
+-"einen Faktor schneller oder langsamer abspielt. Die Tonhöhe kann optional "
+-"erhalten werden, was es z.B. möglich macht, einen Film in weniger als seiner "
+-"originalen Aufnahmedauer anzusehen.\n"
++"audio_oss_out: Warnung: Abtastrate %d Hz nicht unterstützt, versuche 44100 "
++"Hz\n"
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-msgstr ""
+-"Upmix Funktion, produziere aus Stereoeingangssignal 5.1 Raumklang.\n"
+-"Parameter\n"
+-" cut_off_freq\n"
+-"\n"
+-"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
+-"diese Parameter zu setzen.\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:225
++#, c-format
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgstr "audio_oss_out: Audiodatenrate: %d gefordert, %d genutzt von Gerät\n"
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
++msgstr "OSS Audio-Gerätename"
++
++#: src/audio_out/audio_oss_out.c:737
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
+-"\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
+-"\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
+-"\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
+-"\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
+-"\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+-"Erweitertes tvtime/deinterlacer Plugin mit pulldown-Erkennung\n"
+-"Dieses Plugin hat das Ziel, Deinterlacing-Mechanismen vergleichbar mit "
+-"hochqualitativen progressiven DVD-Playern und sogenannten Zeilenverdopplern "
+-"für die Benuztung mit Rechnermonitoren, Projektoren und anderen progressiven "
+-"Anzeigegerätzen zur Verfügung zu stellen.\n"
+-"\n"
+-"Parameter\n"
+-"\n"
+-" Method: Wählt die zu benutzende Deinterlaging-Methode/Algorithmus aus. "
+-"Eine genaue Beschreibung jeder Methode folgt weiter unten.\n"
+-"\n"
+-" Enabled: Aktiviert/Deaktiviert das Plugin.\n"
+-"\n"
+-" Pulldown: Wählt den 2-3 Pulldown-Erkennungs-Algorithmus. 24 BpS Filme, die "
+-"nach NTSC konvertiert wurden, können erkannt und intelligent in ihr nicht-"
+-"interlaced Originalformat zurückkonvertiert werden.\n"
+-"\n"
+-" Framerate_mode: 'full' entflechtet jedes Feld in ein eigenes Bild in "
+-"Fernsehqualitaet oder besser. Dieser Modus verdoppelt effektiv die "
+-"Bildwiederholrate und verbessert die Gleichförmigkeit. Beachten Sie, daß "
+-"volle 59.94 BpS mit einem Linux-2.4-Kernel (mit einer Zeitgeberunterbrechung "
+-"von 100Hz) nicht möglich sind. Neuere Kernel (2.6er Kernel oder Kernel mit "
+-"512 oder 1000 Hz) sollten anstandslos funktionieren.\n"
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Falls 2-3-Pulldown aktiviert ist und entsprechendes "
+-"Filmmaterial erkannt wurde, kann die Bildwiederholrate auf die ursprängliche "
+-"Rate (24 BpS) reduziert werden. Das macht die Bilder gleichförmiger über die "
+-"Zeit verteilt. Dies reduziert den Rubbeleffekt.\n"
+-"\n"
+-" Use_progressive_frame_flag: Gut gemeisterte MPEG2-Datenströme benutzen ein "
+-"Kennzeichen, daß progressives Material kennzeichnet. Diese Einstellung "
+-"kontrolliert, ob diesem Kennzeichen vertraut werden soll oder nicht (Einige "
+-"seltene und fehlerhafte MPEG2-Datenströme setzen es falsch).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 benutzen ein verschränktes Bildformat, daß eine "
+-"schlechte vertikale Farbauflösung hat. Das Hochskalieren dieser "
+-"Farbinformation zum Entflechten kann das Auftreten von Artefakten "
+-"hervorrufen (z.B. Farbstreifen). Benutzen Sie diese Option, um die "
+-"Farbinformation nach dem Entflechten zu verwischen, um solche Artifakte zu "
+-"entfernen. Achtung: CPU intensiv.\n"
+-"\n"
+-" Cheap_mode: Die überspringt die aufwendige YV12->YUV2 Bildkonvertierung, "
+-"aber die tvtime/dscaler-Routinen arbeiten weiterhin so, als wäre es YUV2. "
+-"Nätürlich ist das nicht korrekt, da nicht alle Pixel von den Algorithmen "
+-"ausgewertet werden, um die Regionen zum entflechten zu entscheiden, und "
+-"Farbinformationen werden getrennt bearbeitet. Dieses Vorgehen erlaubt es "
+-"Personen mit leistungsärmeren Systemen trotzdem die Entflechtungsalgorithmen "
+-"als Kompromiss zwischen Qualität und CPU-Auslastung auszuprobieren.\n"
+-"\n"
+-"Deinterlacing methods: (Nicht alle Methoden stehen auf allen Platformen zur "
+-"Verfügung)\n"
+-"\n"
+-"* Benutzt verschiedene Algorithmen von tvtime und vom dscaler Projekt.\n"
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr "tvtime: Keine Deinterlacingmethoden verfügbar, beendet.\n"
++"Spezifizieren Sie den Basisgerätenamen, an den die OSS-Gerätenummer "
++"angehängt wird, um den vollen Gerätenamen zu erhalten.\n"
++"Wählen Sie \"auto\", falls xine automatisch die korrekte Einstellung wählen "
++"soll."
+
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
+-msgstr "Zu generierende Bilder/Sekunde"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
++msgstr "OSS Audio-Gerätename, -1 für keinen"
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:745
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+-"Mit mehr Bildern pro Sekunde wird die Animation flüssiger und schneller, "
+-"benötigt aber mehr CPU Rechenzeit."
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr "Goom Bildbreite"
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr "Die Breite des zu generierenden Bilds in Pixeln."
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
+-msgstr "Goom Bildhöhe"
++"Der Audio-Gerätename wird durch Aneinanderhängen des OSS-Gerätenamens und "
++"der Audio-Gerätenummer gebildet.\n"
++"Wenn Sie keine Nummer benötigen (weil alles bereits funktioniert), benutzen "
++"Sie -1.\n"
++"Der gültige Bereich ist -1 oder 0-15. Diese Einstellung wird ignoriert, "
++"falls OSS Audio-Gerätenamen auf \"auto\" steht."
+
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
+-msgstr "Die Höhe des zu generierenden Bilds in Pixeln."
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++msgstr "audio_oss_out: audio.device.oss_device_name = auto, suche Geräte\n"
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
+-msgstr "Farbraumkonvertierungsmethode"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
++msgstr "audio_oss_out: Automatische Suche nach Audiogeräten schlug fehl\n"
+
+-#: src/post/goom/xine_goom.c:219
+-msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
+-msgstr ""
+-"Sie können die Methode zum Konvertieren des Farmraums in Goom wählen.\n"
+-"Die auswählbaren Möglichkeiten sollten selbsterklärend sein."
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
++msgstr "audio_oss_out: Benutze Gerät >%s<\n"
+
+-#: src/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+-"Mosaico ermöglicht einfache Bild-in-Bild Effekte.\n"
+-"\n"
+-"Parameter\n"
+-" pic_num: Nummer des Bildbereiches, für den die folgenden Werte gelten\n"
+-" x: Die X-Koordinate der linken oberen Ecke des Bilds\n"
+-" y: Die Y-Koordinate der linken oberen Ecke des Bilds\n"
+-" w: Die Breite des Bilds\n"
+-" h: Die Höhe des Bilds\n"
++"audio_oss_out: Öffnen des Audiogeräts %s schlug fehl:\n"
++"%s\n"
+
+-#: src/post/mosaico/switch.c:230
+-msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
+-msgstr ""
+-"Schalter kann benutzt werden, um schnell zwischen mehreren Quellen "
+-"umzuschalten.\n"
+-"\n"
+-"Parameter\n"
+-" select: Die Nummer der Quelle, die zum Ausgang geleitet werden soll\n"
++#: src/audio_out/audio_oss_out.c:800
++msgid "a/v sync method to use by OSS"
++msgstr "A/V Synchronisationmethode für OSS"
+
+-#: src/post/planar/boxblur.c:103
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Box blur does a simple blurring of the image.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+-msgstr ""
+-"Box blur verwischt ein Bild.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-"Parameter\n"
+-" Radius: Größe des Filters\n"
+-" Power: Anzahl der Anwendungen dieses Filters\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+-
+-#: src/post/planar/denoise3d.c:136
+-msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+-"Dieser Filter reduziert Bildrauschen und erzeugt sehr gleichmäßige Bilder "
+-"und macht Standbilder sehr still (sollte Komprimierbarkeit verbessern). Es "
+-"können 0-3 Parameter angegeben werden. Für ausgelassene Parameter werden "
+-"passende Werte verwendet.\n"
+-"\n"
+-"Parameter\n"
+-" Luma: Lokale Helligkeitsstärke (Standard = 4)\n"
+-" Chroma: Lokale Farbstärke (Standard = 3)\n"
+-" Time: Zeitliche Stärke (Standard = 6)\n"
+-"\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+-
+-#: src/post/planar/eq.c:186
+-msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
++"xine kann verschiedene Methoden benutzen, um Audio und Video zu "
++"synchronisieren. Welche Einstellung am besten ist hängt vom OSS Treiber und "
++"der benutzten Soundhardware ab. Versuchen Sie verschiedene Methoden, falls "
++"Sie Synchronisationsprobleme bemerken.\n"
+ "\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
++"Die Bedeutung der Werte ist wie folgt:\n"
+ "\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
++"auto\n"
++"xine versucht automatisch die besten Einstellungen zu erkennen\n"
+ "\n"
+-"* mplayer's eq (C) Richard Felker\n"
+-msgstr ""
+-"Software-Equalizer mit interaktiver Steuerung ähnlich Hardware-Equalizer für "
+-"solche Karten/Treiber, die keine Helligkeits-/Kontraststeuerung in Hardware "
+-"besitzen.\n"
++"getodelay\n"
++"Benutzt ioctl(SNDCTL_DSP_GETODELAY) zur A/V Synchronisation selbst dann, "
++"wenn der Treiber Unterstützung zur Echtzeitwiedergabe nicht anbietet\n"
+ "\n"
+-"Parameters\n"
+-" brightness: Helligkeit\n"
+-" contrast: Kontrast\n"
++"getoptr\n"
++"Benutzt ioctl(SNDCTL_DSP_GETOPTR) zur A/V Synchronisation selbst dann, wenn "
++"der Treiber das bevorzugte ioctl(SNDCTL_DSP_GETODELAY) anbietet\n"
+ "\n"
+-"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
+-"diese Parameter zu setzen.\n"
++"softsync\n"
++"Benutzt Softwaresynchronisation mit der Systemuhr; Audio und Video können "
++"weit auseinanderdriften, wenn die Systemuhrgeschwindigkeit nicht exakt mit "
++"der Wiedergabegeschwindigkeit der Soundkarte übereinstimmt\n"
+ "\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"probebuffer\n"
++"Testet die Puffergröße der Soundkarte bei der Initialisierung, um die "
++"Verzögerung zur A/V Synchronisation zu berechnen. Versuchen Sie dies, falls "
++"Ihr System keine ioctls zu Echtzeitwiedergabe anbietet und "
++"Synchronisationsprobleme nach langer Wiedergabe auftreten."
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"Alternativer Software-Equalizer, der Tabellen benutzt (sehr langsam) und "
+-"zusätzlich zu Helligkeit, Kontrast ybd Sättigung Gamma-Korrekturen erlaubt.\n"
+-"Beachten Sie, daß derselbe MMX-optimierte Code von 'eq' benutzt wird, falls "
+-"alle Gamma-Werte 1.0 sind.\n"
+-"\n"
+-"Parameter\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (Gamma für Rotanteil)\n"
+-" ggamma (Gamma für Grünanteil)\n"
+-" bgamma (Gamma für Blauanteil)\n"
+-"\n"
+-"Wertebereiche sind 0.1 bis 10 für Famma, -2 bis 2 für Kontrast (negative "
+-"Werte resultieren in ein negatives Bild), -1 bis 1 für Helligkeit und 0 bis "
+-"3 für Sättigung.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
++"audio_oss_out: ...System-Realzeituhr wird zur soft-Synchronisation benutzt\n"
++"audio_oss_out: ...es könnn Audio/Video-Synchronisationsprobleme auftreten\n"
+
+-#: src/post/planar/expand.c:223
++#: src/audio_out/audio_oss_out.c:856
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "Verzögerung der OSS Audioausgabe (Verändert A/V Synchronisation)"
++
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++"If you experience audio being not in sync with the 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 ""
+-"Dieses expand-Plugin konvertiert Bilder mit beliebigem Seitenverhältnis in "
+-"Bilder mit einem Seitenverhältnis von 4:3 durch Hinzufügen von schwarzen "
+-"Balken am oberen und unteren Bildrand. Dadurch können Überlagerungen nach "
+-"unten verschoben werden, so daß sie nicht das Bild überdecken.\n"
+-"\n"
+-"Parameter\n"
+-" Enable_automatic_shift: Automatisch Überlagerung verschieben\n"
+-" Overlay_y_offset: Manuelle vertikale Überlagerungsverschiebung\n"
++"Falls Sie feststellen, daß Ton und Bild nicht synchron sind, können Sie hier "
++"einen Versatz zur Kompensierung eingeben.\n"
++"Die Einheit dieses Wertes ist ein \"PTS-Tick\", was dem 90.000stel einer "
++"Sekunde entspricht."
+
+-#: src/post/planar/pp.c:108
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+-"FFmpeg libpostprocess Plugin.\n"
+-"\n"
+-"Parameter\n"
+-"\n"
++"audio_oss_out: Audio-Realzeit-Synchronisation deaktiviert...\n"
++"audio_oss_out: ...Untersuche Größe des Ausgabepuffers: "
+
+-#: src/post/planar/pp.c:114
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"%d Bytes\n"
++"audio_oss_out: ...es könnn Audio/Video-Synchronisationsprobleme auftreten\n"
+
+-#: src/post/planar/unsharp.c:219
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
++msgstr "Lautsprecherplazierung"
++
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+-"Unschärfemake / Gauß'sche Unschärfe\n"
+-"Die Breite und Höhe der Matrix kann gesetzt werden, beide Dimensionen müssen "
+-"ungerade sein (Minimum 3x3, Maximum 13x11 oder 11x13, normalerweise zwischen "
+-"3x3 und 7x7. Der relative Grad der Schärfe/Unschärfe, die dem Bild "
+-"hinzugefügt wird, sollte typischerweise zwischen -1.5 und 1.5 liegen).\n"
+-"\n"
+-"Parameter\n"
+-"\n"
+-" Luma_matrix_width: Breite der Matrik (muß ungerade sein)\n"
+-" Luma_matrix_hieght: Höhe der Matrik (muß ungerade sein)\n"
+-" Luma_amount: Relativer Grad der Schärfe/Unschärfe (=0 deaktiviert, <0 "
+-"Unschärfe, >0 Schärfe)\n"
+-" Chroma_matrix_width: Breite der Matrik (muß ungerade sein)\n"
+-" Chroma_matrix_height: Höhe der Matrik (muß ungerade sein)\n"
+-" Chroma_amount: Relativer Grad der Schärfe/Unschärfe (=0 deaktiviert, <0 "
+-"Unschärfe, >0 Schärfe)\n"
++"Wählen Sie, wie Ihre Lautsprecher angeordnet sind. Darüber wird gerählt, "
++"welche Lautsprecher xine für die Ausgabe verwendet. Mögliche Werte sind:\n"
+ "\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Mono 1.0: Sie haben nur einen Lautsprecher.\n"
++"Stereo 2.0: Sie haben zwei Lautsprecher für den linken und rechten Kanal.\n"
++"Headphones 2.0: Sie benutzen einen Kopfhörer.\n"
++"Stereo 2.1: Sie haben zwei Lautsprecher für den linken und rechten Kanal und "
++"einen Subwoofer für tiefe Frequenzen.\n"
++"Surround 3.0: Sie haben drei Lautsprecher für den linken, rechten und "
++"Rückkanal.\n"
++"Surround 4.0: Sie haben vier Lautsprecher für den jeweils linken und rechten "
++"Front- bzw. Rückkanal.\n"
++"Surround 4.1: Sie haben vier Lautsprecher für den jeweils linken und rechten "
++"Front- bzw. Rückkanal sowie einen Subwoofer für tiefe Frequenzen.\n"
++"Surround 5.0: Sie haben fünf Lautsprecher für links, mitte, rechts und "
++"hinten links und hinten rechts.\n"
++"Surround 5.1: Sie haben fünf Lautsprecher für links, mitte, rechts und "
++"hinten links und hinten rechts sowie einen Subwoofer für tiefe Frequenzen.\n"
++"Surround 6.0: Sie haben sechs Lautsprecher für jeweils links, mitte und "
++"rechts Front- bzw. Rückkanal.\n"
++"Surround 6.1: Sie haben sechs Lautsprecher für jeweils links, mitte und "
++"rechts Front- bzw. Rückkanal sowie einen Subwoofer für tiefe Frequenzen."
++"frequencies.\n"
++"Surround 7.1: Sie haben sieben Lautsprecher für links, mitte und rechts, "
++"mitte links und rechts, hinten links und rechts sowie einen Subwoofer für "
++"tiefe Frequenzen.\n"
++"Pass Through: Ihr Soundsystem erhähl unkodierte digitale Signale von xine. "
++"Sie benötigen einen digitalen Raumklangdekoder, der alle Formate dekodieren "
++"kann, die Sie über den digitalen Ausgang Ihrer Soundkarte abspielen wollen."
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
++msgstr "OSS Mixernummer, -1 für keine"
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
++"Der Mixer-Gerätename wird durch Ersetzen von \"dsp\" durch \"mixer\" im OSS "
++"Audio-Gerätenamen und durch Anhängen der Mixernummer gebildet.\n"
++"Wenn Sie keine Nummer benötigen (weil alles bereits funktioniert), benutzen "
++"Sie -1.\n"
++"Der gültige Bereich ist -1 oder 0-15. Diese Einstellung wird ignoriert, "
++"falls OSS Audio-Gerätenamen auf \"auto\" steht."
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "xine Videoausgabe benutzt ASCII-Art Bibliothek"
+-
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "xine Videoausgabe benutzt Farb-ASCII-Art Bibliothek"
+-
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr "xine Videoausgabe benutzt DirectFB-Bibliothek"
++#: src/audio_out/audio_oss_out.c:1074
++#, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "audio_oss_out: open() Mixer %s schlug fehl: %s\n"
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "xine Videoausgabe benutzt für win32 benutzt directx"
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++msgstr "xine Soundausgabe benutzt OSS-kompatibles Gerät/Treiber"
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+-msgstr ""
+-"video_out_fb: Nur packed truecolor/directcolor wird unterstützt (%d).\n"
+-" Überprüden Sie 'fbset -i' oder versuchen Sie 'fbset -depth 16'.\n"
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "audio_sun_out: Öffnen des Audiogeräts %s schlug fehl: %s\n"
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-msgid "framebuffer device name"
+-msgstr "Framebuffer Gerät"
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
++msgstr "Sun Audio-Gerätename"
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"Specifies the file name for the framebuffer device to be used.\n"
++"Specifies the file name for the Sun audio device to be used.\n"
+ "This setting is security critical, because when changed to a different file, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+-"Gibt den Namen für das Sun Framebuffer-Gerät an.\n"
++"Gibt den Namen für das Sun Audiogerät an.\n"
+ "Diese Einstellung ist Sicherheitskritisch, da falls sie auf eine andere "
+ "Datei geändert wird, xine diese mit willkürlichen Inhalt überschreibt. Sie "
+-"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das "
+-"Framebuffer-Gerät bezeichnet."
++"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das Sun "
++"Audiogerät bezeichnet."
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+-msgstr "video_out_fb: Ihr Videomodues wurde nicht erkannt, Entschuldigung.\n"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++msgstr "xine Soundausgabe benutzt SUN-kompatibles Gerät/Treiber"
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
+-msgstr "Helligkeitskorrektur"
++#: src/audio_out/audio_irixal_out.c:385
++msgid "irixal audio output maximum gap length"
++msgstr "Maximal erlaubte Differenz für IRIXAL Soundausgabe"
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+-"Die Helligkeitskorrektur kann benutzt werden, um ein Bild aufzuhellen oder "
+-"zu verdunkeln. Sie verändert den Schwarzlevel ohne den Kontrast zu "
+-"beeinflussen, limitiert aber den Tonumfang."
++"Sie können den maximalen Versatz zwischen Audio und Video angeben, den xine "
++"toleriert, bevor sie resynchronisiert werden.\n"
++"Die Einheit dieses Wertes ist ein \"PTS-Tick\", was dem 90.000stel einer "
++"Sekunde entspricht."
+
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
+-msgstr "video_out_fb: %d Video-Ram-Puffer sind verfügbar.\n"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "xine Soundausgabe benutzt IRIX-kompatibles Gerät/Treiber"
+
+-#: src/video_out/video_out_fb.c:938
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
++msgstr "xine Dummy Soundausgabe"
++
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
++msgstr "xine Soundausgabe benutzt kde artsd"
++
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
++msgstr "audio_alsa_out:Bereits geöffnet...WARUM?"
++
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
+-msgstr ""
+-"WARNUNG: video_out_fb: Null-Kopie-Puffer sind DEAKTIVIERT, weil nur %d "
+-"Puffer\n"
+-" verfügbar sind, was weniger als die empfohlenen %d Puffer sind. "
+-"Verringern\n"
+-" der Framebuffer-Auflösung kann helfen.\n"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgstr "audio_alsa_out: snd_pcm_open() von %s schlug fehl: %s\n"
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+-"WARNUNG: video_out_fb: Null-Kopie-Puffer sind DEAKTIVIERT, weil der Kernel-"
+-"Treiber\n"
+-" kein screen-panning unterstützt (benutzt für Bildwechsel).\n"
++"audio_alsa_out: >>> Überprüfen Sie, ob ein anderen Programm PCM bereits "
++"benutzt<<<\n"
+
+-#: src/video_out/video_out_fb.c:1016
++#: src/audio_out/audio_alsa_out.c:406
+ #, c-format
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+-"WARNUNG: video_out_fb: Momentane Farbtiefe ist %d. Für bessere Leistung wird "
+-"eine Farbtiefe von 16 bpp empfohlen!\n"
+-
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
+-msgstr "xine Videoausgabe benutzt Linux Framebuffer"
+-
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
+-msgstr "xine Videoausgabe zeigt nichts an"
++"audio_alsa_out: Kaputte Konfiguration für dieses PCM: Keine Konfiguration "
++"verfügbar: %s\n"
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
++msgstr "Änderungen an Hardwaremixer melden"
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
++"Wenn sich die Einstellungen des Hardwaremixers ändern wird die Anwendung "
++"benachrichtigt, damit sie die grafische Darstellung des Mixers direkt "
++"aktualisieren kann."
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1327
++#, c-format
++msgid "snd_lib_error_set_handler() failed: %d"
++msgstr "snd_lib_error_set_handler() schlug fehl: %d"
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
++msgstr "Soundkarte unterstützt mmap "
++
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
++"Aktivieren Sie dies, falls Ihre Soundkarte und der ALSA-Treiber memory "
++"mapped IO unterstützen.\n"
++"Sie können dies aktivieren und testen, ob alles funktioniert. Falls ja, "
++"erhöht es die Leistung."
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
+-msgstr "Doppelpufferung benutzen"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "Gerät für Monoausgabe"
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1345
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
++"xine benutzt diese ALSA-Gerät für die Monoausgabe.\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
+-msgstr "xine Videoausgabe benutzt 'MIX X Shared Memory' Erweiterung"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "Gerät für Stereoausgabe"
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1354
++msgid ""
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx32: Fehler: DGA Zeichenfläche für Videofenster nicht bekommen\n"
+-
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "video_out_pgx32: Fehler: ioctl schlug fehl, fehlerhaftes Gerät (%s)\n"
++"xine benutzt diese ALSA-Gerät für die Stereoausgabe.\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+-msgstr "video_out_pgx32: Fehler: '%s' ist kein pgx32 Framebuffer Gerät\n"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "Gerät für 4-Kanalausgabe"
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1363
++msgid ""
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Fehler: DGA Zeichenfläche für Videofenster nicht bekommen\n"
++"xine benutzt diese ALSA-Gerät für die 4-Kanalausgabe (4.0 Raumklang).\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#: src/video_out/video_out_pgx64.c:300
+-#, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "video_out_pgx64: Fehler: Kann Framebuffer Gerät '%s' nicht öffnen\n"
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "Gerät für 5.1-Kanalausgabe"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Fehler: ioctl(VIS_GETIDENTIFIER) schlug fehl, fehlerhaftes "
+-"Gerät (%s)\n"
++"xine benutzt diese ALSA-Gerät für die 5-Kanalausgabe mit Bassbox (5.1 "
++"Raumklang).\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1383
+ msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_pgx64: Fehler: '%s' ist kein xvr100/pgx64/pgx24 Framebuffer Gerät\n"
++"xine benutzt diese ALSA-Gerät für die unkodierte Ausgabe von digitalen "
++"Raumklang. Dies kann von externen Dekodern benutzt werden.\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+-msgstr ""
+-"video_out_pgx64: Fehler: Video-Overlay auf diesem Schirm ist bereits "
+-"benutzt\n"
++#: src/audio_out/audio_alsa_out.c:1403
++#, c-format
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "snd_pcm_open() schlug fehl:%d:%s\n"
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
+-msgstr ""
+-"video_out_pgx64: Fehler: Fenstereigenschaften kónnen nicht gesetzt werden\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
++msgstr ">>> Überprüfen Sie, ob ein anderen Programm bereis PCM benutzt <<<\n"
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
+-msgstr ""
+-"video_out_pgx64: Warnung: Wenig Videospeicher, Mehrfachpufferung "
+-"deaktiviert\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
++msgstr "audio_alsa_out : Unterstützte Modi sind "
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
+-msgstr "video_out_pgx64: Fehler: Ungenügend Videospeicher\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
++msgstr "8Bit "
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
+-msgstr ""
+-"video_out_pgx64: Warnung: Wenig Videospeicher, Doppelpufferung deaktiviert\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
++msgstr "16Bit "
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
+-msgstr "video_out_pgx64: Fehler: ioctl(FBIOGATTR) schlug fehl\n"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
++msgstr "24Bit "
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
+-msgstr "Farbschlüssel für Overlay"
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
++msgstr "32Bit "
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
+-msgstr ""
+-"Der Farbschlüssel wird benutzt, um der Grafikkarte mitzuteilen, wo das Video "
+-"eingeblendet werden kann. Probieren Sie verschiedenen Werte, falls das Video "
+-"bei anderen Fenstern durchscheint."
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
++msgstr "Mono "
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
+-msgstr "Videohelligkeit"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
++msgstr "Stereo "
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
+-msgstr "Die Helligkeit des Videos."
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
++msgstr "4-Kanal "
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
+-msgstr "Videosättigung"
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
++msgstr "(4-Kanal nicht aktiviert in xine Konfiguration) "
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
+-msgstr "Die Sättigung des Videos."
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
++msgstr "4.1-Kanal "
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
+-msgstr "Benutze Farbschlüssel"
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
++msgstr "(4.1-Kanal nicht aktiviert in xine Konfiguration) "
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
+-msgstr ""
+-"OSD-Grafiken werden an den Stellen des Farbschlüssels dargestellt, anstatt "
+-"sie in jedes Bild einzublenden."
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
++msgstr "5-Kanal "
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
+-msgstr "Mehrfachpufferung benutzen"
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
++msgstr "(5-Kanal nicht aktiviert in xine Konfiguration) "
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
+-msgstr ""
+-"Mehrfachpufferung erhöht die Leistung auf Kosten eines erhöhten Verbrauchs "
+-"von Grafikspeicher."
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
++msgstr "5.1-Kanal "
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
+-msgstr "Benutze Hardwarebeschleunigung falls verfügbar"
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
++msgstr "(5.1-Kanal nicht aktiviert in xine Konfiguration) "
+
+-#: src/video_out/video_out_sdl.c:480
+-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 ""
+-"Falls Ihr System es unterstützt, wird die Hardwarebeschleunigung Ihrer "
+-"Grafikhardware benutzt. Falls es nicht funktioniert, können Sie dies "
+-"deaktivieren."
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
++msgstr "a/52 und DTS pass-through\n"
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+-msgstr "SDL muß eine 16 Bit Ausgabe emulieren, was alles verlangsamt.\n"
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++msgstr "(a/52 und DTS pass-through nicht aktiviert in xine Konfiguration)\n"
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
+-msgstr "video_out_sdl: Vollbildmodus wird NICHT unterstützt\n"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "ALSA Mixergerät"
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "xine Videoausgabe benutzt 'Simple Direct Media Layer'"
++#: src/audio_out/audio_alsa_out.c:1551
++msgid ""
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
++msgstr ""
++"xine benutzt dieses ALSA Mixergerät, um die Lautstärke zu ändern.\n"
++"Lesen Sie die ALSA-Dokumentation für Informationen zu ALSA-Geräten."
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr "xine Videoausgabe benutzt LibStk Surface Set-top Toolkit"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++msgstr "xine Soundausgabe benutzt ALSA-kompatibles Gerät/Treiber"
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
+-msgstr ""
+-"video_out_syncfb: Fehler. (YUY2 wird von der Grafikkarte nicht unterstützt)\n"
++#: src/audio_out/audio_directx2_out.c:162
++#, fuzzy
++msgid "Error"
++msgstr "Kein Fehler"
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+-"video_out_syncfb: Fehler. (YV12 wird von der Grafikkarte nicht unterstützt)\n"
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+-"video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:0 (3 Ebenen))\n"
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+-"video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:0 (2 Ebenen))\n"
+-
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
+-msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt YUV 4:2:2)\n"
+-
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
+-msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt YUY2)\n"
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
+-msgstr "video_out_syncfb: Info. (SyncFB-Modul unterstützt RGB565)\n"
+-
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+-"video_out_syncfb: Abbruch. (SyncFB unterstützt weder YV12, YUY2 noch "
+-"RGB565)\n"
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+-"video_out_syncfb: Info. (Helligkeit-/Kontraststeuerung nicht verfügbar, weil "
+-"das SyncFB-Kernelmodul veraltet scheint. Lesen Sie bitte README.syncfb zu "
+-"Updateinformationen.)\n"
+-
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
+-msgstr "Standardanzahl von Bildwiederholungen"
+-
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
+-msgstr "Gibt an, wie oft ein einzelnes Videobild fortlaufend angezeigt wird."
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
+-msgstr "xine Videoausgabe benutzt SyncFB-Modul für Matrox G200/G400-Karten"
+-
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
+-msgstr "SyncFB Gerätename"
+-
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+-"Gibt den Namen für das SyncFB (TeleTux) Gerät an.\n"
+-"Diese Einstellung ist Sicherheitskritisch, da falls sie auf eine andere "
+-"Datei geändert wird, xine diese mit willkürlichen Inhalt überschreibt. Sie "
+-"sollten sich deshalb sehr sicher sein, daß Ihre Eingabe wirklich das "
+-"Framebuffer-Gerät bezeichnet."
+-
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
+-msgstr "Rot-Intensität"
+-
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
+-msgstr "Die Intensität rotet Farbanteile"
+-
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
+-msgstr "Grün-Intensität"
+-
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
+-msgstr "Die Intensität grüner Farbanteile"
+-
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
+-msgstr "Blau-Intensität"
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
+-msgstr "Die Intensität blauer Farbanteile"
++#: src/audio_out/audio_directx2_out.c:177
++#, fuzzy
++msgid "requested buffer control is not available"
++msgstr "Angeforderter Knopf nicht verfügbar\n"
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+-"Doppelpufferung synchronisiert das Aktualisieren des Videobildes mit der "
+-"Darstellung des gesamten Bildschirms (\"Strahlenrücklauf\"). Dies verhindert "
+-"Flackern und Fransenbildung, benötigt aber mehr Grafikspeicher."
+-
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
+-msgstr "video_out_vidix: Adapter unterstützt das YUY2 Format\n"
+-
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
+-msgstr "video_out_vidix: Adapter unterstützt das YV12 Format\n"
+-
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
+-msgstr "video_out_vidix: Sie haben die falsche Version der VIDIX-Bibliothek\n"
+-
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
+-msgstr "video_out_vidix: Kein funktionierende VIDIX-Treiber gefunden\n"
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
+-msgstr "video_out_vidix: Benutzer Treiber: %s von %s\n"
+-
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
+-msgstr "Rot-Komponente des Farbschlüssels für Overlays"
++#: src/audio_out/audio_directx2_out.c:180
++#, fuzzy
++msgid "DirectSound hardware device is unavailable"
++msgstr "Benutze Hardwarebeschleunigung falls verfügbar"
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+-"Der Farbschlüssel wird benutzt, um der Grafikkarte mitzuteilen, wo das Video "
+-"eingeblendet werden kann. Probieren Sie verschiedenen Werte, falls einige "
+-"Fenster durchscheinend werden."
+
+-#: src/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
+-msgstr "Grün-Komponente des Farbschlüssels für Overlays"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
+-msgstr "Blau-Komponente des Farbschlüssels für Overlays"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "xine Videoausgabe benutzt libvidix für X11"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
+-msgstr "xine Videoausgabe benutzt libvidix für Linux Framebuffer"
++#: src/audio_out/audio_directx2_out.c:186
++#, fuzzy
++msgid "requested COM interface not available"
++msgstr "Angeforderter Knopf nicht verfügbar\n"
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+-"video_out_xshm: Shared-Memory-Fehler beim Speicherbelegen\n"
+-"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+-"video_out_xshm: %s: Belege Bild\n"
+-"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+-"video_out_xshm: Shared-Memory-Fehler (Adressfehler) beim Belegen des Bilds\n"
+-"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+-"video_out_xshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
+-"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xshm.c:1138
+-#, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+-"\n"
+-"\n"
+-"WARNUNG: Aktuelle Farbtiefe ist %d. Für bessere Leistung wird eine Farbtiefe "
+-"von 16 bpp empfohlen!\n"
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
+-"video_out_xshm: MIT-Shared-Memory-Erweiterung für Anzeige nicht vorhanden.\n"
++#: src/audio_out/audio_directx2_out.c:192
++#, fuzzy
++msgid "unknown error"
++msgstr "Unbekannter Fehler"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+-"video_out_xshm: Der Videomodus wurde nicht erkannt, Entschuldigung :-(\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+-"video_out_xv: XvShmCreateImage schlug fehl\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+-"video_out_xv: XvShmCreateImage lieferte Größe 0 zurück\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xv.c:305
+-#, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+-"video_out_xv: Shared-Memory-Fehler bei shmget: %s\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+-"video_out_xv: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
+-msgstr "video_out_xv: Xv-Erweiterung nicht vorhanden.\n"
+-
+-#: src/video_out/video_out_xv.c:1304
+-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"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+-"video_out_xv: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
+-"YUV12-Port gefunden.\n"
+-" Unterstützt die Grafikhardware evtl. kein Xv?!\n"
+
+-#: src/video_out/video_out_xv.c:1313
+-#, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+-"video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
+-"Farbraumtransformation und Skalierung.\n"
+
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
+-msgstr "automatischer Farbschlüssel"
+-
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
+-msgstr "Veranlasst Xv automatisch den Farbschlüssel zu zeichnen."
+-
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
+-msgstr "Bilinearer Skalierungsmodus"
+-
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+-"Wählt den bilinearen Skalierungsmodus bei Permedia Karten. Die Werte "
+-"bedeuten:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - deaktiviert bilineares Filtern\n"
+-"1 - aktiviert bilineares Filtern\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - deaktiviert bilineares Filtern\n"
+-"1 - horizontales lineares Filtern\n"
+-"2 - aktiviert volles bilineares Filtern"
+-
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n"
+-
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n"
+-
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
+-msgstr "pitch alignment Abhilfe"
+-
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
+-msgstr "Einige fehlerhafte Videotreiber benötigen dies zur korrekten Funktion."
+-
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
+-msgstr "Deinterlace-Methode (veraltet)"
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+-"Die Konfigurationseinstellung ist veraltet; Sie sollten stattdessen die "
+-"Einstellungen der Deinterlacing Nachbearbeitung verwenden.\n"
+-"\n"
+-"In den Anfangstagen des analogen Fernsehens wurden die geraden und ungeraden "
+-"Zeilen des Videobildes zu verschiedenen Zeiten aufgenommen und angezeigt, um "
+-"Bewegungen flüssiger darzustellen. Dies nennt man \"interlacing\". "
+-"Unglücklicherweise zeigen heutige Bildschirme sowohl gerade und ungerade "
+-"Zeilen immer gleichzeitig als vollständiges Bild an, genannt \"progressiv\", "
+-"was zu Kammartefakten genannten Bildfehlern führt. Softwareinterlacing ist "
+-"ein Ansatz, diese Artefakte zu reduzieren. Die Werte bedeuten:\n"
+-"\n"
+-"none\n"
+-"Deaktiviert Softwaredeinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpoliert zwischen den Linien in bewegten Teilen des Bildes.\n"
+-"\n"
+-"weave\n"
+-"Ähnlich wie bob, mit der Tendez, die volle Auflösung zu erhalten, besser für "
+-"hohe Details in Szenen mit wenig Bewegung.\n"
+-"\n"
+-"greedy\n"
+-"Sehr guter adaptiver Deinterlacer, der aber viel CPU-Leistung benötigt.\n"
+-"\n"
+-"onefield\n"
+-"Interpoliert immer und reduziert die vertikale Auflösung.\n"
+-"\n"
+-"onefieldxv\n"
+-"Wie onefield, benutzt aber die Hardware zur Interpolation.\n"
+-"\n"
+-"linearblend\n"
+-"Verwischt das Bild vertikal, um Kammartefakte zu entfernen. Gute Resultate "
+-"bei mittlerer CPU-Auslastung."
+-
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "xine Videoausgabe benutzt 'MIX XVideo' Erweiterung"
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "xine Videoausgabe benutzt XvMC XVideo-Erweiterung"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
++msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
+-msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
++msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+-"video_out_xvmc: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
+-"YUV12-Port gefunden.\n"
+
+-#: src/video_out/video_out_xvmc.c:1806
+-#, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+-"video_out_xvmc: Benutze Xv-Port %ld von Adapter %s for Hardware-"
+-"Farbraumtransformation und Skalierung\n"
+
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr " IDCT und Bewegungskompensationsbeschleunigung \n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
++msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr " nur Bewegungskompensationsbeschleunigung\n"
++#: src/audio_out/audio_directx2_out.c:540
++#, fuzzy
++msgid "Unable to create primary direct sound buffer."
++msgstr "Puffer kann nicht eingerichtet werden.\n"
+
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
+-msgstr " Keine XvMC-Unterstützung \n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
++msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/audio_out/audio_directx2_out.c:651
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+-msgstr " Mit Überlagerung = %d; UnsignedIntra = %d.\n"
+-
+-#: src/video_out/video_out_xxmc.c:601
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+-"video_out_xv: XvShmCreateImage schlug fehl\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
+
+-#: src/video_out/video_out_xxmc.c:611
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: XvShmCreateImage lieferte Größe 0 zurück\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "video_out: Kann Thread (%s) nicht erzeugen\n"
+
+-#: src/video_out/video_out_xxmc.c:619
++#: src/audio_out/audio_directx2_out.c:759
+ #, fuzzy, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: Shared-Memory-Fehler bei shmget: %s\n"
+-"video_out_xv: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++msgid ": can't create pthread mutex: %s\n"
++msgstr "video_out: Kann Thread (%s) nicht erzeugen\n"
+
+-#: src/video_out/video_out_xxmc.c:651
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: X11-Fehler bei Shared-Memory-XImage-Erstellung\n"
+-"video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "demux_qt: Kann neuen Thread (%s) nicht erzeugen\n"
+
+-#: src/video_out/video_out_xxmc.c:2158
+-#, fuzzy
+-msgid "video_out_xxmc: Xv extension not present.\n"
+-msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n"
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "demux_qt: Kann neuen Thread (%s) nicht erzeugen\n"
+
+-#: src/video_out/video_out_xxmc.c:2195
+-#, fuzzy
+-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"
++#: src/audio_out/audio_directx2_out.c:880
++#, c-format
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+-"video_out_xv: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
+-"YUV12-Port gefunden.\n"
+-" Unterstützt die Grafikhardware evtl. kein Xv?!\n"
+
+-#: src/video_out/video_out_xxmc.c:2204
++#: src/audio_out/audio_directx2_out.c:883
+ #, fuzzy, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-"video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
+-"Farbraumtransformation und Skalierung.\n"
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr "video_out: Kann Thread (%s) nicht erzeugen\n"
+
+-#: src/video_out/video_out_xxmc.c:2380
+-#, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n"
++#: src/audio_out/audio_directx2_out.c:943
++#, fuzzy, c-format
++msgid ": unknown control command %d\n"
++msgstr "iff-ilbm: Unbekannte Kompression: %d\n"
+
+-#: src/video_out/video_out_xxmc.c:2385
++#: src/audio_out/audio_directx2_out.c:996
+ #, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n"
++msgid "second xine audio output plugin using directx"
++msgstr "xine Soundausgabe benutzt directx für win32"
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgstr "audio_esd_out: Verbinde ESD Server %s: %s\n"
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
++msgstr "audio_esd_out: Verbinde ESD Server...\n"
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgstr "audio_esd_out: Kann ESD Server %s nicht verbinden: %s\n"
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "Verzögerung der esd Audioausgabe (Verändert A/V Synchronisation)"
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
++msgstr "xine Soundausgabe benutzt esound"
+
+-#: src/video_out/video_out_xxmc.c:2429
+-msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
+-msgstr ""
++#: src/audio_out/audio_coreaudio_out.c:452
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "xine Soundausgabe benutzt Coreaudio/Mac OS X"
+
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: XShape-Erweiterung nicht verfügbar. Unskalierte Überlagerung "
+-"deaktiviert.\n"
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
++msgstr "xine Soundausgabe benutzt directx für win32"
+
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: Fehler bei Fenstererstellung. Unskalierte Überlagerung deaktiviert.\n"
++#: src/audio_out/audio_file_out.c:362
++msgid "xine file audio output plugin"
++msgstr "xine Date Soundausgabe"
+
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++#: src/audio_out/audio_polyp_out.c:489
++#, fuzzy
++msgid "device used for polypaudio"
++msgstr "Gerät für CD-Audio"
++
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+-"x11osd: Fehler bei Bitmapstellung. Unskalierte Überlagerung deaktiviert.\n"
+
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
+-msgstr "x11osd: Unskaliertes Overlay erzeugt (%s Modus).\n"
++#: src/audio_out/audio_polyp_out.c:535
++#, fuzzy
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "xine Soundausgabe benutzt esound"
+
+ #: src/xine-engine/audio_decoder.c:347
+ #, c-format
+@@ -4133,6 +3915,7 @@
+ msgstr "Anzahl der Audiopuffer"
+
+ #: src/xine-engine/audio_decoder.c:467
++#, fuzzy
+ msgid ""
+ "The number of audio buffers (each is 8k in size) xine uses in its internal "
+ "queue. Higher values mean smoother playback for unreliable inputs, but also "
+@@ -4143,6 +3926,97 @@
+ "unzuverlässigen Quellen, erhöhen aber auch die Latenzzeit und den "
+ "Speicherverbrauch."
+
++#: src/xine-engine/video_decoder.c:373
++#, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
++msgstr "video_decoder: Kein Plugin gefunden zur Behandlung von '%s'\n"
++
++#: src/xine-engine/video_decoder.c:447
++#, c-format
++msgid "video_decoder: error, unknown buffer type: %08x\n"
++msgstr "video_decoder: Fehler, unbekannter Puffertyp: %08x\n"
++
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
++msgstr "Anzahl der Videopuffer"
++
++#: src/xine-engine/video_decoder.c:484
++#, fuzzy
++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 ""
++"Anzahl der Videopuffer (jeder 8KiB groß), die xine für seine interne "
++"Warteschlange benutzt. Höhere Werte bedeuten eine flüssigere Wiedergabe bei "
++"unzuverlässigen Quellen, erhöhen aber auch die Latenzzeit und den "
++"Speicherverbrauch."
++
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
++msgstr ""
++"Die Konfigurationsdatei wurde von einer neueren Version von xine modifiziert."
++
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgstr ""
++"configfile: WARNUNG: Sichern der Konfigurationsdatei nach %s schlug fehl\n"
++
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
++msgstr "configfile: WARNUNG: Ihre Konfigurationsdatei wird nicht gesichert\n"
++
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgstr "configfile: WARNUNG: Schreiben der Konfiguration nach %s schlug fehl\n"
++
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgstr ""
++"configfile: WARNUNG: Entferne möglicherweise kaputte Konfigurationsdatei %s\n"
++
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
++msgstr "configfile: WARNUNG: Überprüfen Sie die Sicherheitskopie %s\n"
++
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgstr "configfile: Eintrag '%s' darf nicht per MRL geändert werden\n"
++
++#: src/xine-engine/info_helper.c:204
++#, fuzzy
++msgid "info_helper: can't find out current locale character set\n"
++msgstr "osd: Kann locale-Zeichensatz nicht erkennen\n"
++
++#: src/xine-engine/info_helper.c:212
++#, fuzzy, c-format
++msgid ""
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgstr ""
++"osd: Nichtunterstützte Konvertierung %s -> %s, keine Konvertierung "
++"durchgeführt\n"
++
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
++msgstr "Status des Sockets konnte nicht ermittelt werden"
++
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
++msgstr "io_helper: Zugriff verweigert\n"
++
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
++msgstr "io_helper: Datei nicht gefunden\n"
++
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
++msgstr "io_ehlper: Verbindung verweigert\n"
++
+ #: src/xine-engine/audio_out.c:1045
+ msgid ""
+ "audio_out: delay calculation impossible with an unavailable audio device\n"
+@@ -4288,64 +4162,344 @@
+ "audio_out: Ups, das sollte eigentlich nicht passieren, bitte xine "
+ "neustarten.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d Bilder angezeigt, %d Bilder übersprungen, %d Bilder verworfen\n"
++
++#: src/xine-engine/video_out.c:739
++#, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
+-"Die Konfigurationsdatei wurde von einer neueren Version von xine modifiziert."
++"video_out: Verwerfe Bild mit pts %<PRId64>, weil es zu alt ist (Unterschied: "
++"%<PRId64>).\n"
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr "Erlaubter Prozentsatz für übersprungene Frames"
++
++#: src/xine-engine/video_out.c:1740
++msgid ""
++"When more than this percentage of frames are not shown, because they were "
++"not decoded in time, xine sends a notification."
++msgstr ""
++"xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
++"angezeigt werden, weil sie nicht rechtzeitig dekodiert werden konnten."
++
++#: src/xine-engine/video_out.c:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr "Erlaubter Prozentsatz für verworfene Frames"
++
++#: src/xine-engine/video_out.c:1746
++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 ""
++"xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
++"angezeigt werden, weil sie nicht rechtzeitig dargestellt werden konnten."
++
++#: src/xine-engine/video_out.c:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++"video_out : Ups, das sollte eigentlich nicht passieren, bitte xine "
++"neustarten.\n"
++
++#: src/xine-engine/input_cache.c:164
++#, fuzzy
++msgid ": open() function should never be called\n"
++msgstr "input_rip: open()-Funktion sollte niemals aufgerufen werden\n"
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "input_rip: Input-Plugin nicht definiert!\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr "xine: Fehler beim Parsen der MRL\n"
++
++#: src/xine-engine/xine.c:681
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: Inputplugin gefunden: %s\n"
++
++#: src/xine-engine/xine.c:689
++#, c-format
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: Plugin kann MRL [%s] nicht öffnen\n"
++
++#: src/xine-engine/xine.c:707
++#, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: Kann kein Plugin für MRL [%s] finden\n"
++
++#: src/xine-engine/xine.c:733
++#, c-format
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine: Demultiplexer-Plugins %s startete nicht\n"
++
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
++msgstr "xine: Join rip Plugin\n"
++
++#: src/xine-engine/xine.c:774
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "xine: Fehler beim Öffnen einer RIP-Plugin-Instanz\n"
++
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine: Letztes Demultiplexer-Plugins %s startete nicht\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr "Ignoriere Video\n"
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr "Ignoriere Audio\n"
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr "Ignoriere Untertitel\n"
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
+ msgstr ""
+-"configfile: WARNUNG: Sichern der Konfigurationsdatei nach %s schlug fehl\n"
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
+-msgstr "configfile: WARNUNG: Ihre Konfigurationsdatei wird nicht gesichert\n"
++#: src/xine-engine/xine.c:944
++#, c-format
++msgid "subtitle mrl opened '%s'\n"
++msgstr "Untertitel-MRL öffnet '%s'\n"
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/xine.c:948
++msgid "xine: error opening subtitle mrl\n"
++msgstr "xine: Fehler beim Öffnen der Untertitel-MRL\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr "xine: Fehler beim parsen der MRL\n"
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
+-msgstr "configfile: WARNUNG: Schreiben der Konfiguration nach %s schlug fehl\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
++msgstr "xine: Das Ändern der Option '%s' per MRL ist verboten\n"
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:1007
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: Kann keinen Demultiplexer für >%s< finden\n"
++
++#: src/xine-engine/xine.c:1023
++#, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: Demultiplexer-Plugin gefunden: %s\n"
++
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr "xine: Demultiplexer-Plugins startete nicht\n"
++
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: Kein Demultiplexer vorhanden\n"
++
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: Demultiplexer startete nicht\n"
++
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++msgstr "xine: Das angegebene save_dir '%s' kann ein Sicherheitsproblem sein.\n"
++
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr "Das angegebene save_dir kann ein Sicherheitsproblem sein."
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr "xine: Locale wird nicht von C-Bibliothek unterstützt\n"
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr "Medienformaterkennungsstrategie"
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
+ msgstr ""
+-"configfile: WARNUNG: Entferne möglicherweise kaputte Konfigurationsdatei %s\n"
++"xine bietet verschiedene Methoden, um das Medienformat der Quelle zu "
++"erkennen. Die Werte bedeuten:\n"
++"\n"
++"default\n"
++"Zuerst anhand des Inhalts erkennen, dann anhand der Dateiendung.\n"
++"\n"
++"reverse\n"
++"Zuerst anhand der Dateiendung erkennen, dann anhand des Inhalts.\n"
++"\n"
++"content\n"
++"Nur anhand des Inhalts erkennen.\n"
++"\n"
++"extension\n"
++"Nur anhand der Dateiendung erkennen.\n"
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
++msgstr "Pfad zum Sichen von Datenströmen"
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++"Wenn Datenströme gesichert werden sollen, werden Dateien in dieses "
++"Verzeichnis geschrieben.\n"
++"Diese Einstellung ist Sicherheitskritisch, da falle sie geändert wird, xine "
++"benutzt werden kann, um Dateien mit beliebigen Inhalt zu füllen. Stellen Sie "
++"sicher, daß das Verzeichnis robust ist für beliebige Inhalte in jeder Datei."
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr "Erlaube implizierte Änderungen an Konfiguration (z.B. durch MRL)"
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++"Falls aktiviert, können Einstellungen auch ohne eine explizite Aktion "
++"Ihrerseits verändert werden. Zum Beispiel werden durch MRLs oder durch die "
++"Playliste geforderte Konfiguratonsänderungen ausgeführt.\n"
++"Diese Einstellung ist Sicherheitskritisch, da xine MRLs oder Playlisten von "
++"unvertrauenswürdigen Stellen empfangen kann. Falls diese willkürlichen "
++"Änderungen erlaubt sind, kann dies zu einem verkonfigurierten xine führen."
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "Nachrichten"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "Plugin"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr "Programmverfolgung"
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
+-msgstr "configfile: WARNUNG: Überprüfen Sie die Sicherheitskopie %s\n"
++msgid "font '%s-%d' already loaded, weird.\n"
++msgstr "Zeichensatz '%s-%d' bereits geladen, seltsam.\n"
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/osd.c:678
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+-msgstr "configfile: Eintrag '%s' darf nicht per MRL geändert werden\n"
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr "Laden des Zeichensatzs '%s' schlug fehl (%d <%d)\n"
+
+-#: src/xine-engine/info_helper.c:204
+-#, fuzzy
+-msgid "info_helper: can't find out current locale character set\n"
+-msgstr "osd: Kann locale-Zeichensatz nicht erkennen\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr "Falsche Version von Zeichensatz '%s'. Erwartet %d gefunden %d.\n"
+
+-#: src/xine-engine/info_helper.c:212
+-#, fuzzy, c-format
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr "osd: Kann ft2-Bibliothek nicht initialisieren\n"
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr "osd: Fehler beim Laden des Zeichensatz %s mit ft2\n"
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++"osd: Fehler beim Setzen der Zeichensatzgröße (kein skalierbarer "
++"Zeichensatz?)\n"
++
++#: src/xine-engine/osd.c:901
++#, c-format
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++"osd: Unbekannte Sequenz startet mit Byte 0x%02X in Kodierung \"%s\", "
++"überspringe\n"
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
++msgstr "osd: Kann locale-Zeichensatz nicht erkennen\n"
++
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+ msgstr ""
+ "osd: Nichtunterstützte Konvertierung %s -> %s, keine Konvertierung "
+ "durchgeführt\n"
+
+-#: src/xine-engine/input_cache.c:164
+-#, fuzzy
+-msgid ": open() function should never be called\n"
+-msgstr "input_rip: open()-Funktion sollte niemals aufgerufen werden\n"
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr "osd: Zeichensatz nicht definiert\n"
+
+-#: src/xine-engine/input_cache.c:323
+-#, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "input_rip: Input-Plugin nicht definiert!\n"
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr "osd: Fehler beim Laden von Bildzeichen\n"
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr "osd: Fehler beim Darstellen von Bildzeichen\n"
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr "osd: Fehler beim Laden des Bildzeichens %i\n"
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr "osd: Fehler beim Darstellen\n"
++
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr "Farbpalette (Vordergrund-Rand-Hintergrund) für Untertitel und OSD"
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
++"Die Palette für OSD und die Untertitelformate, welche ihrerseits keine "
++"Färbung spezifizieren. Die Paletten sind in der Form Vordergrund-Rand-"
++"Hintergrund aufgelistst."
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, c-format
+@@ -4359,7 +4513,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_rip: Schreibfehler bei %lld Bytes: %s\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -4377,7 +4531,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, fuzzy, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr "input_rip: %lld Bytes verworfen\n"
+
+ #: src/xine-engine/input_rip.c:546
+@@ -4421,22 +4575,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_ipd: Fehler beim Öffnen der Datei %s: %s\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr "Status des Sockets konnte nicht ermittelt werden"
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr "io_helper: Zugriff verweigert\n"
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr "io_helper: Datei nicht gefunden\n"
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr "io_ehlper: Verbindung verweigert\n"
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -4545,12 +4683,12 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: Benutze Demultiplexer '%s'\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "load_plugins: Audio-Plugin <%s> konnte nicht geladen werden\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+@@ -4558,160 +4696,6 @@
+ "load_plugins: Suche nach Audio-Ausgabe fand keinen benutzbaren "
+ "Audiotreiber.\n"
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr "Zeichensatz '%s-%d' bereits geladen, seltsam.\n"
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr "Laden des Zeichensatzs '%s' schlug fehl (%d <%d)\n"
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr "Falsche Version von Zeichensatz '%s'. Erwartet %d gefunden %d.\n"
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr "osd: Kann ft2-Bibliothek nicht initialisieren\n"
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr "osd: Fehler beim Laden des Zeichensatz %s mit ft2\n"
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-"osd: Fehler beim Setzen der Zeichensatzgröße (kein skalierbarer "
+-"Zeichensatz?)\n"
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-"osd: Unbekannte Sequenz startet mit Byte 0x%02X in Kodierung \"%s\", "
+-"überspringe\n"
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr "osd: Kann locale-Zeichensatz nicht erkennen\n"
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-"osd: Nichtunterstützte Konvertierung %s -> %s, keine Konvertierung "
+-"durchgeführt\n"
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr "osd: Zeichensatz nicht definiert\n"
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr "osd: Fehler beim Laden von Bildzeichen\n"
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr "osd: Fehler beim Darstellen von Bildzeichen\n"
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr "osd: Fehler beim Laden des Bildzeichens %i\n"
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr "osd: Fehler beim Darstellen\n"
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr "Farbpalette (Vordergrund-Rand-Hintergrund) für Untertitel und OSD"
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-"Die Palette für OSD und die Untertitelformate, welche ihrerseits keine "
+-"Färbung spezifizieren. Die Paletten sind in der Form Vordergrund-Rand-"
+-"Hintergrund aufgelistst."
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr "video_decoder: Kein Plugin gefunden zur Behandlung von '%s'\n"
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr "video_decoder: Fehler, unbekannter Puffertyp: %08x\n"
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr "Anzahl der Videopuffer"
+-
+-#: src/xine-engine/video_decoder.c:484
+-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 ""
+-"Anzahl der Videopuffer (jeder 8KiB groß), die xine für seine interne "
+-"Warteschlange benutzt. Höhere Werte bedeuten eine flüssigere Wiedergabe bei "
+-"unzuverlässigen Quellen, erhöhen aber auch die Latenzzeit und den "
+-"Speicherverbrauch."
+-
+-#: src/xine-engine/video_out.c:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d Bilder angezeigt, %d Bilder übersprungen, %d Bilder verworfen\n"
+-
+-#: src/xine-engine/video_out.c:739
+-#, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out: Verwerfe Bild mit pts %<PRId64>, weil es zu alt ist (Unterschied: "
+-"%<PRId64>).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr "Erlaubter Prozentsatz für übersprungene Frames"
+-
+-#: src/xine-engine/video_out.c:1740
+-msgid ""
+-"When more than this percentage of frames are not shown, because they were "
+-"not decoded in time, xine sends a notification."
+-msgstr ""
+-"xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
+-"angezeigt werden, weil sie nicht rechtzeitig dekodiert werden konnten."
+-
+-#: src/xine-engine/video_out.c:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr "Erlaubter Prozentsatz für verworfene Frames"
+-
+-#: src/xine-engine/video_out.c:1746
+-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 ""
+-"xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
+-"angezeigt werden, weil sie nicht rechtzeitig dargestellt werden konnten."
+-
+-#: src/xine-engine/video_out.c:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-"video_out : Ups, das sollte eigentlich nicht passieren, bitte xine "
+-"neustarten.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr "Horizontale Bildposition im Ausgabefenster"
+@@ -4751,224 +4735,466 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
+-msgstr "xine: Fehler beim Parsen der MRL\n"
+-
+-#: src/xine-engine/xine.c:667
+-#, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: Inputplugin gefunden: %s\n"
+-
+-#: src/xine-engine/xine.c:675
+-#, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: Plugin kann MRL [%s] nicht öffnen\n"
+-
+-#: src/xine-engine/xine.c:693
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: Kann kein Plugin für MRL [%s] finden\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++msgstr "libareal: (Audio) Kann Symbole nicht auflösen - Inkompatible DLL: %s\n"
+
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine: Demultiplexer-Plugins %s startete nicht\n"
+-
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
+-msgstr "xine: Join rip Plugin\n"
+-
+-#: src/xine-engine/xine.c:760
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "xine: Fehler beim Öffnen einer RIP-Plugin-Instanz\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
++msgstr "libareal: Dekoderinitialisierung schluf fehl, Fehlercode: 0x%x\n"
+
+-#: src/xine-engine/xine.c:791
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine: Letztes Demultiplexer-Plugins %s startete nicht\n"
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
+-msgstr "Ignoriere Video\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgstr ""
++"libareal: Einrichtung der Dekodervariante schlug fehl, Fehlercode: 0x%x\n"
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
+-msgstr "Ignoriere Audio\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgstr "libareal: Ups, Real ünterstützt mehr als 2 Kanäle?\n"
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
+-msgstr "Ignoriere Untertitel\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
++msgstr "Pfad zum Real-Player-Codecs"
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
++"Geben Sie hier den Pfad zum codec-Verzeichnis von RealPlayer an, falls es "
++"installiert ist. Sie können das codec-Verzeichnis einfach finden, in dem Sie "
++"nach der Datei \"drv3.so.6.0\" in ihm suchen. Falls xine die RealPlayer-"
++"Codecs findet, verwendet xine diese zum dekodieren von RealPlayer-Inhalten. "
++"Konsultieren Sie die xine FAQ für weitere Informationen, wie die Codecs zu "
++"installieren sind."
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
+-msgstr "Untertitel-MRL öffnet '%s'\n"
+-
+-#: src/xine-engine/xine.c:934
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "xine: Fehler beim Öffnen der Untertitel-MRL\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
+-msgstr "xine: Fehler beim parsen der MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++msgstr "libreal: Kann Symbole nicht auflösen! (Version inkompatibel?)\n"
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
+-msgstr "xine: Das Ändern der Option '%s' per MRL ist verboten\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
++msgstr ""
++"Mosaico ermöglicht einfache Bild-in-Bild Effekte.\n"
++"\n"
++"Parameter\n"
++" pic_num: Nummer des Bildbereiches, für den die folgenden Werte gelten\n"
++" x: Die X-Koordinate der linken oberen Ecke des Bilds\n"
++" y: Die Y-Koordinate der linken oberen Ecke des Bilds\n"
++" w: Die Breite des Bilds\n"
++" h: Die Höhe des Bilds\n"
+
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: Kann keinen Demultiplexer für >%s< finden\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
++msgstr ""
++"Schalter kann benutzt werden, um schnell zwischen mehreren Quellen "
++"umzuschalten.\n"
++"\n"
++"Parameter\n"
++" select: Die Nummer der Quelle, die zum Ausgang geleitet werden soll\n"
+
+-#: src/xine-engine/xine.c:1009
+-#, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: Demultiplexer-Plugin gefunden: %s\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
++msgstr ""
++"FFmpeg libpostprocess Plugin.\n"
++"\n"
++"Parameter\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine: Demultiplexer-Plugins startete nicht\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: Kein Demultiplexer vorhanden\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
++"Software-Equalizer mit interaktiver Steuerung ähnlich Hardware-Equalizer für "
++"solche Karten/Treiber, die keine Helligkeits-/Kontraststeuerung in Hardware "
++"besitzen.\n"
++"\n"
++"Parameters\n"
++" brightness: Helligkeit\n"
++" contrast: Kontrast\n"
++"\n"
++"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
++"diese Parameter zu setzen.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: Demultiplexer startete nicht\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
++msgstr ""
++"Dieses expand-Plugin konvertiert Bilder mit beliebigem Seitenverhältnis in "
++"Bilder mit einem Seitenverhältnis von 4:3 durch Hinzufügen von schwarzen "
++"Balken am oberen und unteren Bildrand. Dadurch können Überlagerungen nach "
++"unten verschoben werden, so daß sie nicht das Bild überdecken.\n"
++"\n"
++"Parameter\n"
++" Enable_automatic_shift: Automatisch Überlagerung verschieben\n"
++" Overlay_y_offset: Manuelle vertikale Überlagerungsverschiebung\n"
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+-msgstr "xine: Das angegebene save_dir '%s' kann ein Sicherheitsproblem sein.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++msgstr ""
++"Dieser Filter reduziert Bildrauschen und erzeugt sehr gleichmäßige Bilder "
++"und macht Standbilder sehr still (sollte Komprimierbarkeit verbessern). Es "
++"können 0-3 Parameter angegeben werden. Für ausgelassene Parameter werden "
++"passende Werte verwendet.\n"
++"\n"
++"Parameter\n"
++" Luma: Lokale Helligkeitsstärke (Standard = 4)\n"
++" Chroma: Lokale Farbstärke (Standard = 3)\n"
++" Time: Zeitliche Stärke (Standard = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
+-msgstr "Das angegebene save_dir kann ein Sicherheitsproblem sein."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++msgstr ""
++"Box blur verwischt ein Bild.\n"
++"\n"
++"Parameter\n"
++" Radius: Größe des Filters\n"
++" Power: Anzahl der Anwendungen dieses Filters\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
+-msgstr "xine: Locale wird nicht von C-Bibliothek unterstützt\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++msgstr ""
++"Alternativer Software-Equalizer, der Tabellen benutzt (sehr langsam) und "
++"zusätzlich zu Helligkeit, Kontrast ybd Sättigung Gamma-Korrekturen erlaubt.\n"
++"Beachten Sie, daß derselbe MMX-optimierte Code von 'eq' benutzt wird, falls "
++"alle Gamma-Werte 1.0 sind.\n"
++"\n"
++"Parameter\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (Gamma für Rotanteil)\n"
++" ggamma (Gamma für Grünanteil)\n"
++" bgamma (Gamma für Blauanteil)\n"
++"\n"
++"Wertebereiche sind 0.1 bis 10 für Famma, -2 bis 2 für Kontrast (negative "
++"Werte resultieren in ein negatives Bild), -1 bis 1 für Helligkeit und 0 bis "
++"3 für Sättigung.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
+-msgstr "Medienformaterkennungsstrategie"
++#: src/post/planar/unsharp.c:219
++#, fuzzy
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
++msgstr ""
++"Unschärfemake / Gauß'sche Unschärfe\n"
++"Die Breite und Höhe der Matrix kann gesetzt werden, beide Dimensionen müssen "
++"ungerade sein (Minimum 3x3, Maximum 13x11 oder 11x13, normalerweise zwischen "
++"3x3 und 7x7. Der relative Grad der Schärfe/Unschärfe, die dem Bild "
++"hinzugefügt wird, sollte typischerweise zwischen -1.5 und 1.5 liegen).\n"
++"\n"
++"Parameter\n"
++"\n"
++" Luma_matrix_width: Breite der Matrik (muß ungerade sein)\n"
++" Luma_matrix_hieght: Höhe der Matrik (muß ungerade sein)\n"
++" Luma_amount: Relativer Grad der Schärfe/Unschärfe (=0 deaktiviert, <0 "
++"Unschärfe, >0 Schärfe)\n"
++" Chroma_matrix_width: Breite der Matrik (muß ungerade sein)\n"
++" Chroma_matrix_height: Höhe der Matrik (muß ungerade sein)\n"
++" Chroma_amount: Relativer Grad der Schärfe/Unschärfe (=0 deaktiviert, <0 "
++"Unschärfe, >0 Schärfe)\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+-"xine bietet verschiedene Methoden, um das Medienformat der Quelle zu "
+-"erkennen. Die Werte bedeuten:\n"
++"Erweitertes tvtime/deinterlacer Plugin mit pulldown-Erkennung\n"
++"Dieses Plugin hat das Ziel, Deinterlacing-Mechanismen vergleichbar mit "
++"hochqualitativen progressiven DVD-Playern und sogenannten Zeilenverdopplern "
++"für die Benuztung mit Rechnermonitoren, Projektoren und anderen progressiven "
++"Anzeigegerätzen zur Verfügung zu stellen.\n"
+ "\n"
+-"default\n"
+-"Zuerst anhand des Inhalts erkennen, dann anhand der Dateiendung.\n"
++"Parameter\n"
+ "\n"
+-"reverse\n"
+-"Zuerst anhand der Dateiendung erkennen, dann anhand des Inhalts.\n"
++" Method: Wählt die zu benutzende Deinterlaging-Methode/Algorithmus aus. "
++"Eine genaue Beschreibung jeder Methode folgt weiter unten.\n"
+ "\n"
+-"content\n"
+-"Nur anhand des Inhalts erkennen.\n"
++" Enabled: Aktiviert/Deaktiviert das Plugin.\n"
+ "\n"
+-"extension\n"
+-"Nur anhand der Dateiendung erkennen.\n"
++" Pulldown: Wählt den 2-3 Pulldown-Erkennungs-Algorithmus. 24 BpS Filme, die "
++"nach NTSC konvertiert wurden, können erkannt und intelligent in ihr nicht-"
++"interlaced Originalformat zurückkonvertiert werden.\n"
++"\n"
++" Framerate_mode: 'full' entflechtet jedes Feld in ein eigenes Bild in "
++"Fernsehqualitaet oder besser. Dieser Modus verdoppelt effektiv die "
++"Bildwiederholrate und verbessert die Gleichförmigkeit. Beachten Sie, daß "
++"volle 59.94 BpS mit einem Linux-2.4-Kernel (mit einer Zeitgeberunterbrechung "
++"von 100Hz) nicht möglich sind. Neuere Kernel (2.6er Kernel oder Kernel mit "
++"512 oder 1000 Hz) sollten anstandslos funktionieren.\n"
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Falls 2-3-Pulldown aktiviert ist und entsprechendes "
++"Filmmaterial erkannt wurde, kann die Bildwiederholrate auf die ursprängliche "
++"Rate (24 BpS) reduziert werden. Das macht die Bilder gleichförmiger über die "
++"Zeit verteilt. Dies reduziert den Rubbeleffekt.\n"
++"\n"
++" Use_progressive_frame_flag: Gut gemeisterte MPEG2-Datenströme benutzen ein "
++"Kennzeichen, daß progressives Material kennzeichnet. Diese Einstellung "
++"kontrolliert, ob diesem Kennzeichen vertraut werden soll oder nicht (Einige "
++"seltene und fehlerhafte MPEG2-Datenströme setzen es falsch).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 benutzen ein verschränktes Bildformat, daß eine "
++"schlechte vertikale Farbauflösung hat. Das Hochskalieren dieser "
++"Farbinformation zum Entflechten kann das Auftreten von Artefakten "
++"hervorrufen (z.B. Farbstreifen). Benutzen Sie diese Option, um die "
++"Farbinformation nach dem Entflechten zu verwischen, um solche Artifakte zu "
++"entfernen. Achtung: CPU intensiv.\n"
++"\n"
++" Cheap_mode: Die überspringt die aufwendige YV12->YUV2 Bildkonvertierung, "
++"aber die tvtime/dscaler-Routinen arbeiten weiterhin so, als wäre es YUV2. "
++"Nätürlich ist das nicht korrekt, da nicht alle Pixel von den Algorithmen "
++"ausgewertet werden, um die Regionen zum entflechten zu entscheiden, und "
++"Farbinformationen werden getrennt bearbeitet. Dieses Vorgehen erlaubt es "
++"Personen mit leistungsärmeren Systemen trotzdem die Entflechtungsalgorithmen "
++"als Kompromiss zwischen Qualität und CPU-Auslastung auszuprobieren.\n"
++"\n"
++"Deinterlacing methods: (Nicht alle Methoden stehen auf allen Platformen zur "
++"Verfügung)\n"
++"\n"
++"* Benutzt verschiedene Algorithmen von tvtime und vom dscaler Projekt.\n"
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
+-msgstr "Pfad zum Sichen von Datenströmen"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
++msgstr "tvtime: Keine Deinterlacingmethoden verfügbar, beendet.\n"
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+-"Wenn Datenströme gesichert werden sollen, werden Dateien in dieses "
+-"Verzeichnis geschrieben.\n"
+-"Diese Einstellung ist Sicherheitskritisch, da falle sie geändert wird, xine "
+-"benutzt werden kann, um Dateien mit beliebigen Inhalt zu füllen. Stellen Sie "
+-"sicher, daß das Verzeichnis robust ist für beliebige Inhalte in jeder Datei."
++"Dieser Filter führt eine zeitliche Ausdehnung durch, was den Datenstrom um "
++"einen Faktor schneller oder langsamer abspielt. Die Tonhöhe kann optional "
++"erhalten werden, was es z.B. möglich macht, einen Film in weniger als seiner "
++"originalen Aufnahmedauer anzusehen.\n"
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
+-msgstr "Erlaube implizierte Änderungen an Konfiguration (z.B. durch MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++msgstr ""
++"Upmix Funktion, produziere aus Stereoeingangssignal 5.1 Raumklang.\n"
++"Parameter\n"
++" cut_off_freq\n"
++"\n"
++"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
++"diese Parameter zu setzen.\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr "Zu generierende Bilder/Sekunde"
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+-"Falls aktiviert, können Einstellungen auch ohne eine explizite Aktion "
+-"Ihrerseits verändert werden. Zum Beispiel werden durch MRLs oder durch die "
+-"Playliste geforderte Konfiguratonsänderungen ausgeführt.\n"
+-"Diese Einstellung ist Sicherheitskritisch, da xine MRLs oder Playlisten von "
+-"unvertrauenswürdigen Stellen empfangen kann. Falls diese willkürlichen "
+-"Änderungen erlaubt sind, kann dies zu einem verkonfigurierten xine führen."
++"Mit mehr Bildern pro Sekunde wird die Animation flüssiger und schneller, "
++"benötigt aber mehr CPU Rechenzeit."
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "Nachrichten"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr "Goom Bildbreite"
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "Plugin"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr "Die Breite des zu generierenden Bilds in Pixeln."
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
+-msgstr "Programmverfolgung"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
++msgstr "Goom Bildhöhe"
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
+-msgstr "xines Methode zum Kopieren von Speicher"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
++msgstr "Die Höhe des zu generierenden Bilds in Pixeln."
+
+-#: src/xine-utils/memcpy.c:482
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
++msgstr "Farbraumkonvertierungsmethode"
++
++#: src/post/goom/xine_goom.c:219
+ msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+-"Das Kopieren von großen Speicherblöcken ist eine der teuersten Operationen "
+-"in heutigen Computern. Deshalb unterstützt xine verschiedene optimierte "
+-"Methoden für dieses Kopieren, von denen normalerweise automatisch die beste "
+-"gewählt wird."
+-
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
+-msgstr "Geschwindigkeitsvergleich der memcpy-Methoden (klein ist besser):\n"
++"Sie können die Methode zum Konvertieren des Farmraums in Goom wählen.\n"
++"Die auswählbaren Möglichkeiten sollten selbsterklärend sein."
+
+ #~ msgid "audio_oss_out: open() %s failed: %s\n"
+ #~ msgstr "audio_oss_out: open() %s schlug fehl: %s\n"
+@@ -4981,6 +5207,15 @@
+ #~ "Menuknopf 7 deaktiviert dies zwischenzeitlich."
+
+ #~ msgid ""
++#~ "A Comma separated list of domain names, where the proxy is to be ignored."
++#~ msgstr ""
++#~ "Eine kommaseparierte Liste von Domainnamen, bei denen der Proxy ignoriert "
++#~ "werden soll."
++
++#~ msgid "selection has no DEFAULT entry"
++#~ msgstr "Auswahl hat keinen DEFAULT-Eintrag"
++
++#~ msgid ""
+ #~ "You can disable video scaling globally. The image will then no longer "
+ #~ "adapt to the size of the video window, which can dramatically reduce CPU "
+ #~ "usage."
+@@ -4992,9 +5227,6 @@
+ #~ msgid "xine video output plugin using OpenGL - TNG"
+ #~ msgstr "xine Videoausgabe mit OpenGL - TNG"
+
+-#~ msgid "No error"
+-#~ msgstr "Kein Fehler"
+-
+ #~ msgid "Unknown host"
+ #~ msgstr "Unbekannter Rechner"
+
+@@ -5007,9 +5239,6 @@
+ #~ msgid "Host name lookup failure"
+ #~ msgstr "Namensauflösung schlug fehl"
+
+-#~ msgid "Unknown error"
+-#~ msgstr "Unbekannter Fehler"
+-
+ #~ msgid "device used for 5+ channel output"
+ #~ msgstr "Gerät für 5+-Kanalausgabe"
+
+@@ -5345,9 +5574,6 @@
+ #~ msgid "Default active stream"
+ #~ msgstr "Standardstrom"
+
+-#~ msgid "video_out: can't create thread (%s)\n"
+-#~ msgstr "video_out: Kann Thread (%s) nicht erzeugen\n"
+-
+ #~ msgid "Enable A52 / AC5 digital audio output via spdif"
+ #~ msgstr "Aktiviere digitalen A52 / AC5 Raumklang via SPDIF"
+
+@@ -5408,9 +5634,6 @@
+ #~ msgid "rtp input plugin as shipped with xine"
+ #~ msgstr "Mit xine ausgeliefertes rtp Plugin"
+
+-#~ msgid "unable to allocate input buffer.\n"
+-#~ msgstr "Puffer kann nicht eingerichtet werden.\n"
+-
+ #~ msgid "demux_mpgaudio: no audio driver!\n"
+ #~ msgstr "demux_mpgaudio: Kein Audio-Treiber!\n"
+
+@@ -5643,6 +5866,9 @@
+ #~ msgid "valid mrls ending for ts demuxer"
+ #~ msgstr "Gültige MRL-Endungen für TS-Demultiplexer"
+
++#~ msgid "demux_ts: can't create new thread (%s)\n"
++#~ msgstr "demux_ts: Kann neuen Thread (%s) nicht erzeugen\n"
++
+ #~ msgid "stdin/fifo input plugin as shipped with xine"
+ #~ msgstr "Mit xine ausgeliefertes stdin/fifi Plugin"
+
+@@ -6721,9 +6947,6 @@
+ #~ msgid "demux_qt: unknown audio codec >%s<\n"
+ #~ msgstr "demux_qt: Unbekannter Audio-Codec >%s<\n"
+
+-#~ msgid "demux_qt: can't create new thread (%s)\n"
+-#~ msgstr "demux_qt: Kann neuen Thread (%s) nicht erzeugen\n"
+-
+ #~ msgid ""
+ #~ "demux_ogg: beginning of stream\n"
+ #~ "demux_ogg: serial number %d\n"
+--- ./po/es.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/es.po 2005-02-12 22:28:46.000000000 +0000
+@@ -5,8 +5,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib 0.9.13\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2002-02-20 00:00+0100\n"
+ "Last-Translator: Juan Manuel García Molina <juanma_gm@wanadoo.es>\n"
+ "Language-Team: Spanish <es@li.org>\n"
+@@ -16,500 +17,1082 @@
+ "X-Generator: KBabel 0.9.5\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
++#: src/libsputext/demux_sputext.c:1507
++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_decoder.c:900
++msgid "subtitle size"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:901
++msgid ""
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:923
++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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:714
+ #, c-format
+-msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libffmpeg/dvaudio_decoder.c:303
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr ""
++
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
+-#, fuzzy, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "input_cda: falló open(%s): %s.\n"
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
++msgstr ""
++
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "demux_ts: no se puede crear un hilo nuevo (%s)\n"
++
++#: src/libmusepack/xine_decoder.c:237
++#, c-format
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
+ msgstr ""
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-msgid "xine output plugin for Coreaudio/Mac OS X"
++#: src/video_out/video_out_xvmc.c:1797
++msgid ""
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgid "video_out_vidix: using driver: %s by %s\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
+ msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
+-#, fuzzy
+-msgid "xine file audio output plugin"
+-msgstr "plugin de entrada de stream de red http"
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:385
+-msgid "irixal audio output maximum gap length"
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++msgid "framebuffer device name"
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
+ msgstr ""
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, fuzzy, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:773
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
+-#, fuzzy, c-format
++#: src/video_out/video_out_xxmc.c:651
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
+-msgstr "input_cda: fallo al abrir el servidor '%s:%d': %s\n"
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:800
+-msgid "a/v sync method to use by OSS"
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2195
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
++"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:2204
++#, c-format
++msgid ""
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
++msgid ""
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:190
++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:206
++#, 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:216
++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:233
++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:1138
++#, c-format
++msgid ""
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:856
+-msgid "OSS audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_fb.c:762
++#, c-format
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_fb.c:949
++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/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:1016
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1074
+-#, fuzzy, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "input_cda: falló open(%s): %s.\n"
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:489
+-msgid "device used for polypaudio"
++#: src/video_out/video_out_sdl.c:480
++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/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
+-msgid "xine audio output plugin using polypaudio sound server"
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr ""
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr ""
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr ""
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, fuzzy, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "input_sun_out: fallo al abrir el servidor '%s:%d': %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
++
++#: src/video_out/alphablend.c:1768
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
+-"This setting is security critical, because when changed to a different file, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:468
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, fuzzy, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: copyright : %s\n"
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
++#: src/video_out/video_out_xv.c:1304
++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/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
++#: src/video_out/video_out_xv.c:1313
+ #, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: el índice del avi está roto\n"
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, fuzzy, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
+-msgstr "demux_avi: falló el posicionamiento de vídeo al inicio\n"
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
++
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr ""
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -519,19 +1102,15 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+ #: src/demuxers/demux_mpeg_block.c:296
+@@ -559,6 +1138,29 @@
+ "demux_mpeg_block: aviso: la cabecera pes indica que este stream puede\n"
+ " estar encriptado (modo de encriptación %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:1738
++#, fuzzy, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: copyright : %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:149
++#, fuzzy, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_avi: tipo de audio desconocido 0x%lx\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -591,29 +1193,23 @@
+ "xine developers.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
+ msgstr ""
+
+-#: src/demuxers/demux_snd.c:149
+-#, fuzzy, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_avi: tipo de audio desconocido 0x%lx\n"
+-
+-#: src/demuxers/demux_voc.c:105
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
+ msgstr ""
+
+-#: src/demuxers/demux_voc.c:120
+-#, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
+-msgstr ""
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: el índice del avi está roto\n"
++
++#: src/demuxers/demux_avi.c:850
++#, fuzzy, c-format
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
++msgstr "demux_avi: falló el posicionamiento de vídeo al inicio\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -624,598 +1220,531 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
+-msgstr ""
+-
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:235
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgid "iff-8svx/16sv: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:250
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
+-msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
+-#, fuzzy, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:685
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgid ""
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:696
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
+-msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++#: src/libw32dll/w32codec.c:1216
++#, c-format
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:182
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:201
++#, fuzzy, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:209
++#, fuzzy, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:216
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr ""
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
+-msgstr ""
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) falló (¿kernel multicast?): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
+-msgstr ""
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "no se puede resolver '%s'.\n"
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
+-msgstr ""
++#: src/input/input_rtp.c:286
++#, fuzzy, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "no se puede conectar a '%s'.\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
+-msgstr ""
++#: src/input/input_rtp.c:314
++#, fuzzy, c-format
++msgid "recv(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
+-msgstr ""
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: no se puede crear un hilo nuevo (%s)\n"
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr ""
++#: src/input/input_rtp.c:742
++#, fuzzy
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "plugin de entrada de red incluido en xine"
+
+-#: src/dxr3/video_out_dxr3.c:272
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
++#: src/input/mmsh.c:232
++#, fuzzy
++msgid "libmmsh: send error\n"
++msgstr "input_http: error de lectura\n"
++
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "input_http: redirección 3xx no implementada: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "input_http: el estado de http no es 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
++#: src/input/mmsh.c:298
++#, fuzzy
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "input_http: Redirección de \"location\" no implementada\n"
++
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
+-msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
++#: src/input/vcd/xineplug_inp_vcd.c:1713
++msgid ""
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
+-msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "http: no se puede conectar a >%s<\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
++msgstr ""
+
+-#: src/input/input_cdda.c:1540
+-#, fuzzy, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cda: servidor '%s:%d' conectado con éxito.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++msgid ""
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
++msgstr ""
+
+-#: src/input/input_cdda.c:1545
+-#, fuzzy, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_net: no se puede conectar a '%s'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr ""
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1754
++msgid ""
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2586
+-msgid "device used for CD audio"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/vcdio.c:217
++#, fuzzy
++msgid "SEEK_CUR not implemented for non-zero offset"
++msgstr "input_vcd: SEEK_CUR no implementado para desplazamientos != 0\n"
++
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
+ msgstr ""
+
+-#: src/input/input_dvb.c:834
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr ""
++
++#: src/input/input_dvb.c:838
+ #, fuzzy, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_file: intentando abrir el archivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ #, fuzzy
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_vcd: falló la lectura de datos\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ #, fuzzy
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvd: no se puede abrir la unidad de dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_file: intentando abrir el archivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_file: intentando abrir el archivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, fuzzy, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvd: no se puede abrir la unidad de dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: no se puede crear un hilo nuevo (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ #, fuzzy
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ #, fuzzy
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ msgid "device used for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1226,22 +1755,22 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1250,44 +1779,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1306,11 +1835,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1324,154 +1853,168 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: error de lectura (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr ""
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, fuzzy, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_cda: falló fopen(%s): %s\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "input_http: falló al abrir el socket\n"
+
+-#: src/input/input_file.c:286
+-#, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: error de lectura (%s)\n"
++#: src/input/input_stdin_fifo.c:342
++#, fuzzy
++msgid "stdin streaming input plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr ""
++#: src/input/input_mms.c:424
++#, fuzzy
++msgid "mms streaming input plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
+ msgstr ""
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
+ msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-#: src/input/input_gnome_vfs.c:218
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr ""
++
++#: src/input/input_pnm.c:266
+ #, fuzzy
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "plugin de entrada de red incluido en xine"
++msgid "pnm streaming input plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/input_http.c:170
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_cda: falló fopen(%s): %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, fuzzy, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: error de lectura\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr ""
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: respuesta http no válida\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, fuzzy, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: redirección 3xx no implementada: >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: el estado de http no es 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: longitud del contenido = %Ld bytes\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ #, fuzzy
+ msgid "http input plugin"
+ msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr ""
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr ""
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-#, fuzzy
+-msgid "mms streaming input plugin"
+-msgstr "plugin de entrada de stream de red http"
+-
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++#: src/input/librtsp/rtsp.c:507
++#, fuzzy, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "http: no se puede conectar a >%s<\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++#: src/input/librtsp/rtsp_session.c:84
++#, fuzzy, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "http: no se puede conectar a >%s<\n"
++
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+
++#: src/input/input_gnome_vfs.c:218
++#, fuzzy
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "plugin de entrada de red incluido en xine"
++
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+ msgid "input_net: socket(): %s\n"
+@@ -1482,160 +2025,40 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: no se puede resolver '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: no se puede conectar a '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "plugin de entrada de red incluido en xine"
+
+-#: src/input/input_pnm.c:266
+-#, fuzzy
+-msgid "pnm streaming input plugin"
+-msgstr "plugin de entrada de stream de red http"
+-
+-#: src/input/input_pvr.c:604
+-#, fuzzy, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+-
+-#: src/input/input_pvr.c:761
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+-
+-#: src/input/input_pvr.c:837
+-#, fuzzy, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_http: error de lectura (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:201
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) falló (¿kernel multicast?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "no se puede resolver '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, fuzzy, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "no se puede conectar a '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, fuzzy, c-format
+-msgid "recv(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: no se puede crear un hilo nuevo (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-#, fuzzy
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "plugin de entrada de red incluido en xine"
+-
+-#: src/input/input_rtsp.c:278
+-#, fuzzy
+-msgid "rtsp streaming input plugin"
+-msgstr "plugin de entrada de stream de red http"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, fuzzy, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "input_http: falló al abrir el socket\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_net: no se puede conectar a '%s'.\n"
+
+-#: src/input/input_stdin_fifo.c:342
++#: src/input/pnm.c:766
+ #, fuzzy
+-msgid "stdin streaming input plugin"
+-msgstr "plugin de entrada de stream de red http"
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_http: falló al abrir el socket\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -1679,1726 +2102,1324 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr ""
+
+-#: src/input/input_vcd.c:849
+-#, fuzzy
+-msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+-msgstr "input_vcd: MRL mal formada. Use vcd://<núm. pista>\n"
+-
+-#: src/input/input_vcd.c:855
+-#, c-format
+-msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+-msgstr "input_vcd: pista no válida %d (rango válido: 0 .. %d)\n"
+-
+-#: src/input/input_vcd.c:922
+-#, fuzzy
+-msgid "Video CD input plugin"
+-msgstr "plugin de entrada de stream de red http"
+-
+-#: src/input/input_vcd.c:964
+-#, c-format
+-msgid "unable to open %s: %s.\n"
+-msgstr "no se puede abrir %s: %s.\n"
+-
+-#: src/input/input_vcd.c:1040
+-#, fuzzy, c-format
+-msgid "input_vcd: unable to open %s: %s.\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+-
+-#: src/input/input_vcd.c:1094
+-msgid "device used for VCD playback"
+-msgstr ""
+-
+-#: src/input/input_vcd.c:1095
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, you intend to play your "
+-"VideoCDs with."
+-msgstr ""
+-
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr ""
+-
+-#: src/input/mms.c:646
++#: src/input/mms.c:650
+ msgid "Connecting MMS server (over tcp)..."
+ msgstr ""
+
+-#: src/input/mmsh.c:232
+-#, fuzzy
+-msgid "libmmsh: send error\n"
+-msgstr "input_http: error de lectura\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:283
++#: src/input/input_cdda.c:1494
+ #, fuzzy, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "input_http: redirección 3xx no implementada: >%d %s<\n"
++msgid "%s: can't connect to %s:%d\n"
++msgstr "http: no se puede conectar a >%s<\n"
+
+-#: src/input/mmsh.c:290
++#: src/input/input_cdda.c:1540
+ #, fuzzy, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "input_http: el estado de http no es 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-#, fuzzy
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "input_http: Redirección de \"location\" no implementada\n"
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr ""
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr ""
+-
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr ""
+-
+-#: src/input/pnm.c:617
+-#, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
+-msgstr ""
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cda: servidor '%s:%d' conectado con éxito.\n"
+
+-#: src/input/pnm.c:755
++#: src/input/input_cdda.c:1545
+ #, fuzzy, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+ msgstr "input_net: no se puede conectar a '%s'.\n"
+
+-#: src/input/pnm.c:766
+-#, fuzzy
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_http: falló al abrir el socket\n"
+-
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp.c:507
+-#, fuzzy, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "http: no se puede conectar a >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:84
+-#, fuzzy, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "http: no se puede conectar a >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
+-
+-#: src/input/vcd/vcdio.c:210
+-#, fuzzy
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr "input_vcd: SEEK_CUR no implementado para desplazamientos != 0\n"
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
++#: src/input/input_cdda.c:2586
++msgid "device used for CD audio"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_cdda.c:2615
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr ""
++#: src/input/input_vcd.c:849
++#, fuzzy
++msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
++msgstr "input_vcd: MRL mal formada. Use vcd://<núm. pista>\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr ""
++#: src/input/input_vcd.c:855
++#, c-format
++msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
++msgstr "input_vcd: pista no válida %d (rango válido: 0 .. %d)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr ""
++#: src/input/input_vcd.c:922
++#, fuzzy
++msgid "Video CD input plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr ""
++#: src/input/input_vcd.c:964
++#, c-format
++msgid "unable to open %s: %s.\n"
++msgstr "no se puede abrir %s: %s.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr ""
++#: src/input/input_vcd.c:1040
++#, fuzzy, c-format
++msgid "input_vcd: unable to open %s: %s.\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
++#: src/input/input_vcd.c:1094
++msgid "device used for VCD playback"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/input/input_vcd.c:1095
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"The path to the device, usually a CD or DVD drive, you intend to play your "
++"VideoCDs with."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr ""
++#: src/input/input_rtsp.c:278
++#, fuzzy
++msgid "rtsp streaming input plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
+-msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
+-msgstr ""
++#: src/input/input_pvr.c:604
++#, fuzzy, c-format
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr ""
++#: src/input/input_pvr.c:761
++#, fuzzy, c-format
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr ""
++#: src/input/input_pvr.c:837
++#, fuzzy, c-format
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_http: error de lectura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr ""
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, fuzzy, c-format
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
+-msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr ""
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: error de lectura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
+-msgstr ""
++#: src/input/input_file.c:282
++#, fuzzy, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_cda: falló fopen(%s): %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr ""
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: error de lectura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
++#: src/input/input_file.c:510
++msgid "file input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
++#: src/input/input_file.c:872
++msgid "file browsing start location"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
++#: src/input/input_file.c:880
++msgid "list hidden files"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:781
++#: src/input/input_file.c:881
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
++#: src/dxr3/video_out_dxr3.c:272
++msgid ""
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:280
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:288
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
+ msgstr ""
+
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
++#: src/dxr3/video_out_dxr3.c:361
++msgid ""
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++#: src/dxr3/video_out_dxr3.c:367
++msgid ""
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:383
++msgid ""
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
+-msgstr ""
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+ msgstr ""
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "demux_ts: no se puede crear un hilo nuevo (%s)\n"
+-
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
+ msgstr ""
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
+-msgstr ""
+-
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:908
+-msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/dxr3/dxr3_decode_video.c:257
++msgid ""
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
++#: src/dxr3/dxr3_decode_video.c:547
++#, fuzzy, c-format
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+
+-#: src/libw32dll/w32codec.c:595
+-#, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:628
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:696
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgid ""
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:225
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_oss_out.c:737
++msgid ""
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:745
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
+ msgstr ""
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, fuzzy, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
+-msgstr ""
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
++msgstr "input_cda: fallo al abrir el servidor '%s:%d': %s\n"
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:800
++msgid "a/v sync method to use by OSS"
+ msgstr ""
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
+-msgstr ""
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
++#: src/audio_out/audio_oss_out.c:856
++msgid "OSS audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:219
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
++"If you experience audio being not in sync with the 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/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+
+-#: src/post/mosaico/switch.c:230
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/planar/boxblur.c:103
+-msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
+-"\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
+-msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
+-msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:1074
++#, fuzzy, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "input_cda: falló open(%s): %s.\n"
++
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#, fuzzy, c-format
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "input_sun_out: fallo al abrir el servidor '%s:%d': %s\n"
++
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
+ msgstr ""
+
+-#: src/post/planar/pp.c:114
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/post/planar/unsharp.c:219
+-msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_irixal_out.c:385
++msgid "irixal audio output maximum gap length"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
+ msgstr ""
+
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
+ msgstr ""
+
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
+ msgstr ""
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-msgid "framebuffer device name"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
+ 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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:938
++#: src/audio_out/audio_alsa_out.c:1327
+ #, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++msgid "snd_lib_error_set_handler() failed: %d"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
+-msgstr ""
+-
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1345
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
+-msgstr ""
+-
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, fuzzy, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
+-
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1373
++msgid ""
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1383
++msgid ""
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:300
++#: src/audio_out/audio_alsa_out.c:1403
+ #, fuzzy, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "input_dvd: no se puede abrir la unidad de dvd (%s): %s\n"
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "input_cda: falló open(%s): %s.\n"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:480
++#: src/audio_out/audio_alsa_out.c:1551
+ 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:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-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/audio_out/audio_directx2_out.c:540
++#, fuzzy
++msgid "Unable to create primary direct sound buffer."
++msgstr "no se puede ubicar el búfer de entrada.\n"
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
++#: src/audio_out/audio_directx2_out.c:651
+ #, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "video_out: no se puede crear un hilo (%s)\n"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "video_out: no se puede crear un hilo (%s)\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "demux_ts: no se puede crear un hilo nuevo (%s)\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "demux_ts: no se puede crear un hilo nuevo (%s)\n"
+
+-#: src/video_out/video_out_xv.c:305
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1304
+-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/audio_out/audio_directx2_out.c:883
++#, fuzzy, c-format
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr "video_out: no se puede crear un hilo (%s)\n"
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:943
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
++msgid ": unknown control command %d\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:996
++#, fuzzy
++msgid "second xine audio output plugin using directx"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
++#: src/audio_out/audio_coreaudio_out.c:452
++msgid "xine output plugin for Coreaudio/Mac OS X"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
++#: src/audio_out/audio_file_out.c:362
++#, fuzzy
++msgid "xine file audio output plugin"
++msgstr "plugin de entrada de stream de red http"
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
++#: src/audio_out/audio_polyp_out.c:489
++msgid "device used for polypaudio"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/audio_out/audio_polyp_out.c:535
++msgid "xine audio output plugin using polypaudio sound server"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
++#: src/xine-engine/audio_decoder.c:347
++#, fuzzy, c-format
++msgid "audio_decoder: no plugin available to handle '%s'\n"
++msgstr "encontrado plugin decodificador de audio: %s\n"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
+-#, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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/video_out/video_out_xxmc.c:611
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/xine-engine/video_decoder.c:373
++#, fuzzy, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
++msgstr "encontrado plugin decodificador de vídeo: %s\n"
+
+-#: src/video_out/video_out_xxmc.c:619
++#: src/xine-engine/video_decoder.c:447
+ #, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2195
++#: src/xine-engine/video_decoder.c:484
+ 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"
++"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/video_out/video_out_xxmc.c:2204
+-#, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
++#: src/xine-engine/info_helper.c:204
++msgid "info_helper: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2429
++#: src/xine-engine/info_helper.c:212
++#, c-format
+ msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, fuzzy, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
+-msgstr "encontrado plugin decodificador de audio: %s\n"
+-
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3510,57 +3531,308 @@
+ msgid "audio_out: sorry, this should not happen. please restart xine.\n"
+ msgstr "video_out: esto no debería ocurrir. Por favor, reinicie xine.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d marcos llegados, %d frames saltados, %d frames descartados\n"
++
++#: src/xine-engine/video_out.c:739
++#, fuzzy, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
++"video_out: descartando imagen con pts %lld porque es antigua (dif : %lld).\n"
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr "video_out: esto no debería ocurrir. Por favor, reinicie xine.\n"
++
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
++msgstr ""
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "usando el plugin de entrada '%s' para el MRL '%s'\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:681
++#, fuzzy, c-format
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: no se puede encontrar el plugin de entrada para este MRL\n"
++
++#: src/xine-engine/xine.c:689
++#, fuzzy, c-format
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "usando el plugin de entrada '%s' para el MRL '%s'\n"
++
++#: src/xine-engine/xine.c:707
++#, fuzzy, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: no se puede encontrar el plugin de entrada para este MRL\n"
++
++#: src/xine-engine/xine.c:733
++#, fuzzy, c-format
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++
++#: src/xine-engine/xine.c:769
++#, fuzzy
++msgid "xine: join rip input plugin\n"
++msgstr "plugin de entrada de stream de red http"
++
++#: src/xine-engine/xine.c:774
++#, fuzzy
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "plugin de entrada de stream de red http"
++
++#: src/xine-engine/xine.c:805
++#, fuzzy, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/xine.c:948
++#, fuzzy
++msgid "xine: error opening subtitle mrl\n"
++msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:1007
++#, fuzzy, c-format
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: no se pudo encontrar el demultiplexor para >%s<\n"
++
++#: src/xine-engine/xine.c:1023
++#, fuzzy, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: no se pudo encontrar el demultiplexor para >%s<\n"
++
++#: src/xine-engine/xine.c:1043
++#, fuzzy
++msgid "xine: demuxer failed to start\n"
++msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++
++#: src/xine-engine/xine.c:1106
++#, fuzzy
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++
++#: src/xine-engine/xine.c:1176
++#, fuzzy
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++
++#: src/xine-engine/xine.c:1446
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr ""
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr ""
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
++msgstr ""
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr ""
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "mensajes"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "plugin"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr ""
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "font '%s-%d' already loaded, weird.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/osd.c:678
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgid "font '%s' loading failed (%d < %d)\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:901
+ #, c-format
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:164
+-msgid ": open() function should never be called\n"
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:323
+-#, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "usando el plugin de entrada '%s' para el MRL '%s'\n"
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr ""
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, fuzzy, c-format
+@@ -3575,7 +3847,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3594,7 +3866,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3632,22 +3904,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -3751,153 +4007,19 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: encontrado plugin de entrada: %s\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, fuzzy, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr ""
+ "load_plugins: fallo al cargar el plugin %s:\n"
+ "%s\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, fuzzy, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr "encontrado plugin decodificador de vídeo: %s\n"
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d marcos llegados, %d frames saltados, %d frames descartados\n"
+-
+-#: src/xine-engine/video_out.c:739
+-#, fuzzy, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out: descartando imagen con pts %lld porque es antigua (dif : %lld).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr "video_out: esto no debería ocurrir. Por favor, reinicie xine.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr ""
+@@ -3937,200 +4059,294 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
++#: src/libreal/audio_decoder.c:207
++#, c-format
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:667
+-#, fuzzy, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: no se puede encontrar el plugin de entrada para este MRL\n"
+-
+-#: src/xine-engine/xine.c:675
+-#, fuzzy, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "usando el plugin de entrada '%s' para el MRL '%s'\n"
+-
+-#: src/xine-engine/xine.c:693
+-#, fuzzy, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: no se puede encontrar el plugin de entrada para este MRL\n"
+-
+-#: src/xine-engine/xine.c:719
+-#, fuzzy, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine_play: fallo al iniciar el demultiplexor\n"
+-
+-#: src/xine-engine/xine.c:755
+-#, fuzzy
+-msgid "xine: join rip input plugin\n"
+-msgstr "plugin de entrada de stream de red http"
+-
+-#: src/xine-engine/xine.c:760
+-#, fuzzy
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "plugin de entrada de stream de red http"
+-
+-#: src/xine-engine/xine.c:791
+-#, fuzzy, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine_play: fallo al iniciar el demultiplexor\n"
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
++#: src/libreal/audio_decoder.c:364
++#, c-format
++msgid "libareal: decoder init failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
++#: src/libreal/audio_decoder.c:378
++#, c-format
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-#, fuzzy
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "input_dvd: no se puede abrir el archivo >%s<\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:993
+-#, fuzzy, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: no se pudo encontrar el demultiplexor para >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1009
+-#, fuzzy, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: no se pudo encontrar el demultiplexor para >%s<\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1029
+-#, fuzzy
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1090
+-#, fuzzy
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1160
+-#, fuzzy
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: fallo al iniciar el demultiplexor\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr ""
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "mensajes"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "plugin"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+ #, fuzzy
+@@ -4159,9 +4375,6 @@
+ #~ msgid "Opening >%s<\n"
+ #~ msgstr "Abriendo >%s<\n"
+
+-#~ msgid "video_out: can't create thread (%s)\n"
+-#~ msgstr "video_out: no se puede crear un hilo (%s)\n"
+-
+ #, fuzzy
+ #~ msgid "demux_wc3movie: encountered unknown chunk: %c%c%c%c\n"
+ #~ msgstr "demux_qt: codec de vídeo desconocido '%s'\n"
+@@ -4191,9 +4404,6 @@
+ #~ msgid "rtp input plugin as shipped with xine"
+ #~ msgstr "plugin de entrada de rtp incluido en xine"
+
+-#~ msgid "unable to allocate input buffer.\n"
+-#~ msgstr "no se puede ubicar el búfer de entrada.\n"
+-
+ #, fuzzy
+ #~ msgid "demux_mpgaudio: no audio driver!\n"
+ #~ msgstr "demux_avi: tipo de audio desconocido 0x%lx\n"
+--- ./po/fr.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/fr.po 2005-02-12 22:28:46.000000000 +0000
+@@ -5,8 +5,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib 0.9.13\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2002-06-07 15:08 +0200\n"
+ "Last-Translator: Daniel Caujolle-Bert <segfault@club-internet.fr>\n"
+ "Language-Team: French <fr@li.org>\n"
+@@ -15,514 +16,1093 @@
+ "Content-Transfer-Encoding: 8-bit\n"
+ "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
+-#, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++#: src/libsputext/demux_sputext.c:1507
++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/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
+-#, c-format
++#: src/libsputext/xine_decoder.c:901
+ msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libsputext/xine_decoder.c:908
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
+-#, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:923
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "périphérique utilisé pour la sortie mono"
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libsputext/xine_decoder.c:932
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "périphérique utilisé pour la sortie stéréo"
++#: src/libffmpeg/audio_decoder.c:109
++#, c-format
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:714
++#, c-format
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "périphérique utilisé pour la sortie 4 canaux"
++#: src/libffmpeg/dvaudio_decoder.c:303
++#, c-format
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "périphérique utilisé pour la sortie 5.1 canaux"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
+-#, fuzzy, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "input_cda: open(%s) a échoué: %s.\n"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
++#: src/liba52/xine_decoder.c:790
++msgid ""
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
++#: src/xine-utils/memcpy.c:482
++msgid ""
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-#, fuzzy
+-msgid "4-channel "
+-msgstr "canal"
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
++#: src/libspudvb/xine_decoder.c:622
+ #, fuzzy
+-msgid "4.1-channel "
+-msgstr "canal"
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
++#: src/libmusepack/xine_decoder.c:237
++#, c-format
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-#, fuzzy
+-msgid "5-channel "
+-msgstr "canal"
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-#, fuzzy
+-msgid "5.1-channel "
+-msgstr "canal"
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++#: src/libspucc/xine_decoder.c:193
++msgid ""
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "périphérique du mixeur alsa"
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:227
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
+ msgstr ""
+-"plugin de sortie audio de xine utilisant les pilotes/périphériques alsa"
+
+-#: src/audio_out/audio_arts_out.c:369
+-#, fuzzy
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
++msgstr ""
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-#, fuzzy
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
++msgstr ""
+
+-#: src/audio_out/audio_directx_out.c:827
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
++msgid ""
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1652
+ #, fuzzy
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1797
++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:1806
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "Temps de latence de la sortie audio esd (ajustement de a/v sync) "
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-#, fuzzy
+-msgid "xine audio output plugin using esound"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
++#, c-format
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1200
+ #, fuzzy
+-msgid "xine file audio output plugin"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++msgid "xine video output plugin using libvidix for x11"
++msgstr "plugin de sortie audio de xine utilisant libvidix"
+
+-#: src/audio_out/audio_irixal_out.c:385
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
+ #, fuzzy
+-msgid "irixal audio output maximum gap length"
+-msgstr "taille maximale du gap pour la sortie audio irixal en 1/90000s"
++msgid "framebuffer device name"
++msgstr "périphérique framebuffer"
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "Sortie audio de Xine utilise IRIX libaudio"
+-
+-#: src/audio_out/audio_none_out.c:223
++#: src/video_out/video_out_vidix.c:1282
+ #, fuzzy
+-msgid "xine dummy audio output plugin"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr ""
++"plugin de sortie video de xine utilisant le périphérique framebuffer de linux"
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, fuzzy, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:773
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++#, fuzzy
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#: src/video_out/video_out_xxmc.c:651
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2195
++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:2204
+ #, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:800
+-#, fuzzy
+-msgid "a/v sync method to use by OSS"
+-msgstr "méthode A/V sync a utiliser par OSS, dépend du pilote/périphérique"
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
++
++#: src/video_out/video_out_xshm.c:190
++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:206
++#, 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:216
++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:233
++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:1138
++#, c-format
++msgid ""
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
+-msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:856
+-#, fuzzy
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "Temps de latence de la sortie audio esd (ajustement de a/v sync) "
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:762
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1074
+-#, fuzzy, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "input_cda: open(%s) a échoué: %s.\n"
++#: src/video_out/video_out_fb.c:949
++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/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+-msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques oss"
++#: src/video_out/video_out_fb.c:1016
++#, c-format
++msgid ""
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
++msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:489
++#: src/video_out/video_out_fb.c:1047
+ #, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "périphérique utilisé pour la sortie 4 canaux"
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr ""
++"plugin de sortie video de xine utilisant le périphérique framebuffer de linux"
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
++#: src/video_out/video_out_sdl.c:480
++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:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:570
+ #, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "plugin de sortie audio de xine utilisant esd"
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "plugin de sortie video de xine utilisant Simple DirectMedia Layer"
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_directx.c:1223
++#, fuzzy
++msgid "xine video output plugin for win32 using directx"
++msgstr "plugin de sortie audio de xine utilisant libvidix"
++
++#: src/video_out/video_out_none.c:277
++#, fuzzy
++msgid "xine video output plugin which displays nothing"
++msgstr "plugin de sortie video de xine pour cartes dxr3"
++
++#: src/video_out/video_out_caca.c:311
++#, fuzzy
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
++#, fuzzy, c-format
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++
++#: src/video_out/video_out_pgx32.c:217
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/alphablend.c:1768
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
+-"This setting is security critical, because when changed to a different file, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+-msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques sun"
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
+
+-#: src/demuxers/demux_asf.c:468
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, fuzzy, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: copyright : %s\n"
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
++#: src/video_out/video_out_xv.c:1304
++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/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
++#: src/video_out/video_out_xv.c:1313
+ #, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: l'index avi est corrompu\n"
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
++
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+ msgstr ""
+
+ #: src/demuxers/demux_film.c:188
+@@ -533,19 +1113,15 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+ #: src/demuxers/demux_mpeg_block.c:296
+@@ -573,6 +1149,29 @@
+ "demux_mpeg_block: attention: l'entête pes indique que ce flux sera crypté "
+ "(mode de cryptage %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:1738
++#, fuzzy, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: copyright : %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:149
++#, fuzzy, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demus_avi: type audio inconnu 0x%lx\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -605,28 +1204,22 @@
+ "xine developers.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
+ msgstr ""
+
+-#: src/demuxers/demux_snd.c:149
+-#, fuzzy, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demus_avi: type audio inconnu 0x%lx\n"
+-
+-#: src/demuxers/demux_voc.c:105
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
+ msgstr ""
+
+-#: src/demuxers/demux_voc.c:120
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: l'index avi est corrompu\n"
++
++#: src/demuxers/demux_avi.c:850
+ #, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
+ msgstr ""
+
+ #: src/demuxers/demux_wc3movie.c:190
+@@ -638,599 +1231,528 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
++#: src/demuxers/demux_iff.c:235
++#, c-format
++msgid "iff-8svx/16sv: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:250
+-#, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
++#: src/libw32dll/w32codec.c:685
++#, c-format
+ msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
+-#, fuzzy, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:696
++#, c-format
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgstr ""
++
++#: src/libw32dll/w32codec.c:1216
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
++msgstr ""
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++#: src/input/input_rtp.c:182
++#, c-format
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
++#: src/input/input_rtp.c:201
++#, fuzzy, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:209
++#, fuzzy, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:216
++#, c-format
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
++
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) a échoué (noyau multicast ?): %s.\n"
++
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "incapable de resoudre '%s'.\n"
++
++#: src/input/input_rtp.c:286
++#, fuzzy, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "incapable de se connecter à '%s'.\n"
++
++#: src/input/input_rtp.c:314
++#, fuzzy, c-format
++msgid "recv(): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
+-msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:620
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:637
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr ""
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++#: src/input/input_rtp.c:742
++#, fuzzy
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "plugin d'entrée réseau fournis avec xine"
++
++#: src/input/mmsh.c:232
++msgid "libmmsh: send error\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
++#: src/input/mmsh.c:283
++#, fuzzy, c-format
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "input_file: erreur de lecture (%s)\n"
++
++#: src/input/mmsh.c:290
++#, c-format
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:272
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:280
+-#, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+-
+-#: src/dxr3/video_out_dxr3.c:288
+-#, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
++#: src/input/vcd/xineplug_inp_vcd.c:1713
+ msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1744
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
+-msgstr ""
+-
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
++#: src/input/vcd/xineplug_inp_vcd.c:1754
+ msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
+-msgstr ""
+-
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
+-
+-#: src/input/input_cdda.c:1540
+-#, fuzzy, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cda: serveur '%s:%d' connecté avec succés.\n"
+-
+-#: src/input/input_cdda.c:1545
+-#, fuzzy, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
+-
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2586
+-#, fuzzy
+-msgid "device used for CD audio"
+-msgstr "périphérique utilisé pour la sortie 4 canaux"
+-
+-#: src/input/input_cdda.c:2587
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++#: src/input/vcd/vcdio.c:217
++msgid "SEEK_CUR not implemented for non-zero offset"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:834
++#: src/input/input_dvb.c:838
+ #, fuzzy, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ #, fuzzy
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_cda: fopen(%s) à échoué: %s\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ #, fuzzy
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, fuzzy, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ #, fuzzy
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ #, fuzzy
+ msgid "device used for DVD playback"
+ msgstr "périphérique utilisé pour la sortie mono"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1241,22 +1763,22 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1265,44 +1787,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1321,11 +1843,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1339,152 +1861,164 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: erreur de lecture (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr ""
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, fuzzy, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_cda: fopen(%s) à échoué: %s\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "incapable de resoudre '%s'.\n"
+
+-#: src/input/input_file.c:286
+-#, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: erreur de lecture (%s)\n"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr ""
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
+ msgstr ""
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
+ msgstr ""
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
+ msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-#: src/input/input_gnome_vfs.c:218
+-#, fuzzy
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "plugin d'entrée réseau fournis avec xine"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr ""
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr ""
++
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_cda: fopen(%s) à échoué: %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, fuzzy, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_file: erreur de lecture (%s)\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr ""
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr ""
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, fuzzy, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_file: erreur de lecture (%s)\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr ""
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr ""
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr ""
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr ""
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
+-msgstr ""
++#: src/input/librtsp/rtsp.c:507
++#, fuzzy, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++#: src/input/librtsp/rtsp_session.c:84
++#, fuzzy, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+
++#: src/input/input_gnome_vfs.c:218
++#, fuzzy
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "plugin d'entrée réseau fournis avec xine"
++
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+ msgid "input_net: socket(): %s\n"
+@@ -1495,157 +2029,40 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: impossible de resoudre '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "plugin d'entrée réseau fournis avec xine"
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:604
+-#, fuzzy, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+-
+-#: src/input/input_pvr.c:761
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+-
+-#: src/input/input_pvr.c:837
+-#, fuzzy, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_file: erreur de lecture (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:201
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) a échoué (noyau multicast ?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "incapable de resoudre '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, fuzzy, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "incapable de se connecter à '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, fuzzy, c-format
+-msgid "recv(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-#, fuzzy
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "plugin d'entrée réseau fournis avec xine"
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr ""
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, fuzzy, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "incapable de resoudre '%s'.\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr ""
++#: src/input/pnm.c:766
++#, fuzzy
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -1689,1735 +2106,1339 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr ""
+
+-#: src/input/input_vcd.c:849
+-#, fuzzy
+-msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+-msgstr "input_cda: MRL malformée. Utilisez cda://<piste #>\n"
++#: src/input/mms.c:650
++msgid "Connecting MMS server (over tcp)..."
++msgstr ""
+
+-#: src/input/input_vcd.c:855
++#: src/input/input_cdda.c:1494
+ #, fuzzy, c-format
+-msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+-msgstr "input_cda: piste %d invalide (limites correctes: 1 .. %d)\n"
+-
+-#: src/input/input_vcd.c:922
+-msgid "Video CD input plugin"
+-msgstr ""
++msgid "%s: can't connect to %s:%d\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_vcd.c:964
++#: src/input/input_cdda.c:1540
+ #, fuzzy, c-format
+-msgid "unable to open %s: %s.\n"
+-msgstr "incapable de resoudre '%s'.\n"
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cda: serveur '%s:%d' connecté avec succés.\n"
+
+-#: src/input/input_vcd.c:1040
++#: src/input/input_cdda.c:1545
+ #, fuzzy, c-format
+-msgid "input_vcd: unable to open %s: %s.\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/input/input_vcd.c:1094
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
++msgstr ""
++
++#: src/input/input_cdda.c:2586
+ #, fuzzy
+-msgid "device used for VCD playback"
+-msgstr "périphérique utilisé pour la sortie mono"
++msgid "device used for CD audio"
++msgstr "périphérique utilisé pour la sortie 4 canaux"
+
+-#: src/input/input_vcd.c:1095
++#: src/input/input_cdda.c:2587
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, you intend to play your "
+-"VideoCDs with."
+-msgstr ""
+-
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/mms.c:646
+-msgid "Connecting MMS server (over tcp)..."
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/mmsh.c:232
+-msgid "libmmsh: send error\n"
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
+ msgstr ""
+
+-#: src/input/mmsh.c:283
+-#, fuzzy, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "input_file: erreur de lecture (%s)\n"
+-
+-#: src/input/mmsh.c:290
+-#, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
+ msgstr ""
+
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
+ msgstr ""
+
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#: src/input/pnm.c:617
+-#, c-format
++#: src/input/input_cdda.c:2624
+ msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+-#: src/input/pnm.c:755
+-#, fuzzy, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
+-
+-#: src/input/pnm.c:766
++#: src/input/input_vcd.c:849
+ #, fuzzy
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
+-
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp.c:507
+-#, fuzzy, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
++msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
++msgstr "input_cda: MRL malformée. Utilisez cda://<piste #>\n"
+
+-#: src/input/librtsp/rtsp_session.c:84
++#: src/input/input_vcd.c:855
+ #, fuzzy, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "input_net: impossible de se connecter à '%s'.\n"
++msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
++msgstr "input_cda: piste %d invalide (limites correctes: 1 .. %d)\n"
+
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
++#: src/input/input_vcd.c:922
++msgid "Video CD input plugin"
+ msgstr ""
+
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
++#: src/input/input_vcd.c:964
++#, fuzzy, c-format
++msgid "unable to open %s: %s.\n"
++msgstr "incapable de resoudre '%s'.\n"
+
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr ""
++#: src/input/input_vcd.c:1040
++#, fuzzy, c-format
++msgid "input_vcd: unable to open %s: %s.\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
+-msgstr ""
++#: src/input/input_vcd.c:1094
++#, fuzzy
++msgid "device used for VCD playback"
++msgstr "périphérique utilisé pour la sortie mono"
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
++#: src/input/input_vcd.c:1095
++msgid ""
++"The path to the device, usually a CD or DVD drive, you intend to play your "
++"VideoCDs with."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
+-msgstr ""
++#: src/input/input_pvr.c:604
++#, fuzzy, c-format
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
+-msgstr ""
++#: src/input/input_pvr.c:761
++#, fuzzy, c-format
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
+-msgstr ""
++#: src/input/input_pvr.c:837
++#, fuzzy, c-format
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_file: erreur de lecture (%s)\n"
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
+-msgstr ""
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, fuzzy, c-format
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
+-msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
+-msgstr ""
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: erreur de lecture (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr ""
++#: src/input/input_file.c:282
++#, fuzzy, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_cda: fopen(%s) à échoué: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr ""
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: erreur de lecture (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
++#: src/input/input_file.c:510
++msgid "file input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
++#: src/input/input_file.c:872
++msgid "file browsing start location"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
++#: src/input/input_file.c:880
++msgid "list hidden files"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/input/input_file.c:881
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
++#: src/dxr3/video_out_dxr3.c:272
+ msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:280
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:288
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:781
++#: src/dxr3/video_out_dxr3.c:361
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
+-msgstr ""
+-
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:367
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:383
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
+-
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr ""
+-
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
+-msgstr ""
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+ msgstr ""
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+-
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
+ msgstr ""
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
+-msgstr ""
+-
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:908
+-msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/dxr3/dxr3_decode_video.c:257
++msgid ""
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
++#: src/dxr3/dxr3_decode_video.c:547
++#, fuzzy, c-format
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
+
+-#: src/libw32dll/w32codec.c:595
+-#, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:628
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:696
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgid ""
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:225
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_oss_out.c:737
++msgid ""
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:745
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
+ msgstr ""
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:800
++#, fuzzy
++msgid "a/v sync method to use by OSS"
++msgstr "méthode A/V sync a utiliser par OSS, dépend du pilote/périphérique"
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
+-msgstr ""
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:219
+-msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:856
++#, fuzzy
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "Temps de latence de la sortie audio esd (ajustement de a/v sync) "
+
+-#: src/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"If you experience audio being not in sync with the 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/post/mosaico/switch.c:230
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+
+-#: src/post/planar/boxblur.c:103
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
+-"\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
+-msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
+-"\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
+-msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:1074
++#, fuzzy, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "input_cda: open(%s) a échoué: %s.\n"
+
+-#: src/post/planar/pp.c:114
+-msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques oss"
+
+-#: src/post/planar/unsharp.c:219
+-msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#, c-format
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
+-
+-#: src/video_out/video_out_caca.c:311
+-#, fuzzy
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
+-
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr ""
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques sun"
+
+-#: src/video_out/video_out_directx.c:1223
++#: src/audio_out/audio_irixal_out.c:385
+ #, fuzzy
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "plugin de sortie audio de xine utilisant libvidix"
++msgid "irixal audio output maximum gap length"
++msgstr "taille maximale du gap pour la sortie audio irixal en 1/90000s"
+
+-#: src/video_out/video_out_fb.c:762
+-#, c-format
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-#, fuzzy
+-msgid "framebuffer device name"
+-msgstr "périphérique framebuffer"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "Sortie audio de Xine utilise IRIX libaudio"
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
+-msgstr ""
++#: src/audio_out/audio_none_out.c:223
++#, fuzzy
++msgid "xine dummy audio output plugin"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+-msgstr ""
++#: src/audio_out/audio_arts_out.c:369
++#, fuzzy
++msgid "xine audio output plugin using kde artsd"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
+-msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++#: src/audio_out/audio_alsa_out.c:391
++#, c-format
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:938
++#: src/audio_out/audio_alsa_out.c:406
+ #, c-format
+ msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1047
+-#, fuzzy
+-msgid "Xine video output plugin using the Linux frame buffer device"
++#: src/audio_out/audio_alsa_out.c:1327
++#, c-format
++msgid "snd_lib_error_set_handler() failed: %d"
+ msgstr ""
+-"plugin de sortie video de xine utilisant le périphérique framebuffer de linux"
+-
+-#: src/video_out/video_out_none.c:277
+-#, fuzzy
+-msgid "xine video output plugin which displays nothing"
+-msgstr "plugin de sortie video de xine pour cartes dxr3"
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "périphérique utilisé pour la sortie mono"
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1345
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "périphérique utilisé pour la sortie stéréo"
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "périphérique utilisé pour la sortie 4 canaux"
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1363
++msgid ""
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, fuzzy, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "périphérique utilisé pour la sortie 5.1 canaux"
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1373
++msgid ""
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1383
++msgid ""
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:300
++#: src/audio_out/audio_alsa_out.c:1403
+ #, fuzzy, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n"
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "input_cda: open(%s) a échoué: %s.\n"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1490
++#, fuzzy
++msgid "4-channel "
++msgstr "canal"
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1498
++#, fuzzy
++msgid "4.1-channel "
++msgstr "canal"
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1506
++#, fuzzy
++msgid "5-channel "
++msgstr "canal"
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1514
++#, fuzzy
++msgid "5.1-channel "
++msgstr "canal"
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "périphérique du mixeur alsa"
+
+-#: src/video_out/video_out_sdl.c:480
++#: src/audio_out/audio_alsa_out.c:1551
+ 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."
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
++"plugin de sortie audio de xine utilisant les pilotes/périphériques alsa"
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:570
+-#, fuzzy
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "plugin de sortie video de xine utilisant Simple DirectMedia Layer"
+-
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-#, fuzzy
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
+-
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1175
+-#, fuzzy
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "plugin de sortie audio de xine utilisant libvidix"
+-
+-#: src/video_out/video_out_vidix.c:1257
+-#, fuzzy
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+-"plugin de sortie video de xine utilisant le périphérique framebuffer de linux"
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:540
++#, fuzzy
++msgid "Unable to create primary direct sound buffer."
++msgstr "incapable d'allouer le buffer d'entrée.\n"
++
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
++#: src/audio_out/audio_directx2_out.c:651
+ #, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:305
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1304
+-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"
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:883
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
++msgid ": can't destroy pthread mutex: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
++#: src/audio_out/audio_directx2_out.c:943
++#, c-format
++msgid ": unknown control command %d\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:996
++#, fuzzy
++msgid "second xine audio output plugin using directx"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "Temps de latence de la sortie audio esd (ajustement de a/v sync) "
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:569
++#, fuzzy
++msgid "xine audio output plugin using esound"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
+-msgstr ""
++#: src/audio_out/audio_coreaudio_out.c:452
++#, fuzzy
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
++#: src/audio_out/audio_directx_out.c:827
++#, fuzzy
++msgid "xine audio output plugin for win32 using directx"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
++#: src/audio_out/audio_file_out.c:362
++#, fuzzy
++msgid "xine file audio output plugin"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xvmc.c:1652
++#: src/audio_out/audio_polyp_out.c:489
+ #, fuzzy
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
++msgid "device used for polypaudio"
++msgstr "périphérique utilisé pour la sortie 4 canaux"
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
++#: src/audio_out/audio_polyp_out.c:535
++#, fuzzy
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "plugin de sortie audio de xine utilisant esd"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:347
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++msgid "audio_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:611
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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/video_out/video_out_xxmc.c:619
++#: src/xine-engine/video_decoder.c:373
+ #, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:2195
+-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"
++msgid "video_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2204
++#: src/xine-engine/video_decoder.c:447
+ #, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/video_decoder.c:484
++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/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2429
+-msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++#: src/xine-engine/info_helper.c:204
++msgid "info_helper: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:349
++#: src/xine-engine/info_helper.c:212
+ #, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
++msgid ""
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3528,57 +3549,303 @@
+ msgid "audio_out: sorry, this should not happen. please restart xine.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:739
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
++msgstr ""
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:681
++#, fuzzy, c-format
++msgid "xine: found input plugin : %s\n"
++msgstr "plugin de sortie video de xine pour cartes dxr3"
++
++#: src/xine-engine/xine.c:689
++#, fuzzy, c-format
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
++
++#: src/xine-engine/xine.c:707
++#, fuzzy, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "plugin de sortie video de xine pour cartes dxr3"
++
++#: src/xine-engine/xine.c:733
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid "xine: specified demuxer %s failed to start\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:774
++#, fuzzy
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "input_dvd: erreur de lecture dans le plugin input_dvd\n"
++
++#: src/xine-engine/xine.c:805
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: last_probed demuxer %s failed to start\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/xine.c:948
++#, fuzzy
++msgid "xine: error opening subtitle mrl\n"
++msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr ""
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/xine.c:1007
++#, c-format
++msgid "xine: couldn't find demux for >%s<\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/xine.c:1023
++#, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1446
+ #, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr ""
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr ""
++
++#: src/xine-engine/xine.c:1485
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:164
+-msgid ": open() function should never be called\n"
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:323
+-#, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr ""
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "messages"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr ""
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr ""
++
++#: src/xine-engine/osd.c:666
++#, c-format
++msgid "font '%s-%d' already loaded, weird.\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:678
++#, c-format
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:901
++#, c-format
++msgid ""
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr ""
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, fuzzy, c-format
+@@ -3593,7 +3860,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3612,7 +3879,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3650,22 +3917,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -3759,150 +4010,17 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, fuzzy, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "input_net: impossible de se connecter à '%s'.\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:739
+-#, 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:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr ""
+@@ -3942,196 +4060,294 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:667
+-#, fuzzy, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "plugin de sortie video de xine pour cartes dxr3"
+-
+-#: src/xine-engine/xine.c:675
+-#, fuzzy, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+-
+-#: src/xine-engine/xine.c:693
+-#, fuzzy, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "plugin de sortie video de xine pour cartes dxr3"
+-
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:760
+-#, fuzzy
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "input_dvd: erreur de lecture dans le plugin input_dvd\n"
+-
+-#: src/xine-engine/xine.c:791
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
++#: src/libreal/audio_decoder.c:378
++#, c-format
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-#, fuzzy
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1009
+-#, c-format
+-msgid "xine: found demuxer plugin: %s\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr ""
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "messages"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+ #, fuzzy
+@@ -4222,9 +4438,6 @@
+ #~ msgid "rtp input plugin as shipped with xine"
+ #~ msgstr "plugin d'entrée rtp fournis avec xine"
+
+-#~ msgid "unable to allocate input buffer.\n"
+-#~ msgstr "incapable d'allouer le buffer d'entrée.\n"
+-
+ #~ msgid "demux_mpgaudio: no audio driver!\n"
+ #~ msgstr "demux_mpgaudio: pas de pilote audio!\n"
+
+--- ./po/it.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/it.po 2005-02-12 22:28:46.000000000 +0000
+@@ -9,8 +9,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2004-07-11 19:54+0200\n"
+ "Last-Translator: Giovanni Venturi <jumpyj@tiscali.it>\n"
+ "Language-Team: Italian <kde-i18n-it@kde.org>\n"
+@@ -19,541 +20,1120 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: KBabel 1.3.1\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
+-msgstr "audio_alsa_out: già aperto...PERCHÈ!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
+-#, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+-msgstr "audio_alsa_out: snd_pcm_open() di %s non riuscito: %s\n"
++#: src/libsputext/demux_sputext.c:1507
++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/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
+ msgstr ""
+-"audio_alsa_out: >>> controlla se un altro programma sta già usando PCM <<<\n"
+
+-#: src/audio_out/audio_alsa_out.c:405
+-#, c-format
++#: src/libsputext/xine_decoder.c:901
+ msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
+ msgstr ""
+-"audio_alsa_out: configurazione errata per questo PCM: nessuna configurazione "
+-"disponibile: %s\n"
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libsputext/xine_decoder.c:907
++#, fuzzy
++msgid "subtitle vertical offset"
++msgstr "Spostamento verticale sottotitolo (dimensione finestra relativa)"
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libsputext/xine_decoder.c:914
++#, fuzzy
++msgid "font for subtitles"
++msgstr "Font per sottotitoli esterni"
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:922
++#, fuzzy
++msgid "encoding of the subtitles"
++msgstr "Codifica dei sottotitoli"
++
++#: src/libsputext/xine_decoder.c:923
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
+-msgstr "snd_lib_error_set_handler() non riuscita: %d"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
+-msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "dispositivo usato per output mono"
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:714
++#, c-format
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1274
++#, fuzzy
++msgid "MPEG-4 postprocessing quality"
++msgstr "ffmpeg mpeg-4 qualità di post elaborazione"
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "dispositivo usato per output stereo"
++#: src/libffmpeg/dvaudio_decoder.c:303
++#, c-format
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:164
++#, fuzzy
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr "Dxr3enc: bitrate di output mpeg libavcodec (kbit/s)"
++
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "dispositivo usato per output a 4 canali"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "dispositivo usato per output a canale 5.1"
++#: src/libffmpeg/xine_encoder.c:180
++#, fuzzy
++msgid "minimum compression"
++msgstr "iff-ilbm: compressione sconosciuta: %d\n"
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++#, fuzzy
++msgid "maximum quantizer"
++msgstr "Dxr3enc: quantizzatore massimo"
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:780
++#, fuzzy
++msgid "A/52 volume"
++msgstr "Volume audio"
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/liba52/xine_decoder.c:789
++#, fuzzy
++msgid "use A/52 dynamic range compression"
++msgstr "abilita intervallo dinamico a/52 di compensazione"
++
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
+-#, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "snd_pcm_open() non riuscito:%d:%s\n"
++#: src/liba52/xine_decoder.c:797
++#, fuzzy
++msgid "downmix audio to 2 channel surround stereo"
++msgstr "abilita l'audio downmixing a stereo surround 2.0"
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
+-msgstr ">>>Controlla se un altro programma sta già usando PCM <<<\n"
++#: src/liba52/xine_decoder.c:798
++msgid ""
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
+-msgstr "audio_alsa_out : i modi supportati sono "
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
+-msgstr "8bit "
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
++msgstr ""
++
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:478
+ #, fuzzy
+-msgid "16bit "
+-msgstr "8bit "
++msgid "font for external subtitles"
++msgstr "Font per sottotitoli esterni"
+
+-#: src/audio_out/audio_alsa_out.c:1468
++#: src/libspucmml/xine_decoder.c:484
+ #, fuzzy
+-msgid "24bit "
+-msgstr "8bit "
++msgid "subtitle vertical offset (relative window size)"
++msgstr "Dimensione sottotitolo (dimensione finestra relativa)"
+
+-#: src/audio_out/audio_alsa_out.c:1472
++#: src/libspucmml/xine_decoder.c:530
+ #, fuzzy
+-msgid "32bit "
+-msgstr "8bit "
++msgid "encoding of subtitles"
++msgstr "Codifica dei sottotitoli"
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
+-msgstr "mono "
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
+-msgstr "stereo "
++#: src/libmusepack/xine_decoder.c:237
++#, c-format
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
+-msgstr "4-canali "
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
+-msgstr "(4-canali non abilitato nella configurazione di xine) "
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
+-msgstr "4.1-canali "
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
+-msgstr "(4.1-canali non abilitati nella configurazione di xine) "
++#: src/libspucc/xine_decoder.c:192
++#, fuzzy
++msgid "display closed captions in MPEG-2 streams"
++msgstr "Abilita didascalie negli stream MPEG-2"
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
+-msgstr "5-canali "
++#: src/libspucc/xine_decoder.c:193
++msgid ""
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
+-msgstr "(5-canali non abilitati nella configurazione di xine) "
++#: src/libspucc/xine_decoder.c:200
++#, fuzzy
++msgid "closed-captioning foreground/background scheme"
++msgstr "Schema di primo piano/sfondo per didascalie"
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
+-msgstr "5.1-canali "
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
+-msgstr "(5.1-canali non abilitati nella configurazione di xine) "
++#: src/libspucc/xine_decoder.c:207
++#, fuzzy
++msgid "standard closed captioning font"
++msgstr "Font predefinito per didascalie"
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++#: src/libspucc/xine_decoder.c:214
++#, fuzzy
++msgid "italic closed captioning font"
++msgstr "Font italico di didascalie"
++
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "dispositivo mixer di alsa"
++#: src/libspucc/xine_decoder.c:221
++#, fuzzy
++msgid "closed captioning font size"
++msgstr "Dimensione font di didascalie"
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:226
++#, fuzzy
++msgid "center-adjust closed captions"
++msgstr "Didascalie centrate"
++
++#: src/libspucc/xine_decoder.c:227
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
++msgstr "plugin di output video di xine che usa la libreria DirectFB."
++
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++#, fuzzy
++msgid "video overlay colour key"
++msgstr "Dxr3: sovrapponi il valore di chiave del colore"
++
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
+ msgstr ""
+-"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
+-"di alsa"
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "plugin output audio di xine che usa artsd di KDE"
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++#, fuzzy
++msgid "autopaint colour key"
++msgstr "Fai disegnare a Xv da se il suo tono di colore"
+
+-#: src/audio_out/audio_coreaudio_out.c:452
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
+ #, fuzzy
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "plugin output audio di xine che usa directx per win32"
++msgid "Make Xv autopaint its colorkey."
++msgstr "Fai disegnare a Xv da se il suo tono di colore"
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "plugin output audio di xine che usa directx per win32"
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
++msgid ""
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1652
++#, fuzzy
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "plugin di output video di xine che usa l'estensione video MIT X"
++
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1797
++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:1806
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+-msgstr "audio_esd_out: si sta connettendo al server ESD %s: %s\n"
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
+-msgstr "audio_esd_out: si sta connettendo al server ESD...\n"
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+-msgstr "audio_esd_out: impossibile connettersi al %s server ESD: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "latenza di output per l'audio esd (aggiusta a/v sync)"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
+-msgstr "pluging output audio di xine che usa esound"
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
+-msgid "xine file audio output plugin"
+-msgstr "pluging output audio di xine"
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:385
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
++#, c-format
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1154
+ #, fuzzy
+-msgid "irixal audio output maximum gap length"
+-msgstr "output audio di irix con lunghezza del massimo gap in 1/90000s"
++msgid "video overlay colour key red component"
++msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1161
++#, fuzzy
++msgid "video overlay colour key green component"
++msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
++
++#: src/video_out/video_out_vidix.c:1168
++#, fuzzy
++msgid "video overlay colour key blue component"
++msgstr "Dxr3: sovrapponi il valore di chiave del colore"
++
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr "plugin di output video di xine che usa libvidix per x11"
++
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++#, fuzzy
++msgid "framebuffer device name"
++msgstr "dispositivo framebuffer"
++
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "plugin output audio di xine che usa libaudio di IRIX"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr ""
++"plugin di output video di xine che usa libvidix per il frame buffer Linux"
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
+-msgstr "pluging output audio dummy di xine"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
+-msgstr "audio_oss_out: si sta aprendo il dispositivo audio %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "plugin di output video di xine che usa la libreria art ascii"
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, fuzzy, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+-"audio_oss_out: attenzione: tasso di campionamento %d Hz non supportato, si "
+-"prova a 44100 Hz\n"
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+-msgstr "audio_oss_out: tasso audio: %d richiesto, %d fornito dal dispositivo\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
+-msgstr "nome dispositivo audio OSS"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
+-#, fuzzy
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+-"Specifica la parte base del nome del dispositivo audio quindi usa "
+-"oss_device_number per impostare il numero del dispositivo. Seleziona l'audio "
+-"se vuoi provare il dispositivo."
+
+-#: src/audio_out/audio_oss_out.c:744
+-#, fuzzy
+-msgid "OSS audio device number, -1 for none"
+-msgstr "nome dispositivo audio OSS"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
+-#, fuzzy
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+-"Il nome del dispositivo audio è creato concatenando oss_device_name e il "
+-"numero del dispositivo audio (per esempio /dev/sound/dsp2). Se non hai "
+-"bisogno di un numero impostalo a -1 (per esempio /dev/sound/dsp). "
+-"L'intervallo di questa variabile è -1 o 0-15."
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+-msgstr "audio_oss_out: audio.device.oss_device_name = auto, si provano i dev\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+-"audio_oss_out: controllo automatico per il dispositivo audio non riuscito\n"
+
+-#: src/audio_out/audio_oss_out.c:773
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr "plugin di output video di xine che usa Libstk Surface Set-top Toolkit"
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
+-msgstr "audio_oss_out: si sta utilizzando il dispositivo >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#: src/video_out/video_out_xxmc.c:651
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2195
++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:2204
+ #, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+-"audio_oss_out: apertura dispositivo audio %s non riuscito:\n"
+-"%s\n"
+
+-#: src/audio_out/audio_oss_out.c:800
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
+ #, fuzzy
+-msgid "a/v sync method to use by OSS"
+-msgstr "metodo A/V sync da usare per OSS, dipende dal driver/hardware"
++msgid "bilinear scaling mode"
++msgstr "modo scalatura bilineare (permedia 2/3)"
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"The meaning of the values is as follows:\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "plugin di output video di xine che usa l'estensione video MIT X"
++
++#: src/video_out/video_out_xshm.c:190
++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:206
++#, 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:216
++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:233
++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:1138
++#, c-format
++msgid ""
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
++msgid ""
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr ""
++"plugin di output video di xine che usa l'estensione di memoria condivisa MIT "
++"X"
++
++#: src/video_out/video_out_fb.c:762
++#, c-format
++msgid ""
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
++#, c-format
++msgid ""
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:949
++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:1016
++#, c-format
++msgid ""
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr ""
++"plugin di output video di xine che usa il dispositivo frame buffer di Linux"
++
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:480
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"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 ""
+-"audio_oss_out: driver audio con sincronizzazione real time disabilitata...\n"
+-"audio_oss_out: ... invece userà un sistema real-time con orologio per "
+-"sincronizzazione soft\n"
+-"audio_oss_out: ... potrebbe essereci sincronizzazione audio/video\n"
+
+-#: src/audio_out/audio_oss_out.c:856
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "plugin di output video di xine che usa l'SDML"
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr "plugin di output video di xine per win32 che usa directx"
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr "plugin di output video di xine che non visualizza nulla"
++
++#: src/video_out/video_out_caca.c:311
+ #, fuzzy
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "latenza di output per l'audio esd (aggiusta a/v sync)"
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "plugin di output video di xine che usa la libreria art ascii"
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
++#, fuzzy, c-format
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
++
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++msgstr ""
++
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
++
++#: src/video_out/alphablend.c:1768
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+-"audio_oss_out: driver audio real time con sincronizzazione disabilitato...\n"
+-"audio_oss_out: ...si sta provando la dimensione del buffer di output: "
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+-"%d byte\n"
+-"audio_oss_out: ... potrebbe essereci sincronizzazione audio/video\n"
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:1304
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"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/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_xv.c:1313
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "audio_oss_out: open() del mixer %s non riuscita: %s\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
+ msgstr ""
+-"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
+-"di oss"
+
+-#: src/audio_out/audio_polyp_out.c:489
+-#, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "dispositivo usato per l'unità CDDA"
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
+-#, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "pluging output audio di xine che usa esound"
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
+-#, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "audio_sun_out: apertura dispositivo audio %s non riuscita: %s\n"
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:889
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++"plugin di output video di xine che usa il modulo SyncFB per schede Matrox "
++"G200/G400"
++
++#: src/video_out/video_out_syncfb.c:1073
+ #, fuzzy
+-msgid "Sun audio device name"
++msgid "SyncFB device name"
+ msgstr "nome dispositivo audio OSS"
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/video_out_syncfb.c:1074
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
++"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, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
+ msgstr ""
+-"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
+-"di sun"
+
+-#: src/demuxers/demux_asf.c:468
+-#, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
+-msgstr "demux_asf: attenzione: L'id dello stream =%d è cifrato.\n"
+-
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
+-msgstr "Stream multimediale confuso/cifrato"
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: versione ASX errata: %s\n"
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
+-msgstr "Ripristino indice..."
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
+-#, fuzzy, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
+-msgstr "demux_avi: pezzo di avi non valido \"%c%c%c%c\" alla posizione %lld\n"
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: l'indice avi è interrotto\n"
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, fuzzy, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
+-msgstr "demux_avi: non si è riuscito a passare al prossimo pezzo (pos %lld)\n"
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr ""
++"ogg: indicata traccia audio vorbis ma nessuno stream di intestazione vorbis "
++"trovato.\n"
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -563,20 +1143,20 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr "parte di FILM non roconosciuta\n"
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr "iff-8svx/16sv: compressione sconosciuta: %d\n"
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
+-msgstr "iff-ilbm: compressione sconosciuta: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgstr ""
++"tipo di blocco VOC sconosciuto (0x%02X); per favore riporta l'errore ai "
++"sviluppatori di xine\n"
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
+-msgstr "iff: pezzo sconosciuto: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgstr ""
++"tipo di compressione VOC sconosciuta (0x%02X); per favore riporta l'errore "
++"ai sviluppatori di xine\n"
+
+ #: src/demuxers/demux_mpeg_block.c:296
+ #, c-format
+@@ -609,6 +1189,29 @@
+ "demux_mpeg_block: attenzione: l'intestazione PES indica che questo stream "
+ "può essere cifrato (modalità di cifratura %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr "demux_asf: attenzione: L'id dello stream =%d è cifrato.\n"
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr "Stream multimediale confuso/cifrato"
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: versione ASX errata: %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr "demux_snd: paramentri intestazione errati\n"
++
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_snd: tipo audio non supportato: %d\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -649,35 +1252,23 @@
+ "demux_mpeg_pes: stream 1 0x%02x privato sconosciuto. Segnala la cosa agli "
+ "sviluppatori di xine.\n"
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-"ogg: indicata traccia audio vorbis ma nessuno stream di intestazione vorbis "
+-"trovato.\n"
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
+-msgstr "demux_snd: paramentri intestazione errati\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
++msgstr "Ripristino indice..."
+
+-#: src/demuxers/demux_snd.c:149
+-#, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_snd: tipo audio non supportato: %d\n"
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
++#, fuzzy, c-format
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
++msgstr "demux_avi: pezzo di avi non valido \"%c%c%c%c\" alla posizione %lld\n"
+
+-#: src/demuxers/demux_voc.c:105
+-#, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+-msgstr ""
+-"tipo di blocco VOC sconosciuto (0x%02X); per favore riporta l'errore ai "
+-"sviluppatori di xine\n"
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: l'indice avi è interrotto\n"
+
+-#: src/demuxers/demux_voc.c:120
+-#, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
+-msgstr ""
+-"tipo di compressione VOC sconosciuta (0x%02X); per favore riporta l'errore "
+-"ai sviluppatori di xine\n"
++#: src/demuxers/demux_avi.c:850
++#, fuzzy, c-format
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
++msgstr "demux_avi: non si è riuscito a passare al prossimo pezzo (pos %lld)\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -692,631 +1283,528 @@
+ "demux_wc3movie: Si è verificato un problema durante il caricamento di un "
+ "grossi pezzi di palette\n"
+
+-#: src/dxr3/dxr3.h:32
+-#, fuzzy
+-msgid "DXR3 device number"
+-msgstr "Dxr3: Nome Dispositivo"
+-
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:235
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+-msgstr "dxr3_decode_spu: apertura dispositivo SPU %s non riuscita (%s)\n"
++msgid "iff-8svx/16sv: unknown compression: %d\n"
++msgstr "iff-8svx/16sv: compressione sconosciuta: %d\n"
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
+-msgstr "pulsante richiesto non disponibile\n"
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
++msgstr "iff-ilbm: compressione sconosciuta: %d\n"
+
+-#: src/dxr3/dxr3_decode_video.c:250
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+-msgstr ""
+-"dxr3_decode_video: apertura dispositivo di controllo %s non riuscita (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
++msgstr "iff: pezzo sconosciuto: %s\n"
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-#, fuzzy
+-msgid "try to sync video every frame"
+-msgstr "Prova a sincronizzare il video ogni frame"
+-
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-#, fuzzy
+-msgid "use smooth play mode"
+-msgstr "Usa modo di riproduzione alternativo"
+-
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+ msgstr ""
+-"Abilitando questa opzione si utilizzerà un modo di riproduzione più definito."
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-#, fuzzy
+-msgid "correct frame durations in broken streams"
+-msgstr "Corretta durata frame in stream interrotto"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
+-msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:595
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "dxr3_decode_video: apertura dispositivo video %s non riuscita (%s)\n"
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+-"dxr3_decode_video: scrittura al dispositivo potrebbe bloccherebbe "
+-"svuotamento\n"
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:639
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
+-msgstr "dxr3_decode_video: scrittura sul dispositivo video non riuscita (%s)\n"
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:685
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+-msgstr "dxr3_decode_video: ATTENZIONE: codice tasso frame sconosciuto %d\n"
++msgid ""
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
++#: src/libw32dll/w32codec.c:696
++#, c-format
+ msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"dxr3_decode_video: ATTENZIONE: si sta correggendo il codice tasso frame da "
+-"PAL a NTSC\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
+-msgstr "dxr3_mpeg_encoder: inizializzazione librte non riuscita\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
+-msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+ msgstr ""
+-"dxr3_mpeg_encoder: rte gestisce solo le dimensioni video che sono multiple "
+-"di 16\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+-msgstr "dxr3_mpeg_encoder: rilevazione contesto rte non riuscito.\n"
++#: src/libw32dll/w32codec.c:1216
++#, c-format
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
+-msgstr "dxr3_mpeg_encoder: impossibile creare codec.\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-#, fuzzy
+-msgid "rte mpeg output bitrate (kbit/s)"
+-msgstr "Dxr3enc: bitrate di output mpeg RTE (kbit/s)"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+ #, fuzzy
++msgid "path to Win32 codecs"
++msgstr "percorso dei codec dll win32"
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+-"Il bitrate che la libreria librte di codifica mpeg dovrebbe usare per modo "
+-"di codifica di dxr3"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:182
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+-msgstr "dxr3_mpeg_encoder: impossibile inizializzare contesto: %s\n"
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
++msgstr ""
++
++#: src/input/input_rtp.c:201
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr "dxr3_mpeg_encoder: impossibile avviare codifica: %s\n"
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+-msgstr "dxr3_mpeg_encoder: impossibile avviare la libreria FAME\n"
++#: src/input/input_rtp.c:209
++#, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-#, fuzzy
+-msgid "fame mpeg encoding quality"
+-msgstr "Dxr3enc: qualità di codifica mpeg di fame"
++#: src/input/input_rtp.c:216
++#, c-format
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_scr.c:98
+-#, fuzzy
+-msgid "SCR plugin priority"
+-msgstr "Dxr3: priorità del plugin SCR"
+-
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+ msgstr ""
++"setsockopt(IP_ADD_MEMBERSHIP) non riuscito (multicast del kernel?): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
+-msgstr "scambio linee spaiate e piatte"
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "impossibile risolvere '%s'.\n"
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
+-msgstr ""
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "impossibile fare il bind a '%s'.\n"
+
+-#: src/dxr3/video_out_dxr3.c:265
+-#, fuzzy
+-msgid "add black bars to correct aspect ratio"
+-msgstr "Aggiungo le barre nere per corregere le proporzioni"
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
++msgstr "recv(): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
++msgstr "RTP: interruzione di lettura di thread...\n"
++
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
++msgstr "RTP: lettura thread terminata\n"
++
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:271
+-#, fuzzy
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr "dxr3:usa modo di riproduzione alternativo per codifica mpeg"
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/dxr3/video_out_dxr3.c:272
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "plugin input RTP e UDP tarsportati così con xine"
++
++#: src/input/mmsh.c:232
+ #, fuzzy
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
++msgid "libmmsh: send error\n"
++msgstr "input_http: errore di lettura\n"
++
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+-"Abilitando questa opzione si utilizzerà un modo di riproduzione più definito."
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr ""
+-"video_out_dxr3: apertura dispositivo di controllo %s non riuscita (%s)\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "libmmsh: ridirezione 3xx non implementata: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "libmmsh: lo stato di http non è 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:330
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "libmmsh: redirezione della posizione non implementata\n"
++
++#: src/input/mmsh.c:602
+ #, fuzzy
+-msgid "encoder for non mpeg content"
+-msgstr "il codificatore per contenuto non mpeg"
++msgid "Connecting MMS server (over http)..."
++msgstr "Connessione in corso al server MMS (su TCP)..."
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+-"video_out_dxr3: inizializzazione encoder MPEG libavcodec non riuscita.\n"
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+-msgstr "video_out_dxr3: inizializzazione encoder MPEG rte non riuscita.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+-msgstr "video_out_dxr3: inizializzazione encoder MPEG fame non riuscita.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:382
+-#, fuzzy
+-msgid "video output mode (TV or overlay)"
+-msgstr "Dxr3: modo video out (TV o sovraimpressione)"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
+-msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-#, fuzzy
+-msgid "overlay colorkey value"
+-msgstr "Dxr3: sovrapponi il valore di chiave del colore"
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-#, fuzzy
+-msgid "overlay colorkey tolerance"
+-msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-#, fuzzy
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
+ msgstr ""
+-"Ritaglia l'area di sovrapposizione superiore e inferiore per evitare linee "
+-"verdi"
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-#, fuzzy
+-msgid "preferred tv mode"
+-msgstr "dxr3 preferiva il modo TV"
+-
+-#: src/dxr3/video_out_dxr3.c:456
++#: src/input/vcd/xineplug_inp_vcd.c:1713
+ msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
+-msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "http: impossibile connettersi a >%s<\n"
+-
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1545
+-#, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_cdda: connessione al server CDDB '%s:%d' non riuscita (%s).\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
++msgstr ""
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
+-msgstr "Audio Digitale CD (detto CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++msgid ""
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
++msgstr ""
+
+-#: src/input/input_cdda.c:2586
+-#, fuzzy
+-msgid "device used for CD audio"
+-msgstr "dispositivo usato per l'unità CDDA"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr ""
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1754
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-#, fuzzy
+-msgid "CDDB server name"
+-msgstr "nome server CDDBP"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
++msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-#, fuzzy
+-msgid "CDDB server port"
+-msgstr "porta server CDDBP"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
++msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdio.c:217
++msgid "SEEK_CUR not implemented for non-zero offset"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-#, fuzzy
+-msgid "CDDB cache directory"
+-msgstr "derectory per cache CDDBP"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
++msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_dvb.c:834
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
++msgstr ""
++
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
++msgstr ""
++
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
++msgstr ""
++
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr ""
++
++#: src/input/input_dvb.c:838
+ #, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_dvb: apertura file di canale DVB non riuscita '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_dvb: tuner_set_channel non riuscito\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvb: impossibile aprire dispositivo DVB\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_dvb: apertura file di canale DVB non riuscita '%s'\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_dvb: apertura file di canale DVB non riuscita '%s'\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvb: impossibile aprire dispositivo DVR '%s'\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "plugin di input per DVB (TV Digitale)"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: Errore di apertura del dispositivo DVD\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ #, fuzzy
+ msgid "device used for DVD playback"
+ msgstr "dispositivo usato per output mono"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1327,23 +1815,23 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ #, fuzzy
+ msgid "path to the title key cache"
+ msgstr "percorso del dispositivo video v4l"
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1352,44 +1840,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1408,11 +1896,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1426,155 +1914,167 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: errore di lettura (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr ""
+
+-#: src/input/input_file.c:282
+-#, fuzzy, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_rip: spostamento non riuscito: %s\n"
++#: src/input/input_stdin_fifo.c:249
++#, c-format
++msgid "stdin: failed to open '%s'\n"
++msgstr "stdin: apertura non riuscita '%s'\n"
+
+-#: src/input/input_file.c:286
+-#, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: errore di lettura (%s)\n"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr "plugin di input per lo stream di stdin"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr "plugin di input del file"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
++msgstr "plugin di input per lo stream mms"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
+-msgstr "locazioni di partenza della navigazione file"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
++msgstr ""
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
+-msgstr "mostra file nascosti"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
++msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-#: src/input/input_gnome_vfs.c:218
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "plugin di input gnome-vfs incluso con xine"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr "Sto bufferizzando..."
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr "plugin di input per lo stream pnm"
++
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_rip: spostamento non riuscito: %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: errore di lettura %d\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr "Connessione in corso al server HTTP..."
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: risposta http non valida\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: 3xx ridirezione: >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: lo stato di http non è 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: lunghezza contenuto = %Ld byte\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr "plugin di input http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ #, fuzzy
+ msgid "HTTP proxy host"
+ msgstr "host proxy http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ #, fuzzy
+ msgid "HTTP proxy port"
+ msgstr "porta proxy http"
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ #, fuzzy
+ msgid "HTTP proxy username"
+ msgstr "nome utente proxy http"
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ #, fuzzy
+ msgid "HTTP proxy password"
+ msgstr "password proxy http"
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
+-msgstr "plugin di input per lo stream mms"
+-
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++#: src/input/librtsp/rtsp.c:507
++#, fuzzy, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "http: impossibile connettersi a >%s<\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++#: src/input/librtsp/rtsp_session.c:84
++#, fuzzy, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "http: impossibile connettersi a >%s<\n"
++
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+
++#: src/input/input_gnome_vfs.c:218
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "plugin di input gnome-vfs incluso con xine"
++
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+ msgid "input_net: socket(): %s\n"
+@@ -1585,158 +2085,40 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: impossibile risolvere '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: impossibile connettesi a '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "plugin di input della rete trasportato così con xine"
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr "plugin di input per lo stream pnm"
+-
+-#: src/input/input_pvr.c:604
+-#, fuzzy, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_rip: errore aprendo il file %s: %s\n"
+-
+-#: src/input/input_pvr.c:761
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_rip: errore aprendo il file %s: %s\n"
+-
+-#: src/input/input_pvr.c:837
+-#, fuzzy, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_file: errore di lettura (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_rip: errore aprendo il file %s: %s\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr "plugin di input WinTV-PVR 250/350"
+-
+-#: src/input/input_pvr.c:1551
+-#, fuzzy
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr "plugin di input WinTV-PVR 250/350"
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr ""
+-"setsockopt(IP_ADD_MEMBERSHIP) non riuscito (multicast del kernel?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "impossibile risolvere '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "impossibile fare il bind a '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, c-format
+-msgid "recv(): %s.\n"
+-msgstr "recv(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr "RTP: interruzione di lettura di thread...\n"
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr "RTP: lettura thread terminata\n"
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "plugin input RTP e UDP tarsportati così con xine"
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr "plugin di input per lo stream rtsp"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:249
+-#, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "stdin: apertura non riuscita '%s'\n"
++#: src/input/pnm.c:755
++#, fuzzy, c-format
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_net: impossibile connettesi a '%s'.\n"
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr "plugin di input per lo stream di stdin"
++#: src/input/pnm.c:766
++#, fuzzy
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_http: fallita apertura del socket\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -1782,1766 +2164,1405 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr "percorso del dispositivo radio v4l"
+
+-#: src/input/input_vcd.c:849
+-msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+-msgstr ""
+-
+-#: src/input/input_vcd.c:855
+-#, c-format
+-msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+-msgstr ""
+-
+-#: src/input/input_vcd.c:922
+-msgid "Video CD input plugin"
+-msgstr "plugin di input per Video CD"
+-
+-#: src/input/input_vcd.c:964
+-#, c-format
+-msgid "unable to open %s: %s.\n"
+-msgstr "impossibile aprire %s: %s.\n"
+-
+-#: src/input/input_vcd.c:1040
+-#, fuzzy, c-format
+-msgid "input_vcd: unable to open %s: %s.\n"
+-msgstr "input_net: impossibile risolvere '%s'.\n"
+-
+-#: src/input/input_vcd.c:1094
+-#, fuzzy
+-msgid "device used for VCD playback"
+-msgstr "dispositivo usato per output mono"
+-
+-#: src/input/input_vcd.c:1095
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, you intend to play your "
+-"VideoCDs with."
+-msgstr ""
+-
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr ""
+-
+-#: src/input/mms.c:646
++#: src/input/mms.c:650
+ msgid "Connecting MMS server (over tcp)..."
+ msgstr "Connessione in corso al server MMS (su TCP)..."
+
+-#: src/input/mmsh.c:232
+-#, fuzzy
+-msgid "libmmsh: send error\n"
+-msgstr "input_http: errore di lettura\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr ""
++#: src/input/input_cdda.c:1494
++#, fuzzy, c-format
++msgid "%s: can't connect to %s:%d\n"
++msgstr "http: impossibile connettersi a >%s<\n"
+
+-#: src/input/mmsh.c:283
++#: src/input/input_cdda.c:1540
+ #, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "libmmsh: ridirezione 3xx non implementata: >%d %s<\n"
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr ""
+
+-#: src/input/mmsh.c:290
++#: src/input/input_cdda.c:1545
+ #, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "libmmsh: lo stato di http non è 2xx: >%d %s<\n"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++msgstr "input_cdda: connessione al server CDDB '%s:%d' non riuscita (%s).\n"
+
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "libmmsh: redirezione della posizione non implementata\n"
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
++msgstr "Audio Digitale CD (detto CDDA)"
+
+-#: src/input/mmsh.c:601
++#: src/input/input_cdda.c:2586
+ #, fuzzy
+-msgid "Connecting MMS server (over http)..."
+-msgstr "Connessione in corso al server MMS (su TCP)..."
++msgid "device used for CD audio"
++msgstr "dispositivo usato per l'unità CDDA"
+
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr "Sto bufferizzando..."
+-
+-#: src/input/pnm.c:617
+-#, c-format
++#: src/input/input_cdda.c:2593
+ msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/pnm.c:755
+-#, fuzzy, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
+-msgstr "input_net: impossibile connettesi a '%s'.\n"
+-
+-#: src/input/pnm.c:766
++#: src/input/input_cdda.c:2601
+ #, fuzzy
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_http: fallita apertura del socket\n"
+-
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp.c:507
+-#, fuzzy, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "http: impossibile connettersi a >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:84
+-#, fuzzy, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "http: impossibile connettersi a >%s<\n"
++msgid "CDDB server name"
++msgstr "nome server CDDBP"
+
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
++#: src/input/input_cdda.c:2609
++#, fuzzy
++msgid "CDDB server port"
++msgstr "porta server CDDBP"
+
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
+-msgstr ""
++#: src/input/input_cdda.c:2615
++#, fuzzy
++msgid "CDDB cache directory"
++msgstr "derectory per cache CDDBP"
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
++#: src/input/input_vcd.c:849
++msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
++#: src/input/input_vcd.c:855
++#, c-format
++msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
+-msgstr ""
++#: src/input/input_vcd.c:922
++msgid "Video CD input plugin"
++msgstr "plugin di input per Video CD"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
+-msgstr ""
++#: src/input/input_vcd.c:964
++#, c-format
++msgid "unable to open %s: %s.\n"
++msgstr "impossibile aprire %s: %s.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
+-msgstr ""
++#: src/input/input_vcd.c:1040
++#, fuzzy, c-format
++msgid "input_vcd: unable to open %s: %s.\n"
++msgstr "input_net: impossibile risolvere '%s'.\n"
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
+-msgstr ""
++#: src/input/input_vcd.c:1094
++#, fuzzy
++msgid "device used for VCD playback"
++msgstr "dispositivo usato per output mono"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_vcd.c:1095
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++"The path to the device, usually a CD or DVD drive, you intend to play your "
++"VideoCDs with."
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
+-msgstr ""
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
++msgstr "plugin di input per lo stream rtsp"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr ""
++#: src/input/input_pvr.c:604
++#, fuzzy, c-format
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_rip: errore aprendo il file %s: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr ""
++#: src/input/input_pvr.c:761
++#, fuzzy, c-format
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_rip: errore aprendo il file %s: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr ""
++#: src/input/input_pvr.c:837
++#, fuzzy, c-format
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_file: errore di lettura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr ""
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, fuzzy, c-format
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_rip: errore aprendo il file %s: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
+-msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
+-msgstr ""
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
++msgstr "plugin di input WinTV-PVR 250/350"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr ""
++#: src/input/input_pvr.c:1551
++#, fuzzy
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
++msgstr "plugin di input WinTV-PVR 250/350"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
+-msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr ""
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: errore di lettura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr ""
++#: src/input/input_file.c:282
++#, fuzzy, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_rip: spostamento non riuscito: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr ""
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: errore di lettura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
+-msgstr ""
++#: src/input/input_file.c:510
++msgid "file input plugin"
++msgstr "plugin di input del file"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
+-msgstr ""
++#: src/input/input_file.c:872
++msgid "file browsing start location"
++msgstr "locazioni di partenza della navigazione file"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
+-msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
+-msgstr ""
++#: src/input/input_file.c:880
++msgid "list hidden files"
++msgstr "mostra file nascosti"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
++#: src/input/input_file.c:881
+ msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
++msgstr "scambio linee spaiate e piatte"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
+-msgstr ""
+-
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:780
++#: src/dxr3/video_out_dxr3.c:265
+ #, fuzzy
+-msgid "A/52 volume"
+-msgstr "Volume audio"
++msgid "add black bars to correct aspect ratio"
++msgstr "Aggiungo le barre nere per corregere le proporzioni"
+
+-#: src/liba52/xine_decoder.c:781
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:789
++#: src/dxr3/video_out_dxr3.c:271
+ #, fuzzy
+-msgid "use A/52 dynamic range compression"
+-msgstr "abilita intervallo dinamico a/52 di compensazione"
+-
+-#: src/liba52/xine_decoder.c:790
+-msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
+-msgstr ""
++msgid "use smooth play mode for mpeg encoder playback"
++msgstr "dxr3:usa modo di riproduzione alternativo per codifica mpeg"
+
+-#: src/liba52/xine_decoder.c:797
++#: src/dxr3/video_out_dxr3.c:272
+ #, fuzzy
+-msgid "downmix audio to 2 channel surround stereo"
+-msgstr "abilita l'audio downmixing a stereo surround 2.0"
+-
+-#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
++"Abilitando questa opzione si utilizzerà un modo di riproduzione più definito."
+
+-#: src/libffmpeg/audio_decoder.c:109
++#: src/dxr3/video_out_dxr3.c:280
+ #, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+ msgstr ""
++"video_out_dxr3: apertura dispositivo di controllo %s non riuscita (%s)\n"
+
+-#: src/libffmpeg/audio_decoder.c:149
++#: src/dxr3/video_out_dxr3.c:288
+ #, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
+
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:330
++#, fuzzy
++msgid "encoder for non mpeg content"
++msgstr "il codificatore per contenuto non mpeg"
+
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
++"video_out_dxr3: inizializzazione encoder MPEG libavcodec non riuscita.\n"
+
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++msgstr "video_out_dxr3: inizializzazione encoder MPEG rte non riuscita.\n"
+
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++msgstr "video_out_dxr3: inizializzazione encoder MPEG fame non riuscita.\n"
+
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
++#: src/dxr3/video_out_dxr3.c:361
++msgid ""
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++#: src/dxr3/video_out_dxr3.c:367
++msgid ""
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:382
++#, fuzzy
++msgid "video output mode (TV or overlay)"
++msgstr "Dxr3: modo video out (TV o sovraimpressione)"
+
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:383
++msgid ""
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1274
++#: src/dxr3/video_out_dxr3.c:430
+ #, fuzzy
+-msgid "MPEG-4 postprocessing quality"
+-msgstr "ffmpeg mpeg-4 qualità di post elaborazione"
++msgid "overlay colorkey value"
++msgstr "Dxr3: sovrapponi il valore di chiave del colore"
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
++#: src/dxr3/video_out_dxr3.c:435
+ #, fuzzy
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
+-msgstr "Dxr3enc: bitrate di output mpeg libavcodec (kbit/s)"
++msgid "overlay colorkey tolerance"
++msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/video_out_dxr3.c:441
++#, fuzzy
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
++"Ritaglia l'area di sovrapposizione superiore e inferiore per evitare linee "
++"verdi"
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-#, fuzzy
+-msgid "minimum compression"
+-msgstr "iff-ilbm: compressione sconosciuta: %d\n"
+-
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:186
++#: src/dxr3/video_out_dxr3.c:456
+ #, fuzzy
+-msgid "maximum quantizer"
+-msgstr "Dxr3enc: quantizzatore massimo"
++msgid "preferred tv mode"
++msgstr "dxr3 preferiva il modo TV"
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
+-#, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
+-msgstr ""
++#: src/dxr3/dxr3_decode_spu.c:253
++#, c-format
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgstr "dxr3_decode_spu: apertura dispositivo SPU %s non riuscita (%s)\n"
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
++msgstr "pulsante richiesto non disponibile\n"
++
++#: src/dxr3/dxr3.h:32
+ #, fuzzy
+-msgid "path to RealPlayer codecs"
+-msgstr "percorso per i codec di Real Player, se installato"
++msgid "DXR3 device number"
++msgstr "Dxr3: Nome Dispositivo"
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
+-msgstr ""
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:192
+-#, fuzzy
+-msgid "display closed captions in MPEG-2 streams"
+-msgstr "Abilita didascalie negli stream MPEG-2"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
++msgstr "dxr3_mpeg_encoder: inizializzazione librte non riuscita\n"
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
++"dxr3_mpeg_encoder: rte gestisce solo le dimensioni video che sono multiple "
++"di 16\n"
+
+-#: src/libspucc/xine_decoder.c:200
+-#, fuzzy
+-msgid "closed-captioning foreground/background scheme"
+-msgstr "Schema di primo piano/sfondo per didascalie"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++msgstr "dxr3_mpeg_encoder: rilevazione contesto rte non riuscito.\n"
+
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
++msgstr "dxr3_mpeg_encoder: impossibile creare codec.\n"
+
+-#: src/libspucc/xine_decoder.c:207
++#: src/dxr3/dxr3_mpeg_encoders.c:189
+ #, fuzzy
+-msgid "standard closed captioning font"
+-msgstr "Font predefinito per didascalie"
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
++msgid "rte mpeg output bitrate (kbit/s)"
++msgstr "Dxr3enc: bitrate di output mpeg RTE (kbit/s)"
+
+-#: src/libspucc/xine_decoder.c:214
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ #, fuzzy
+-msgid "italic closed captioning font"
+-msgstr "Font italico di didascalie"
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
++msgid ""
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
++"Il bitrate che la libreria librte di codifica mpeg dovrebbe usare per modo "
++"di codifica di dxr3"
+
+-#: src/libspucc/xine_decoder.c:221
+-#, fuzzy
+-msgid "closed captioning font size"
+-msgstr "Dimensione font di didascalie"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgstr "dxr3_mpeg_encoder: impossibile inizializzare contesto: %s\n"
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
+-msgstr ""
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgstr "dxr3_mpeg_encoder: impossibile avviare codifica: %s\n"
+
+-#: src/libspucc/xine_decoder.c:226
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++msgstr "dxr3_mpeg_encoder: impossibile avviare la libreria FAME\n"
++
++#: src/dxr3/dxr3_mpeg_encoders.c:387
+ #, fuzzy
+-msgid "center-adjust closed captions"
+-msgstr "Didascalie centrate"
++msgid "fame mpeg encoding quality"
++msgstr "Dxr3enc: qualità di codifica mpeg di fame"
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:478
+-#, fuzzy
+-msgid "font for external subtitles"
+-msgstr "Font per sottotitoli esterni"
+-
+-#: src/libspucmml/xine_decoder.c:484
+-#, fuzzy
+-msgid "subtitle vertical offset (relative window size)"
+-msgstr "Dimensione sottotitolo (dimensione finestra relativa)"
+-
+-#: src/libspucmml/xine_decoder.c:530
+-#, fuzzy
+-msgid "encoding of subtitles"
+-msgstr "Codifica dei sottotitoli"
+-
+-#: src/libspudvb/xine_decoder.c:622
++#: src/dxr3/dxr3_scr.c:98
+ #, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+-
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
+-msgstr ""
++msgid "SCR plugin priority"
++msgstr "Dxr3: priorità del plugin SCR"
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_scr.c:99
+ 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."
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
++"dxr3_decode_video: apertura dispositivo di controllo %s non riuscita (%s)\n"
+
+-#: src/libsputext/xine_decoder.c:901
+-msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:907
+-#, fuzzy
+-msgid "subtitle vertical offset"
+-msgstr "Spostamento verticale sottotitolo (dimensione finestra relativa)"
+-
+-#: src/libsputext/xine_decoder.c:908
++#: src/dxr3/dxr3_decode_video.c:257
+ msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
+-msgstr ""
+-
+-#: src/libsputext/xine_decoder.c:914
+-#, fuzzy
+-msgid "font for subtitles"
+-msgstr "Font per sottotitoli esterni"
+-
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:922
++#: src/dxr3/dxr3_decode_video.c:276
+ #, fuzzy
+-msgid "encoding of the subtitles"
+-msgstr "Codifica dei sottotitoli"
++msgid "try to sync video every frame"
++msgstr "Prova a sincronizzare il video ogni frame"
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
+-msgstr ""
++#: src/dxr3/dxr3_decode_video.c:283
++#, fuzzy
++msgid "use smooth play mode"
++msgstr "Usa modo di riproduzione alternativo"
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
+ msgstr ""
++"Abilitando questa opzione si utilizzerà un modo di riproduzione più definito."
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/dxr3/dxr3_decode_video.c:287
+ #, fuzzy
+-msgid "path to Win32 codecs"
+-msgstr "percorso dei codec dll win32"
++msgid "correct frame durations in broken streams"
++msgstr "Corretta durata frame in stream interrotto"
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "dxr3_decode_video: apertura dispositivo video %s non riuscita (%s)\n"
+
+-#: src/libw32dll/w32codec.c:595
+-#, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
++"dxr3_decode_video: scrittura al dispositivo potrebbe bloccherebbe "
++"svuotamento\n"
+
+-#: src/libw32dll/w32codec.c:628
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+-msgstr ""
++msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgstr "dxr3_decode_video: scrittura sul dispositivo video non riuscita (%s)\n"
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+-msgstr ""
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgstr "dxr3_decode_video: ATTENZIONE: codice tasso frame sconosciuto %d\n"
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
++"dxr3_decode_video: ATTENZIONE: si sta correggendo il codice tasso frame da "
++"PAL a NTSC\n"
+
+-#: src/libw32dll/w32codec.c:696
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
++msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgstr "audio_oss_out: si sta aprendo il dispositivo audio %s: %s\n"
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgid ""
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
++"audio_oss_out: attenzione: tasso di campionamento %d Hz non supportato, si "
++"prova a 44100 Hz\n"
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:225
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+-msgstr ""
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgstr "audio_oss_out: tasso audio: %d richiesto, %d fornito dal dispositivo\n"
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
++msgstr "nome dispositivo audio OSS"
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_oss_out.c:737
++#, fuzzy
++msgid ""
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
++"Specifica la parte base del nome del dispositivo audio quindi usa "
++"oss_device_number per impostare il numero del dispositivo. Seleziona l'audio "
++"se vuoi provare il dispositivo."
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:744
++#, fuzzy
++msgid "OSS audio device number, -1 for none"
++msgstr "nome dispositivo audio OSS"
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:745
++#, fuzzy
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
++"Il nome del dispositivo audio è creato concatenando oss_device_name e il "
++"numero del dispositivo audio (per esempio /dev/sound/dsp2). Se non hai "
++"bisogno di un numero impostalo a -1 (per esempio /dev/sound/dsp). "
++"L'intervallo di questa variabile è -1 o 0-15."
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++msgstr "audio_oss_out: audio.device.oss_device_name = auto, si provano i dev\n"
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
++"audio_oss_out: controllo automatico per il dispositivo audio non riuscito\n"
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
++msgstr "audio_oss_out: si sta utilizzando il dispositivo >%s<\n"
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
++"audio_oss_out: apertura dispositivo audio %s non riuscito:\n"
++"%s\n"
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:800
++#, fuzzy
++msgid "a/v sync method to use by OSS"
++msgstr "metodo A/V sync da usare per OSS, dipende dal driver/hardware"
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
+-msgstr ""
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:200
+-#, fuzzy
+-msgid "frames per second to generate"
+-msgstr "Frame per secondo da generare con Goom"
+-
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-#, fuzzy
+-msgid "goom image width"
+-msgstr "Larghezza in pixel di immagine Goom"
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:211
+-#, fuzzy
+-msgid "goom image height"
+-msgstr "Altezza in pixel di immagine Goom"
+-
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
++"audio_oss_out: driver audio con sincronizzazione real time disabilitata...\n"
++"audio_oss_out: ... invece userà un sistema real-time con orologio per "
++"sincronizzazione soft\n"
++"audio_oss_out: ... potrebbe essereci sincronizzazione audio/video\n"
+
+-#: src/post/goom/xine_goom.c:218
++#: src/audio_out/audio_oss_out.c:856
+ #, fuzzy
+-msgid "colorspace conversion method"
+-msgstr "Metodo di conversione dello spazio dei colori usato da Goom"
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "latenza di output per l'audio esd (aggiusta a/v sync)"
+
+-#: src/post/goom/xine_goom.c:219
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
++"If you experience audio being not in sync with the 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/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
++"audio_oss_out: driver audio real time con sincronizzazione disabilitato...\n"
++"audio_oss_out: ...si sta provando la dimensione del buffer di output: "
+
+-#: src/post/mosaico/switch.c:230
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
++"%d byte\n"
++"audio_oss_out: ... potrebbe essereci sincronizzazione audio/video\n"
+
+-#: src/post/planar/boxblur.c:103
+-msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
+-"\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
+-msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
+-msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:1074
++#, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "audio_oss_out: open() del mixer %s non riuscita: %s\n"
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+ msgstr ""
++"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
++"di oss"
+
+-#: src/post/planar/pp.c:114
+-msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
+-msgstr ""
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#, c-format
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "audio_sun_out: apertura dispositivo audio %s non riuscita: %s\n"
+
+-#: src/post/planar/unsharp.c:219
++#: src/audio_out/audio_sun_out.c:889
++#, fuzzy
++msgid "Sun audio device name"
++msgstr "nome dispositivo audio OSS"
++
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
++"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
++"di sun"
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_irixal_out.c:385
++#, fuzzy
++msgid "irixal audio output maximum gap length"
++msgstr "output audio di irix con lunghezza del massimo gap in 1/90000s"
++
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "plugin di output video di xine che usa la libreria art ascii"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "plugin output audio di xine che usa libaudio di IRIX"
+
+-#: src/video_out/video_out_caca.c:311
+-#, fuzzy
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "plugin di output video di xine che usa la libreria art ascii"
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
++msgstr "pluging output audio dummy di xine"
+
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr "plugin di output video di xine che usa la libreria DirectFB."
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
++msgstr "plugin output audio di xine che usa artsd di KDE"
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "plugin di output video di xine per win32 che usa directx"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
++msgstr "audio_alsa_out: già aperto...PERCHÈ!"
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-#, fuzzy
+-msgid "framebuffer device name"
+-msgstr "dispositivo framebuffer"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgstr "audio_alsa_out: snd_pcm_open() di %s non riuscito: %s\n"
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
++"audio_alsa_out: >>> controlla se un altro programma sta già usando PCM <<<\n"
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
++msgid ""
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
++"audio_alsa_out: configurazione errata per questo PCM: nessuna configurazione "
++"disponibile: %s\n"
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:932
++#: src/audio_out/audio_alsa_out.c:1327
+ #, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
+-msgstr ""
++msgid "snd_lib_error_set_handler() failed: %d"
++msgstr "snd_lib_error_set_handler() non riuscita: %d"
+
+-#: src/video_out/video_out_fb.c:938
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "dispositivo usato per output mono"
+
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
++#: src/audio_out/audio_alsa_out.c:1345
++msgid ""
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"plugin di output video di xine che usa il dispositivo frame buffer di Linux"
+-
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
+-msgstr "plugin di output video di xine che non visualizza nulla"
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "dispositivo usato per output stereo"
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "dispositivo usato per output a 4 canali"
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "dispositivo usato per output a canale 5.1"
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
+-msgstr ""
+-"plugin di output video di xine che usa l'estensione di memoria condivisa MIT "
+-"X"
+-
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1383
++msgid ""
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, fuzzy, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
+-
+-#: src/video_out/video_out_pgx32.c:217
++#: src/audio_out/audio_alsa_out.c:1403
+ #, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+-msgstr ""
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "snd_pcm_open() non riuscito:%d:%s\n"
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
++msgstr ">>>Controlla se un altro programma sta già usando PCM <<<\n"
+
+-#: src/video_out/video_out_pgx64.c:300
+-#, fuzzy, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "video_out_dxr3: apertura dispositivo video %s non riuscita (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
++msgstr "audio_alsa_out : i modi supportati sono "
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1469
++#, fuzzy
++msgid "16bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1473
++#, fuzzy
++msgid "24bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1477
++#, fuzzy
++msgid "32bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
++msgstr "mono "
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
++msgstr "stereo "
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
++msgstr "4-canali "
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
++msgstr "(4-canali non abilitato nella configurazione di xine) "
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-#, fuzzy
+-msgid "video overlay colour key"
+-msgstr "Dxr3: sovrapponi il valore di chiave del colore"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
++msgstr "4.1-canali "
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
++msgstr "(4.1-canali non abilitati nella configurazione di xine) "
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
++msgstr "5-canali "
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
++msgstr "(5-canali non abilitati nella configurazione di xine) "
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
++msgstr "5.1-canali "
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
++msgstr "(5.1-canali non abilitati nella configurazione di xine) "
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "dispositivo mixer di alsa"
+
+-#: src/video_out/video_out_pgx64.c:1487
++#: src/audio_out/audio_alsa_out.c:1551
+ msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
+-msgstr ""
+-
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:480
+-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."
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
++"plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
++"di alsa"
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "plugin di output video di xine che usa l'SDML"
+-
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr "plugin di output video di xine che usa Libstk Surface Set-top Toolkit"
+-
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:177
++#, fuzzy
++msgid "requested buffer control is not available"
++msgstr "pulsante richiesto non disponibile\n"
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+-"plugin di output video di xine che usa il modulo SyncFB per schede Matrox "
+-"G200/G400"
+
+-#: src/video_out/video_out_syncfb.c:1073
++#: src/audio_out/audio_directx2_out.c:186
+ #, fuzzy
+-msgid "SyncFB device name"
+-msgstr "nome dispositivo audio OSS"
++msgid "requested COM interface not available"
++msgstr "pulsante richiesto non disponibile\n"
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-#, fuzzy
+-msgid "video overlay colour key red component"
+-msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
+-
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1136
+-#, fuzzy
+-msgid "video overlay colour key green component"
+-msgstr "Dxr3: sovrapponi l'intervallo di chiave del colore"
+-
+-#: src/video_out/video_out_vidix.c:1143
+-#, fuzzy
+-msgid "video overlay colour key blue component"
+-msgstr "Dxr3: sovrapponi il valore di chiave del colore"
+-
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "plugin di output video di xine che usa libvidix per x11"
+-
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+-"plugin di output video di xine che usa libvidix per il frame buffer Linux"
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
+-#, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++#: src/audio_out/audio_directx2_out.c:540
++msgid "Unable to create primary direct sound buffer."
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:651
++#, c-format
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:305
+-#, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:1304
+-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"
++#: src/audio_out/audio_directx2_out.c:880
++#, c-format
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:883
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++msgid ": can't destroy pthread mutex: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-#, fuzzy
+-msgid "autopaint colour key"
+-msgstr "Fai disegnare a Xv da se il suo tono di colore"
+-
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-#, fuzzy
+-msgid "Make Xv autopaint its colorkey."
+-msgstr "Fai disegnare a Xv da se il suo tono di colore"
++#: src/audio_out/audio_directx2_out.c:943
++#, fuzzy, c-format
++msgid ": unknown control command %d\n"
++msgstr "iff-ilbm: compressione sconosciuta: %d\n"
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
++#: src/audio_out/audio_directx2_out.c:996
+ #, fuzzy
+-msgid "bilinear scaling mode"
+-msgstr "modo scalatura bilineare (permedia 2/3)"
++msgid "second xine audio output plugin using directx"
++msgstr "plugin output audio di xine che usa directx per win32"
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgstr "audio_esd_out: si sta connettendo al server ESD %s: %s\n"
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
++msgstr "audio_esd_out: si sta connettendo al server ESD...\n"
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgstr "audio_esd_out: impossibile connettersi al %s server ESD: %s\n"
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "latenza di output per l'audio esd (aggiusta a/v sync)"
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
+-msgstr ""
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
++msgstr "pluging output audio di xine che usa esound"
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
+-msgstr ""
++#: src/audio_out/audio_coreaudio_out.c:452
++#, fuzzy
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "plugin output audio di xine che usa directx per win32"
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
++msgstr "plugin output audio di xine che usa directx per win32"
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "plugin di output video di xine che usa l'estensione video MIT X"
++#: src/audio_out/audio_file_out.c:362
++msgid "xine file audio output plugin"
++msgstr "pluging output audio di xine"
+
+-#: src/video_out/video_out_xvmc.c:1652
++#: src/audio_out/audio_polyp_out.c:489
+ #, fuzzy
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "plugin di output video di xine che usa l'estensione video MIT X"
++msgid "device used for polypaudio"
++msgstr "dispositivo usato per l'unità CDDA"
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
++#: src/audio_out/audio_polyp_out.c:535
++#, fuzzy
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "pluging output audio di xine che usa esound"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:347
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++msgid "audio_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:611
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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/video_out/video_out_xxmc.c:619
++#: src/xine-engine/video_decoder.c:373
+ #, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgid "video_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/video_decoder.c:447
++#, c-format
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2195
++#: src/xine-engine/video_decoder.c:484
+ 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"
++"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/video_out/video_out_xxmc.c:2204
+-#, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
++"Il file di configurazione corrente è stato modificato da una nuova versione "
++"di xine."
+
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgstr "configfile: la voce '%s' non deve essere modifiocata da MRL\n"
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
+-msgstr ""
++#: src/xine-engine/info_helper.c:204
++#, fuzzy
++msgid "info_helper: can't find out current locale character set\n"
++msgstr "osd: non trovo l'insieme di caratteri locali corrente\n"
+
+-#: src/video_out/video_out_xxmc.c:2429
++#: src/xine-engine/info_helper.c:212
++#, fuzzy, c-format
+ msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+ msgstr ""
++"osd: converisone non supportata %s -> UCS-2, nessuna conversione eseguita\n"
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3661,62 +3682,320 @@
+ "video_out: spiacente, non sarebbe dovuto succedere. Per favore riavvia "
+ "xine.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d frame consegnati, %d frame saltati, %d frame scartati\n"
++
++#: src/xine-engine/video_out.c:739
++#, fuzzy, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
+-"Il file di configurazione corrente è stato modificato da una nuova versione "
+-"di xine."
++"video_out: scarto l'immagine con %lld pts perché è troppo vecchia (diff : %"
++"lld).\n"
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++"video_out: spiacente, non sarebbe dovuto succedere. Per favore riavvia "
++"xine.\n"
++
++#: src/xine-engine/input_cache.c:164
++#, fuzzy
++msgid ": open() function should never be called\n"
++msgstr "input_rip: la funzione open() non dovrebbe mai essere chiamata\n"
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "input_rip: plugin di input non definiti!\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++#, fuzzy
++msgid "xine: error while parsing mrl\n"
++msgstr "xine: errore mentre si faceva il parse di MRL\n"
++
++#: src/xine-engine/xine.c:681
++#, fuzzy, c-format
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: non si trova il plugin di input per MRL [%s]\n"
++
++#: src/xine-engine/xine.c:689
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: il plugin di input non può aprire MRL [%s]\n"
++
++#: src/xine-engine/xine.c:707
++#, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: non si trova il plugin di input per MRL [%s]\n"
++
++#: src/xine-engine/xine.c:733
++#, c-format
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine: demuxer specificato %s non riuscito all'avvio\n"
++
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
++msgstr "xine: condividi il plugin di input d'estrazione\n"
++
++#: src/xine-engine/xine.c:774
++#, fuzzy
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "xine: condividi il plugin di input d'estrazione\n"
++
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine: demuxer last_probed %s non riuscito all'avvio\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:948
++#, fuzzy
++msgid "xine: error opening subtitle mrl\n"
++msgstr "input_rip: errore aprendo il file %s: %s\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr "xine: errore mentre si faceva il parse di MRL\n"
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
++msgstr "xine: opzioni di modifica '%s' da MRL non consentite\n"
++
++#: src/xine-engine/xine.c:1007
++#, c-format
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: non trovo il demux per >%s<\n"
++
++#: src/xine-engine/xine.c:1023
++#, fuzzy, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: non trovo il demux per >%s<\n"
++
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr "xine: demuxer non riuscito all'avvio\n"
++
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: nessun demux disponibile\n"
++
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: demux non riuscito all'avvio\n"
++
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
++"xine: La directory di salvataggio specificata save_dir \"%s\" potrebbe "
++"essere un rischio per la sicurezza.\n"
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr ""
++"La directory di salvataggio specificata save_dir potrebbe essere un rischio "
++"per la sicurezza."
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1484
++#, fuzzy
++msgid "media format detection strategy"
++msgstr "Strategia di rilevamento del formato per il media"
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1503
++#, fuzzy
++msgid "directory for saving streams"
++msgstr "Percorso di salvataggio degli stream"
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr ""
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "messaggi"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "plugin"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr ""
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "font '%s-%d' already loaded, weird.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/osd.c:678
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+-msgstr "configfile: la voce '%s' non deve essere modifiocata da MRL\n"
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-#, fuzzy
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:901
++#, c-format
++msgid ""
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++"osd: sequenza sconosciuta che inizia con byte 0x%02X in codifica \"%s\", la "
++"sto ignorando\n"
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
+ msgstr "osd: non trovo l'insieme di caratteri locali corrente\n"
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/osd.c:967
+ #, fuzzy, c-format
+-msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+ msgstr ""
+ "osd: converisone non supportata %s -> UCS-2, nessuna conversione eseguita\n"
+
+-#: src/xine-engine/input_cache.c:164
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr "osd: font non definito\n"
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1234
+ #, fuzzy
+-msgid ": open() function should never be called\n"
+-msgstr "input_rip: la funzione open() non dovrebbe mai essere chiamata\n"
++msgid "osd: error in rendering\n"
++msgstr "osd: font non definito\n"
+
+-#: src/xine-engine/input_cache.c:323
++#: src/xine-engine/osd.c:1481
+ #, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "input_rip: plugin di input non definiti!\n"
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr "Tavolozza (sfondo con bordo in primo piano) da usarsi sui sottotitoli"
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, c-format
+@@ -3730,7 +4009,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_rip: errore scrivendo nel file %lld byte: %s\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3748,7 +4027,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, fuzzy, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr "input_rip: %lld byte eliminati\n"
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3791,22 +4070,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_rip: errore aprendo il file %s: %s\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -3908,159 +4171,17 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: plugin %s trovato\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, fuzzy, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "load_plugins: impossibile l'avvio %s\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-"osd: sequenza sconosciuta che inizia con byte 0x%02X in codifica \"%s\", la "
+-"sto ignorando\n"
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr "osd: non trovo l'insieme di caratteri locali corrente\n"
+-
+-#: src/xine-engine/osd.c:963
+-#, fuzzy, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-"osd: converisone non supportata %s -> UCS-2, nessuna conversione eseguita\n"
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr "osd: font non definito\n"
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-#, fuzzy
+-msgid "osd: error in rendering\n"
+-msgstr "osd: font non definito\n"
+-
+-#: src/xine-engine/osd.c:1421
+-#, fuzzy
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr "Tavolozza (sfondo con bordo in primo piano) da usarsi sui sottotitoli"
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d frame consegnati, %d frame saltati, %d frame scartati\n"
+-
+-#: src/xine-engine/video_out.c:739
+-#, fuzzy, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out: scarto l'immagine con %lld pts perché è troppo vecchia (diff : %"
+-"lld).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-"video_out: spiacente, non sarebbe dovuto succedere. Per favore riavvia "
+-"xine.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr "posizione immagine orizzontale nella finestra di output"
+@@ -4101,203 +4222,299 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-#, fuzzy
+-msgid "xine: error while parsing mrl\n"
+-msgstr "xine: errore mentre si faceva il parse di MRL\n"
+-
+-#: src/xine-engine/xine.c:667
+-#, fuzzy, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: non si trova il plugin di input per MRL [%s]\n"
+-
+-#: src/xine-engine/xine.c:675
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: il plugin di input non può aprire MRL [%s]\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:693
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: non si trova il plugin di input per MRL [%s]\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine: demuxer specificato %s non riuscito all'avvio\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
+-msgstr "xine: condividi il plugin di input d'estrazione\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:760
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+ #, fuzzy
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "xine: condividi il plugin di input d'estrazione\n"
+-
+-#: src/xine-engine/xine.c:791
+-#, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine: demuxer last_probed %s non riuscito all'avvio\n"
++msgid "path to RealPlayer codecs"
++msgstr "percorso per i codec di Real Player, se installato"
+
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-#, fuzzy
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "input_rip: errore aprendo il file %s: %s\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
+-msgstr "xine: errore mentre si faceva il parse di MRL\n"
+-
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
+-msgstr "xine: opzioni di modifica '%s' da MRL non consentite\n"
+-
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: non trovo il demux per >%s<\n"
+-
+-#: src/xine-engine/xine.c:1009
+-#, fuzzy, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: non trovo il demux per >%s<\n"
+-
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine: demuxer non riuscito all'avvio\n"
+-
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: nessun demux disponibile\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: demux non riuscito all'avvio\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
+ msgstr ""
+-"xine: La directory di salvataggio specificata save_dir \"%s\" potrebbe "
+-"essere un rischio per la sicurezza.\n"
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+-"La directory di salvataggio specificata save_dir potrebbe essere un rischio "
+-"per la sicurezza."
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-#, fuzzy
+-msgid "media format detection strategy"
+-msgstr "Strategia di rilevamento del formato per il media"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/planar/unsharp.c:219
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-#, fuzzy
+-msgid "directory for saving streams"
+-msgstr "Percorso di salvataggio degli stream"
+-
+-#: src/xine-engine/xine.c:1488
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
++"\n"
++"Parameters\n"
++"\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
++"\n"
++" Enabled: Enable/disable the plugin.\n"
++"\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "messaggi"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "plugin"
++#: src/post/goom/xine_goom.c:200
++#, fuzzy
++msgid "frames per second to generate"
++msgstr "Frame per secondo da generare con Goom"
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:201
++msgid ""
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:206
++#, fuzzy
++msgid "goom image width"
++msgstr "Larghezza in pixel di immagine Goom"
++
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:211
++#, fuzzy
++msgid "goom image height"
++msgstr "Altezza in pixel di immagine Goom"
++
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:218
++#, fuzzy
++msgid "colorspace conversion method"
++msgstr "Metodo di conversione dello spazio dei colori usato da Goom"
++
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+ #~ msgid "audio_oss_out: open() %s failed: %s\n"
+--- ./po/pl.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/pl.po 2005-02-12 22:28:46.000000000 +0000
+@@ -6,8 +6,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: pl_PL\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2003-05-24 12:36+0200\n"
+ "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n"
+ "Language-Team: Polish <pl@li.org>\n"
+@@ -18,539 +19,1157 @@
+ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+ "|| n%100>=20) ? 1 : 2;\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
+-#, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++#: src/libsputext/demux_sputext.c:1507
++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/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
+-#, c-format
++#: src/libsputext/xine_decoder.c:901
+ msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++# src/libsputext/xine_decoder.c:1084
++#: src/libsputext/xine_decoder.c:907
++#, fuzzy
++msgid "subtitle vertical offset"
++msgstr "pionowe wyrównanie napisów (względny rozmiar okna)"
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++# src/libsputext/xine_decoder.c:1078
++#: src/libsputext/xine_decoder.c:914
++#, fuzzy
++msgid "font for subtitles"
++msgstr "fonty dla zewnętrznych napisów"
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++# src/libsputext/xine_decoder.c:1078
++#: src/libsputext/xine_decoder.c:922
++#, fuzzy
++msgid "encoding of the subtitles"
++msgstr "kodowanie napisów"
++
++#: src/libsputext/xine_decoder.c:923
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
+-msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728
+-# src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "urządzenie użyte w trybie mono"
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
+-msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:191 src/audio_out/audio_alsa_out.c:920
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "urządzenie użyte w trybie stereo"
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
+-msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "urządzenie użyte do wyjścia 4-kanałowego"
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/libffmpeg/video_decoder.c:714
++#, c-format
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1274
++#, fuzzy
++msgid "MPEG-4 postprocessing quality"
++msgstr "jakość post-przetwarzania ffmpeg mpeg-4"
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:221 src/audio_out/audio_alsa_out.c:232
+-# src/audio_out/audio_alsa_out.c:941 src/audio_out/audio_alsa_out.c:948
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "urządzenie użyte do wyjścia 5.1-kanałowego"
++#: src/libffmpeg/dvaudio_decoder.c:303
++#, c-format
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1368
++# src/dxr3/dxr3_mpeg_encoders.c:182
++#: src/libffmpeg/xine_encoder.c:164
++#, fuzzy
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr "dxr3enc: częstotliwość wyjśćia rte mpeg (kbit/s)"
++
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
+-#, fuzzy, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "osd: zawiodło iconv_open()\n"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++# src/xine-engine/audio_out.c:868
++#: src/liba52/xine_decoder.c:780
++#, fuzzy
++msgid "A/52 volume"
++msgstr "głośność dźwięku"
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
++# src/liba52/xine_decoder.c:577
++#: src/liba52/xine_decoder.c:789
++#, fuzzy
++msgid "use A/52 dynamic range compression"
++msgstr "włączanie dynamicznego zakresu kompensacji a/52"
++
++#: src/liba52/xine_decoder.c:790
++msgid ""
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
++# src/liba52/xine_decoder.c:580
++#: src/liba52/xine_decoder.c:797
++#, fuzzy
++msgid "downmix audio to 2 channel surround stereo"
++msgstr "włącz redukcję dźwięku do 2.0 surround stereo"
++
++#: src/liba52/xine_decoder.c:798
++msgid ""
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
++#: src/xine-utils/memcpy.c:482
++msgid ""
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
++# src/libsputext/xine_decoder.c:1078
++#: src/libspucmml/xine_decoder.c:478
++#, fuzzy
++msgid "font for external subtitles"
++msgstr "fonty dla zewnętrznych napisów"
++
++# src/libsputext/xine_decoder.c:1084
++#: src/libspucmml/xine_decoder.c:484
++#, fuzzy
++msgid "subtitle vertical offset (relative window size)"
++msgstr "pionowe wyrównanie napisów (względny rozmiar okna)"
++
++# src/libsputext/xine_decoder.c:1078
++#: src/libspucmml/xine_decoder.c:530
++#, fuzzy
++msgid "encoding of subtitles"
++msgstr "kodowanie napisów"
++
++# src/xine-engine/video_out.c:890
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
++
++#: src/libmusepack/xine_decoder.c:237
++#, c-format
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
++# src/libspucc/xine_decoder.c:220
++#: src/libspucc/xine_decoder.c:192
++#, fuzzy
++msgid "display closed captions in MPEG-2 streams"
++msgstr "włącz closed-caption w strumieniach mpeg-2"
++
++#: src/libspucc/xine_decoder.c:193
++msgid ""
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
++# src/libspucc/xine_decoder.c:227
++#: src/libspucc/xine_decoder.c:200
++#, fuzzy
++msgid "closed-captioning foreground/background scheme"
++msgstr "schemat (tło/napisy) dla closed-caption"
++
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
++# src/libspucc/xine_decoder.c:233
++#: src/libspucc/xine_decoder.c:207
++#, fuzzy
++msgid "standard closed captioning font"
++msgstr "standardowa czcionka dla closed-caption"
++
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++# src/libspucc/xine_decoder.c:239
++#: src/libspucc/xine_decoder.c:214
++#, fuzzy
++msgid "italic closed captioning font"
++msgstr "czcionka italic dla closed-caption"
++
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++# src/libspucc/xine_decoder.c:245
++#: src/libspucc/xine_decoder.c:221
++#, fuzzy
++msgid "closed captioning font size"
++msgstr "rozmiar czcionki closed-caption"
++
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:862 src/audio_out/audio_alsa_out.c:1072
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "urządzenie miksera alsa"
++# src/libspucc/xine_decoder.c:250
++#: src/libspucc/xine_decoder.c:226
++#, fuzzy
++msgid "center-adjust closed captions"
++msgstr "centrowanie closed-caption"
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/libspucc/xine_decoder.c:227
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:1105
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++# src/video_out/video_out_directfb.c:569
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
++msgstr "wtyczka wyjścia obrazu xine używająca biblioteki DirectFB"
++
++# src/dxr3/video_out_dxr3.c:287
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++#, fuzzy
++msgid "video overlay colour key"
++msgstr "dxr3: wartość koloru kluczowego dla overlay"
++
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
+ msgstr ""
+-"wtyczka wyjścia dźwięku xine używająca sprzętu/sterowników kompatybilnych z "
+-"systemem alsa"
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++#, fuzzy
++msgid "autopaint colour key"
++msgstr "Auto-tworzenie koloru-klucza przez Xv"
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_coreaudio_out.c:452
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
+ #, fuzzy
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
++msgid "Make Xv autopaint its colorkey."
++msgstr "Auto-tworzenie koloru-klucza przez Xv"
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_directx_out.c:827
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
++msgid ""
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
++msgstr ""
++
++# src/video_out/video_out_xv.c:1479
++#: src/video_out/video_out_xvmc.c:1652
+ #, fuzzy
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1797
++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:1806
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+ msgstr ""
+
+-# src/audio_out/audio_esd_out.c:414
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "opóźnienie wyjścia dźwieku esd (regulacja synchronizacji a/v)"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
+ msgstr ""
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
+-msgstr "wtyczka wyjścia dźwięku używająca esound"
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_file_out.c:362
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
++#, c-format
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr ""
++
++# src/dxr3/video_out_dxr3.c:290
++#: src/video_out/video_out_vidix.c:1154
+ #, fuzzy
+-msgid "xine file audio output plugin"
+-msgstr "wtyczka wyjścia dźwięku używająca esound"
++msgid "video overlay colour key red component"
++msgstr "dxr3: zakres koloru kluczowego"
+
+-# src/audio_out/audio_irixal_out.c:382
+-#: src/audio_out/audio_irixal_out.c:385
++# src/dxr3/video_out_dxr3.c:290
++#: src/video_out/video_out_vidix.c:1161
+ #, fuzzy
+-msgid "irixal audio output maximum gap length"
+-msgstr "maksymalna długość przerwy wyjścia dźwięku irixal w 1/90000s"
++msgid "video overlay colour key green component"
++msgstr "dxr3: zakres koloru kluczowego"
+
+-#: src/audio_out/audio_irixal_out.c:386
++# src/dxr3/video_out_dxr3.c:287
++#: src/video_out/video_out_vidix.c:1168
++#, fuzzy
++msgid "video overlay colour key blue component"
++msgstr "dxr3: wartość koloru kluczowego dla overlay"
++
++# src/video_out/video_out_vidix.c:869
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
++
++# src/video_out/video_out_fb.c:721
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++#, fuzzy
++msgid "framebuffer device name"
++msgstr "urządzenie buforu ramki"
++
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-# src/audio_out/audio_irixal_out.c:411
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "wtyczka wyjścia dźwięku xine używająca IRIX libaudio"
++# src/video_out/video_out_fb.c:885
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr ""
++"wtyczka wyjścia obrazu xine używająca libvidix dla linuxowego urządzenia "
++"buforu ramki"
+
+-# src/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_none_out.c:223
+-#, fuzzy
+-msgid "xine dummy audio output plugin"
+-msgstr "wtyczka wyjścia dźwięku używająca esound"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++# src/video_out/video_out_aa.c:307
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:773
++# src/video_out/video_out_aa.c:307
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++#, fuzzy
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#: src/video_out/video_out_xxmc.c:651
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2195
++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:2204
+ #, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-# src/audio_out/audio_oss_out.c:708
+-#: src/audio_out/audio_oss_out.c:800
++# src/video_out/video_out_xv.c:1408
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
+ #, fuzzy
+-msgid "a/v sync method to use by OSS"
+-msgstr ""
+-"metoda synchronizacji A/V używana przez OSS, zależy od sterownika/sprzętu"
++msgid "bilinear scaling mode"
++msgstr "tryb skalowania bilinearnego (permedia 2/3)"
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++# src/video_out/video_out_xv.c:1479
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
++
++#: src/video_out/video_out_xshm.c:190
++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:206
++#, 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:216
++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:233
++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:1138
++#, c-format
++msgid ""
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
+-msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+ msgstr ""
+
+-# src/audio_out/audio_esd_out.c:414
+-#: src/audio_out/audio_oss_out.c:856
+-#, fuzzy
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "opóźnienie wyjścia dźwieku esd (regulacja synchronizacji a/v)"
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:887
++# src/video_out/video_out_xshm.c:1445
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr ""
++"wtyczka wyjścia obrazu xine używajaca rozszerzenie dzielonej pamięci MIT X"
++
++#: src/video_out/video_out_fb.c:762
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_fb.c:949
++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:1016
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgid ""
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+
+-# src/audio_out/audio_oss_out.c:923
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++# src/video_out/video_out_fb.c:885
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
+ msgstr ""
+-"wtyczka wyjścia dźwięku xine, używająca urządzeń/sterowników kompatybilnych "
+-"z oss"
++"xtyczka wyjścia obrazu xine używająca linuxowego urządzenia buforu ramki"
+
+-# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
+-#: src/audio_out/audio_polyp_out.c:489
+-#, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "urządzenie użyte do wyjścia 4-kanałowego"
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_sdl.c:480
++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/audio_out/audio_esd_out.c:441
+-#: src/audio_out/audio_polyp_out.c:535
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr ""
++
++# src/video_out/video_out_sdl.c:696
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "wtyczka wyjścia obrazu xine używająca Simple Direct Media Layer"
++
++# src/video_out/video_out_vidix.c:869
++#: src/video_out/video_out_directx.c:1223
+ #, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "wtyczka wyjścia dźwięku używająca esound"
++msgid "xine video output plugin for win32 using directx"
++msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++# src/video_out/video_out_vidix.c:869
++#: src/video_out/video_out_none.c:277
++#, fuzzy
++msgid "xine video output plugin which displays nothing"
++msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
++
++# src/video_out/video_out_aa.c:307
++#: src/video_out/video_out_caca.c:311
++#, fuzzy
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
++
++#: src/video_out/alphablend.c:1768
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
+-"This setting is security critical, because when changed to a different file, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+
+-# src/audio_out/audio_sun_out.c:748
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+-"wtyczka wyjścia dźwięku xine kompatybilna z urządzeniami/sterownikami sun"
+
+-#: src/demuxers/demux_asf.c:468
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
+-msgstr "Odtwarzanie indeksu..."
++#: src/video_out/video_out_xv.c:1304
++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/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
++#: src/video_out/video_out_xv.c:1313
+ #, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-# src/demuxers/demux_avi.c:659
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: index pliku avi uszkodzony\n"
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
+ msgstr ""
+
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++# src/video_out/video_out_syncfb.c:1170
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++"wtyczka wyjścia obrazu xine używająca modułu SyncFB dla kart Matrox G200/G400"
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
++
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr ""
++"ogg: ścieżka oznaczona jako vorbis ale nie znaleziono nagłówka strumienia "
++"vorbis.\n"
++
+ # src/demuxers/demux_film.c:176
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -561,20 +1180,20 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr "nie rozpoznany fragment filmu\n"
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+ msgstr ""
++"nieznany typ bloku VOC (0x%02X); proszę skontaktować się z programistami "
++"xine\n"
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
+ msgstr ""
++"nieznany typ kompresji VOC (0x%02X); proszę skontaktować się z programistami "
++"xine\n"
+
+ #: src/demuxers/demux_mpeg_block.c:296
+ #, c-format
+@@ -605,6 +1224,30 @@
+ "demux_mpeg_block: uwaga: nagłówek pes wskazuje na to ze strumień może być "
+ "zaszyfrowany (tryb szyfrowania %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr "demux_snd: błędne parametry nagłówka\n"
++
++# src/demuxers/demux_avi.c:1257
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_snd: niewspierany typ dźwięku %d\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -640,36 +1283,24 @@
+ "nieznany typ kompresji VOC (0x%02X); proszę skontaktować się z programistami "
+ "xine\n"
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-"ogg: ścieżka oznaczona jako vorbis ale nie znaleziono nagłówka strumienia "
+-"vorbis.\n"
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
+-msgstr "demux_snd: błędne parametry nagłówka\n"
+-
+-# src/demuxers/demux_avi.c:1257
+-#: src/demuxers/demux_snd.c:149
+-#, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_snd: niewspierany typ dźwięku %d\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
++msgstr "Odtwarzanie indeksu..."
+
+-#: src/demuxers/demux_voc.c:105
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
+ msgstr ""
+-"nieznany typ bloku VOC (0x%02X); proszę skontaktować się z programistami "
+-"xine\n"
+
+-#: src/demuxers/demux_voc.c:120
++# src/demuxers/demux_avi.c:659
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: index pliku avi uszkodzony\n"
++
++#: src/demuxers/demux_avi.c:850
+ #, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
+ msgstr ""
+-"nieznany typ kompresji VOC (0x%02X); proszę skontaktować się z programistami "
+-"xine\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -681,644 +1312,547 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr "demux_wc3movie: Wystąpił problem przy ładowaniu fragmentów palety\n"
+
+-# src/dxr3/dxr3.h:33
+-#: src/dxr3/dxr3.h:32
+-#, fuzzy
+-msgid "DXR3 device number"
+-msgstr "dxr3: nazwa urządzenia"
+-
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:235
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgid "iff-8svx/16sv: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:250
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-# src/dxr3/dxr3_decode_video.c:176
+-#: src/dxr3/dxr3_decode_video.c:276
+-#, fuzzy
+-msgid "try to sync video every frame"
+-msgstr "próbuj synchronizować każdą ramkę"
+-
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-# src/dxr3/dxr3_decode_video.c:180
+-#: src/dxr3/dxr3_decode_video.c:283
+-#, fuzzy
+-msgid "use smooth play mode"
+-msgstr "użyj alternatywnego trybu odtwarzania"
+-
+-# src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
+-msgstr "włączenie tej opcji użyje wygładzonego trybu odtwarzania"
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++msgstr ""
+
+-# src/dxr3/dxr3_decode_video.c:184
+-#: src/dxr3/dxr3_decode_video.c:287
+-#, fuzzy
+-msgid "correct frame durations in broken streams"
+-msgstr "korekta czasu trwania ramki w zepsutych strumieniach"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
++msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
+-msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:595
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:639
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:685
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgid ""
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
++#: src/libw32dll/w32codec.c:696
++#, c-format
+ msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
+-msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++#: src/libw32dll/w32codec.c:1216
++#, c-format
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
+ msgstr ""
+
+-# src/dxr3/dxr3_mpeg_encoders.c:182
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-#, fuzzy
+-msgid "rte mpeg output bitrate (kbit/s)"
+-msgstr "dxr3enc: częstotliwość wyjśćia rte mpeg (kbit/s)"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
++msgstr ""
+
+-# src/dxr3/dxr3_mpeg_encoders.c:183
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
++# src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+ #, fuzzy
++msgid "path to Win32 codecs"
++msgstr "ścieżka do kodeków dll win32"
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+-"częstotliwość jaką biblioteka librte powinna użyć dla trybu kodowania dxr3"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++# src/input/input_rtp.c:157
++#: src/input/input_rtp.c:182
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++# src/input/input_rtp.c:157
++#: src/input/input_rtp.c:201
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr ""
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+-msgstr ""
++# src/input/input_rtp.c:157
++#: src/input/input_rtp.c:209
++#, fuzzy, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-# src/dxr3/dxr3_mpeg_encoders.c:389
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-#, fuzzy
+-msgid "fame mpeg encoding quality"
+-msgstr "dxr3enc: jakość kodowania fame"
++# src/input/input_rtp.c:167
++#: src/input/input_rtp.c:216
++#, c-format
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-# src/dxr3/dxr3_scr.c:81
+-#: src/dxr3/dxr3_scr.c:98
+-#, fuzzy
+-msgid "SCR plugin priority"
+-msgstr "dxr3: priorytet wtyczki SCR"
++# src/input/input_rtp.c:185
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) zawiodło (multicast kernel?): %s.\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
+-msgstr ""
++# src/input/input_rtp.c:205
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "nie mogę znaleźć IP dla '%s'.\n"
+
+-# src/dxr3/video_out_dxr3.c:153
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
+-msgstr "zamiana lini parzystych i nieparzystych"
++# src/input/input_rtp.c:218
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "nie da się dowiązać do '%s'.\n"
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
++# src/input/input_rtp.c:157
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
++msgstr "recv(): %s.\n"
++
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
++msgstr "RTP: zatrzymuje odczyt wątku...\n"
++
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
++msgstr "RTP: odczyt wątku zakończony\n"
++
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:156
+-#: src/dxr3/video_out_dxr3.c:265
++# src/input/input_rtp.c:339
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
++
++# src/input/input_net.c:302
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "wtyczka wejścia RTP i UDP dostarczana z xine"
++
++# src/input/input_http.c:416 src/input/input_http.c:537
++#: src/input/mmsh.c:232
+ #, fuzzy
+-msgid "add black bars to correct aspect ratio"
+-msgstr "dodanie czarnch pasków w celu skorygowania proporcji"
++msgid "libmmsh: send error\n"
++msgstr "input_http: błąd odczytu\n"
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:160
+-#: src/dxr3/video_out_dxr3.c:271
+-#, fuzzy
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr "dxr3: użyj alternatywnego trybu odtwarzania dla kodera mpeg"
++# src/input/input_http.c:450
++#: src/input/mmsh.c:283
++#, fuzzy, c-format
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "input_http: przekierowanie 3xx: >%d %s<\n"
+
+-# src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
+-#: src/dxr3/video_out_dxr3.c:272
+-#, fuzzy
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
+-msgstr "włączenie tej opcji użyje wygładzonego trybu odtwarzania"
++# src/input/input_http.c:455
++#: src/input/mmsh.c:290
++#, fuzzy, c-format
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "input_http: status http nie jest 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:280
+-#, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:288
+-#, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:221
+-#: src/dxr3/video_out_dxr3.c:330
+-#, fuzzy
+-msgid "encoder for non mpeg content"
+-msgstr "koder do zawartości nie-mpeg"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
+-msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:260
+-#: src/dxr3/video_out_dxr3.c:382
+-#, fuzzy
+-msgid "video output mode (TV or overlay)"
+-msgstr "dxr3: tryb wyjścia tv (tv lub overlay)"
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
+-msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:287
+-#: src/dxr3/video_out_dxr3.c:430
+-#, fuzzy
+-msgid "overlay colorkey value"
+-msgstr "dxr3: wartość koloru kluczowego dla overlay"
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:290
+-#: src/dxr3/video_out_dxr3.c:435
+-#, fuzzy
+-msgid "overlay colorkey tolerance"
+-msgstr "dxr3: zakres koloru kluczowego"
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
++msgstr ""
++
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-#, fuzzy
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+-"Obcięcie obszaru overlay z góry i z dołu aby uniknąć wyświetlania zielonych "
+-"linii"
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1713
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:303
+-#: src/dxr3/video_out_dxr3.c:456
+-#, fuzzy
+-msgid "preferred tv mode"
+-msgstr "dxr3: wybór trybu tv"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
+-msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++msgid ""
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
+
+-# src/input/input_http.c:134
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "http: nie mogę się podłączyć do >%s<\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr ""
+
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1754
++msgid ""
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-# src/input/input_net.c:138
+-#: src/input/input_cdda.c:1545
+-#, fuzzy, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_net: nie mogę podłączyć się do '%s'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
++msgstr ""
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
++msgid ""
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
+-#: src/input/input_cdda.c:2586
+-#, fuzzy
+-msgid "device used for CD audio"
+-msgstr "urządzenie użyte do wyjścia 4-kanałowego"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
++msgstr ""
+
+-#: src/input/input_cdda.c:2587
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++#: src/input/vcd/vcdio.c:217
++msgid "SEEK_CUR not implemented for non-zero offset"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
+ msgstr ""
+
+ # src/input/input_http.c:98
+-#: src/input/input_dvb.c:834
++#: src/input/input_dvb.c:838
+ #, fuzzy, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+ # src/input/input_http.c:98
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+ # src/input/input_http.c:98
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr ""
+
+ # src/input/input_rtp.c:339
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ #, fuzzy
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "wtyczka wejścia pliku"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr ""
+
+ # src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728
+ # src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ #, fuzzy
+ msgid "device used for DVD playback"
+ msgstr "urządzenie użyte w trybie mono"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1329,11 +1863,11 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+@@ -1341,12 +1875,12 @@
+ msgstr ""
+
+ # src/input/input_vcd.c:1184
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ #, fuzzy
+ msgid "path to the title key cache"
+ msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1355,44 +1889,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1411,11 +1945,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1429,164 +1963,181 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-# src/input/input_file.c:353
+-#: src/input/input_file.c:127
+-#, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: błąd odczytu (%s)\n"
+-
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: Permission denied: >%s<\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
+ msgstr ""
+
+-# src/input/input_file.c:353
+-#: src/input/input_file.c:286
++# src/input/input_http.c:98
++#: src/input/input_stdin_fifo.c:249
+ #, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: błąd odczytu (%s)\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr "wtyczka wejścia pliku"
++# src/input/input_http.c:640
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr "wtyczka strumienia standardowego wejścia"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
+-msgstr "miejsce startu nawigatora plików"
++# src/input/input_http.c:640
++#: src/input/input_mms.c:424
++#, fuzzy
++msgid "mms streaming input plugin"
++msgstr "wtyczka strumienia standardowego wejścia"
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
+-msgstr "listowanie ukrytych plików"
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
++msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
++msgstr ""
++
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-# src/input/input_net.c:302
+-#: src/input/input_gnome_vfs.c:218
++# src/input/net_buf_ctrl.c:67
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr "Buforowanie..."
++
++# src/input/input_http.c:640
++#: src/input/input_pnm.c:266
+ #, fuzzy
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "wtyczka wejścia net dostarczana z xine"
++msgid "pnm streaming input plugin"
++msgstr "wtyczka strumienia standardowego wejścia"
+
+ # src/input/input_rtp.c:339
+-#: src/input/input_http.c:170
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+ # src/input/input_http.c:416 src/input/input_http.c:537
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: błąd odczytu %d\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr ""
+
+ # src/input/input_http.c:445
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: błędna odpowiedź http\n"
+
+ # src/input/input_http.c:450
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: przekierowanie 3xx: >%d %s<\n"
+
+ # src/input/input_http.c:455
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: status http nie jest 2xx: >%d %s<\n"
+
+ # src/input/input_http.c:464
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: długość zawartości = %Ld bytes\n"
+
+ # src/input/input_http.c:640
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr "wtyczka wejścia http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr ""
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr ""
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-# src/input/input_http.c:640
+-#: src/input/input_mms.c:424
+-#, fuzzy
+-msgid "mms streaming input plugin"
+-msgstr "wtyczka strumienia standardowego wejścia"
+-
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++# src/input/input_http.c:134
++#: src/input/librtsp/rtsp.c:507
++#, fuzzy, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "http: nie mogę się podłączyć do >%s<\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++# src/input/input_http.c:134
++#: src/input/librtsp/rtsp_session.c:84
++#, fuzzy, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "http: nie mogę się podłączyć do >%s<\n"
++
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+
++# src/input/input_net.c:302
++#: src/input/input_gnome_vfs.c:218
++#, fuzzy
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "wtyczka wejścia net dostarczana z xine"
++
+ # src/input/input_net.c:102
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+@@ -1600,176 +2151,44 @@
+ msgstr "input_net: connect(): %s\n"
+
+ # src/input/input_net.c:126
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: nie mogę znaleźć IP dla '%s'.\n"
+
+ # src/input/input_net.c:138
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: nie mogę podłączyć się do '%s'.\n"
+
+ # src/input/input_net.c:302
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "wtyczka wejścia net dostarczana z xine"
+
+-# src/input/input_http.c:640
+-#: src/input/input_pnm.c:266
+-#, fuzzy
+-msgid "pnm streaming input plugin"
+-msgstr "wtyczka strumienia standardowego wejścia"
+-
+-# src/input/input_rtp.c:339
+-#: src/input/input_pvr.c:604
+-#, fuzzy, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+-
+-#: src/input/input_pvr.c:761
+-#, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr ""
+-
+-# src/input/input_file.c:353
+-#: src/input/input_pvr.c:837
+-#, fuzzy, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_file: błąd odczytu (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-# src/input/input_rtp.c:157
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr ""
+-
+-# src/input/input_rtp.c:157
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-# src/input/input_rtp.c:157
+-#: src/input/input_rtp.c:209
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-# src/input/input_rtp.c:167
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr ""
+-
+-# src/input/input_rtp.c:185
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) zawiodło (multicast kernel?): %s.\n"
+-
+-# src/input/input_rtp.c:205
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "nie mogę znaleźć IP dla '%s'.\n"
+-
+-# src/input/input_rtp.c:218
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "nie da się dowiązać do '%s'.\n"
+-
+-# src/input/input_rtp.c:157
+-#: src/input/input_rtp.c:314
+-#, c-format
+-msgid "recv(): %s.\n"
+-msgstr "recv(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr "RTP: zatrzymuje odczyt wątku...\n"
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr "RTP: odczyt wątku zakończony\n"
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr ""
+-
+-# src/input/input_rtp.c:339
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+-
+-# src/input/input_net.c:302
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "wtyczka wejścia RTP i UDP dostarczana z xine"
+-
+-# src/input/input_http.c:640
+-#: src/input/input_rtsp.c:278
+-#, fuzzy
+-msgid "rtsp streaming input plugin"
+-msgstr "wtyczka strumienia standardowego wejścia"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-# src/input/input_http.c:98
+-#: src/input/input_stdin_fifo.c:249
++# src/input/input_net.c:138
++#: src/input/pnm.c:755
+ #, fuzzy, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "input_http: otwarcie gniazda zawiodło\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_net: nie mogę podłączyć się do '%s'.\n"
+
+-# src/input/input_http.c:640
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr "wtyczka strumienia standardowego wejścia"
++# src/input/input_http.c:98
++#: src/input/pnm.c:766
++#, fuzzy
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+ # src/input/net_buf_ctrl.c:67
+ #: src/input/input_v4l.c:378
+@@ -1825,1812 +2244,1418 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
+
+-#: src/input/input_vcd.c:849
+-msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+-msgstr ""
+-
+-#: src/input/input_vcd.c:855
+-#, c-format
+-msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+-msgstr ""
+-
+-# src/input/input_http.c:640
+-#: src/input/input_vcd.c:922
+-msgid "Video CD input plugin"
+-msgstr "wtyczka wejścia VCD"
+-
+-# src/input/input_rtp.c:205
+-#: src/input/input_vcd.c:964
+-#, fuzzy, c-format
+-msgid "unable to open %s: %s.\n"
+-msgstr "nie mogę znaleźć IP dla '%s'.\n"
+-
+-# src/input/input_net.c:126
+-#: src/input/input_vcd.c:1040
+-#, fuzzy, c-format
+-msgid "input_vcd: unable to open %s: %s.\n"
+-msgstr "input_net: nie mogę znaleźć IP dla '%s'.\n"
+-
+-# src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728
+-# src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957
+-#: src/input/input_vcd.c:1094
+-#, fuzzy
+-msgid "device used for VCD playback"
+-msgstr "urządzenie użyte w trybie mono"
+-
+-#: src/input/input_vcd.c:1095
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, you intend to play your "
+-"VideoCDs with."
+-msgstr ""
+-
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr ""
+-
+-#: src/input/mms.c:646
++#: src/input/mms.c:650
+ msgid "Connecting MMS server (over tcp)..."
+ msgstr ""
+
+-# src/input/input_http.c:416 src/input/input_http.c:537
+-#: src/input/mmsh.c:232
+-#, fuzzy
+-msgid "libmmsh: send error\n"
+-msgstr "input_http: błąd odczytu\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr ""
+-
+-# src/input/input_http.c:450
+-#: src/input/mmsh.c:283
+-#, fuzzy, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "input_http: przekierowanie 3xx: >%d %s<\n"
+-
+-# src/input/input_http.c:455
+-#: src/input/mmsh.c:290
++# src/input/input_http.c:134
++#: src/input/input_cdda.c:1494
+ #, fuzzy, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "input_http: status http nie jest 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr ""
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr ""
+-
+-# src/input/net_buf_ctrl.c:67
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr "Buforowanie..."
++msgid "%s: can't connect to %s:%d\n"
++msgstr "http: nie mogę się podłączyć do >%s<\n"
+
+-#: src/input/pnm.c:617
++#: src/input/input_cdda.c:1540
+ #, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+ msgstr ""
+
+ # src/input/input_net.c:138
+-#: src/input/pnm.c:755
++#: src/input/input_cdda.c:1545
+ #, fuzzy, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+ msgstr "input_net: nie mogę podłączyć się do '%s'.\n"
+
+-# src/input/input_http.c:98
+-#: src/input/pnm.c:766
+-#, fuzzy
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_http: otwarcie gniazda zawiodło\n"
+-
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr ""
+-
+-# src/input/input_http.c:134
+-#: src/input/librtsp/rtsp.c:507
+-#, fuzzy, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "http: nie mogę się podłączyć do >%s<\n"
+-
+-# src/input/input_http.c:134
+-#: src/input/librtsp/rtsp_session.c:84
+-#, fuzzy, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "http: nie mogę się podłączyć do >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
+-
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr ""
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
++#: src/input/input_cdda.c:2586
++#, fuzzy
++msgid "device used for CD audio"
++msgstr "urządzenie użyte do wyjścia 4-kanałowego"
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_cdda.c:2615
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
++#: src/input/input_vcd.c:849
++msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
++#: src/input/input_vcd.c:855
++#, c-format
++msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr ""
++# src/input/input_http.c:640
++#: src/input/input_vcd.c:922
++msgid "Video CD input plugin"
++msgstr "wtyczka wejścia VCD"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr ""
++# src/input/input_rtp.c:205
++#: src/input/input_vcd.c:964
++#, fuzzy, c-format
++msgid "unable to open %s: %s.\n"
++msgstr "nie mogę znaleźć IP dla '%s'.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr ""
++# src/input/input_net.c:126
++#: src/input/input_vcd.c:1040
++#, fuzzy, c-format
++msgid "input_vcd: unable to open %s: %s.\n"
++msgstr "input_net: nie mogę znaleźć IP dla '%s'.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728
++# src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957
++#: src/input/input_vcd.c:1094
++#, fuzzy
++msgid "device used for VCD playback"
++msgstr "urządzenie użyte w trybie mono"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/input/input_vcd.c:1095
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"The path to the device, usually a CD or DVD drive, you intend to play your "
++"VideoCDs with."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr ""
++# src/input/input_http.c:640
++#: src/input/input_rtsp.c:278
++#, fuzzy
++msgid "rtsp streaming input plugin"
++msgstr "wtyczka strumienia standardowego wejścia"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
+-msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
+-msgstr ""
++# src/input/input_rtp.c:339
++#: src/input/input_pvr.c:604
++#, fuzzy, c-format
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
++#: src/input/input_pvr.c:761
++#, c-format
++msgid "input_pvr: error opening pvr file (%s)\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr ""
++# src/input/input_file.c:353
++#: src/input/input_pvr.c:837
++#, fuzzy, c-format
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_file: błąd odczytu (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, c-format
++msgid "input_pvr: error opening device %s\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
+-msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr ""
++# src/input/input_file.c:353
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: błąd odczytu (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
++#: src/input/input_file.c:282
++#, c-format
++msgid "input_file: Permission denied: >%s<\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr ""
++# src/input/input_file.c:353
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: błąd odczytu (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
+-msgstr ""
++#: src/input/input_file.c:510
++msgid "file input plugin"
++msgstr "wtyczka wejścia pliku"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
+-msgstr ""
++#: src/input/input_file.c:872
++msgid "file browsing start location"
++msgstr "miejsce startu nawigatora plików"
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-# src/xine-engine/audio_out.c:868
+-#: src/liba52/xine_decoder.c:780
+-#, fuzzy
+-msgid "A/52 volume"
+-msgstr "głośność dźwięku"
++#: src/input/input_file.c:880
++msgid "list hidden files"
++msgstr "listowanie ukrytych plików"
+
+-#: src/liba52/xine_decoder.c:781
++#: src/input/input_file.c:881
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-# src/liba52/xine_decoder.c:577
+-#: src/liba52/xine_decoder.c:789
+-#, fuzzy
+-msgid "use A/52 dynamic range compression"
+-msgstr "włączanie dynamicznego zakresu kompensacji a/52"
++# src/dxr3/video_out_dxr3.c:153
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
++msgstr "zamiana lini parzystych i nieparzystych"
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-# src/liba52/xine_decoder.c:580
+-#: src/liba52/xine_decoder.c:797
++# src/dxr3/video_out_dxr3.c:156
++#: src/dxr3/video_out_dxr3.c:265
+ #, fuzzy
+-msgid "downmix audio to 2 channel surround stereo"
+-msgstr "włącz redukcję dźwięku do 2.0 surround stereo"
++msgid "add black bars to correct aspect ratio"
++msgstr "dodanie czarnch pasków w celu skorygowania proporcji"
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr ""
++# src/dxr3/video_out_dxr3.c:160
++#: src/dxr3/video_out_dxr3.c:271
++#, fuzzy
++msgid "use smooth play mode for mpeg encoder playback"
++msgstr "dxr3: użyj alternatywnego trybu odtwarzania dla kodera mpeg"
+
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
+-msgstr ""
++# src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
++#: src/dxr3/video_out_dxr3.c:272
++#, fuzzy
++msgid ""
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
++msgstr "włączenie tej opcji użyje wygładzonego trybu odtwarzania"
+
+-#: src/libffmpeg/audio_decoder.c:109
++#: src/dxr3/video_out_dxr3.c:280
+ #, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:149
++#: src/dxr3/video_out_dxr3.c:288
+ #, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr ""
++# src/dxr3/video_out_dxr3.c:221
++#: src/dxr3/video_out_dxr3.c:330
++#, fuzzy
++msgid "encoder for non mpeg content"
++msgstr "koder do zawartości nie-mpeg"
+
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
++#: src/dxr3/video_out_dxr3.c:361
++msgid ""
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++#: src/dxr3/video_out_dxr3.c:367
++msgid ""
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
++# src/dxr3/video_out_dxr3.c:260
++#: src/dxr3/video_out_dxr3.c:382
++#, fuzzy
++msgid "video output mode (TV or overlay)"
++msgstr "dxr3: tryb wyjścia tv (tv lub overlay)"
+
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:383
++msgid ""
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1274
++# src/dxr3/video_out_dxr3.c:287
++#: src/dxr3/video_out_dxr3.c:430
+ #, fuzzy
+-msgid "MPEG-4 postprocessing quality"
+-msgstr "jakość post-przetwarzania ffmpeg mpeg-4"
++msgid "overlay colorkey value"
++msgstr "dxr3: wartość koloru kluczowego dla overlay"
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-# src/dxr3/dxr3_mpeg_encoders.c:182
+-#: src/libffmpeg/xine_encoder.c:164
++# src/dxr3/video_out_dxr3.c:290
++#: src/dxr3/video_out_dxr3.c:435
+ #, fuzzy
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
+-msgstr "dxr3enc: częstotliwość wyjśćia rte mpeg (kbit/s)"
++msgid "overlay colorkey tolerance"
++msgstr "dxr3: zakres koloru kluczowego"
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/video_out_dxr3.c:441
++#, fuzzy
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
++"Obcięcie obszaru overlay z góry i z dołu aby uniknąć wyświetlania zielonych "
++"linii"
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
+-msgstr ""
++# src/dxr3/video_out_dxr3.c:303
++#: src/dxr3/video_out_dxr3.c:456
++#, fuzzy
++msgid "preferred tv mode"
++msgstr "dxr3: wybór trybu tv"
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
+ msgstr ""
+
+-# src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++# src/dxr3/dxr3.h:33
++#: src/dxr3/dxr3.h:32
+ #, fuzzy
+-msgid "path to RealPlayer codecs"
+-msgstr "ścieżka do kodeków dll win32"
++msgid "DXR3 device number"
++msgstr "dxr3: nazwa urządzenia"
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
+ msgstr ""
+
+-# src/libspucc/xine_decoder.c:220
+-#: src/libspucc/xine_decoder.c:192
+-#, fuzzy
+-msgid "display closed captions in MPEG-2 streams"
+-msgstr "włącz closed-caption w strumieniach mpeg-2"
+-
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+
+-# src/libspucc/xine_decoder.c:227
+-#: src/libspucc/xine_decoder.c:200
+-#, fuzzy
+-msgid "closed-captioning foreground/background scheme"
+-msgstr "schemat (tło/napisy) dla closed-caption"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++msgstr ""
+
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
+ msgstr ""
+
+-# src/libspucc/xine_decoder.c:233
+-#: src/libspucc/xine_decoder.c:207
++# src/dxr3/dxr3_mpeg_encoders.c:182
++#: src/dxr3/dxr3_mpeg_encoders.c:189
+ #, fuzzy
+-msgid "standard closed captioning font"
+-msgstr "standardowa czcionka dla closed-caption"
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
++msgid "rte mpeg output bitrate (kbit/s)"
++msgstr "dxr3enc: częstotliwość wyjśćia rte mpeg (kbit/s)"
+
+-# src/libspucc/xine_decoder.c:239
+-#: src/libspucc/xine_decoder.c:214
++# src/dxr3/dxr3_mpeg_encoders.c:183
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ #, fuzzy
+-msgid "italic closed captioning font"
+-msgstr "czcionka italic dla closed-caption"
++msgid ""
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
++msgstr ""
++"częstotliwość jaką biblioteka librte powinna użyć dla trybu kodowania dxr3"
+
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+ msgstr ""
+
+-# src/libspucc/xine_decoder.c:245
+-#: src/libspucc/xine_decoder.c:221
+-#, fuzzy
+-msgid "closed captioning font size"
+-msgstr "rozmiar czcionki closed-caption"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgstr ""
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+ msgstr ""
+
+-# src/libspucc/xine_decoder.c:250
+-#: src/libspucc/xine_decoder.c:226
++# src/dxr3/dxr3_mpeg_encoders.c:389
++#: src/dxr3/dxr3_mpeg_encoders.c:387
+ #, fuzzy
+-msgid "center-adjust closed captions"
+-msgstr "centrowanie closed-caption"
++msgid "fame mpeg encoding quality"
++msgstr "dxr3enc: jakość kodowania fame"
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-# src/libsputext/xine_decoder.c:1078
+-#: src/libspucmml/xine_decoder.c:478
+-#, fuzzy
+-msgid "font for external subtitles"
+-msgstr "fonty dla zewnętrznych napisów"
+-
+-# src/libsputext/xine_decoder.c:1084
+-#: src/libspucmml/xine_decoder.c:484
+-#, fuzzy
+-msgid "subtitle vertical offset (relative window size)"
+-msgstr "pionowe wyrównanie napisów (względny rozmiar okna)"
+-
+-# src/libsputext/xine_decoder.c:1078
+-#: src/libspucmml/xine_decoder.c:530
+-#, fuzzy
+-msgid "encoding of subtitles"
+-msgstr "kodowanie napisów"
+-
+-# src/xine-engine/video_out.c:890
+-#: src/libspudvb/xine_decoder.c:622
++# src/dxr3/dxr3_scr.c:81
++#: src/dxr3/dxr3_scr.c:98
+ #, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+-
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
+-msgstr ""
++msgid "SCR plugin priority"
++msgstr "dxr3: priorytet wtyczki SCR"
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_scr.c:99
+ 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."
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:901
+-msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-# src/libsputext/xine_decoder.c:1084
+-#: src/libsputext/xine_decoder.c:907
+-#, fuzzy
+-msgid "subtitle vertical offset"
+-msgstr "pionowe wyrównanie napisów (względny rozmiar okna)"
+-
+-#: src/libsputext/xine_decoder.c:908
++#: src/dxr3/dxr3_decode_video.c:257
+ msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
+-msgstr ""
+-
+-# src/libsputext/xine_decoder.c:1078
+-#: src/libsputext/xine_decoder.c:914
+-#, fuzzy
+-msgid "font for subtitles"
+-msgstr "fonty dla zewnętrznych napisów"
+-
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-# src/libsputext/xine_decoder.c:1078
+-#: src/libsputext/xine_decoder.c:922
++# src/dxr3/dxr3_decode_video.c:176
++#: src/dxr3/dxr3_decode_video.c:276
+ #, fuzzy
+-msgid "encoding of the subtitles"
+-msgstr "kodowanie napisów"
++msgid "try to sync video every frame"
++msgstr "próbuj synchronizować każdą ramkę"
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
+-msgstr ""
++# src/dxr3/dxr3_decode_video.c:180
++#: src/dxr3/dxr3_decode_video.c:283
++#, fuzzy
++msgid "use smooth play mode"
++msgstr "użyj alternatywnego trybu odtwarzania"
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
+-msgstr ""
++# src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
++msgstr "włączenie tej opcji użyje wygładzonego trybu odtwarzania"
+
+-# src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++# src/dxr3/dxr3_decode_video.c:184
++#: src/dxr3/dxr3_decode_video.c:287
+ #, fuzzy
+-msgid "path to Win32 codecs"
+-msgstr "ścieżka do kodeków dll win32"
++msgid "correct frame durations in broken streams"
++msgstr "korekta czasu trwania ramki w zepsutych strumieniach"
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:595
+-#, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:628
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:696
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgid ""
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:225
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_oss_out.c:737
++msgid ""
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:745
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
+ msgstr ""
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++# src/audio_out/audio_oss_out.c:708
++#: src/audio_out/audio_oss_out.c:800
++#, fuzzy
++msgid "a/v sync method to use by OSS"
+ msgstr ""
++"metoda synchronizacji A/V używana przez OSS, zależy od sterownika/sprzętu"
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
+-msgstr ""
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
+-msgstr ""
++# src/audio_out/audio_esd_out.c:414
++#: src/audio_out/audio_oss_out.c:856
++#, fuzzy
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "opóźnienie wyjścia dźwieku esd (regulacja synchronizacji a/v)"
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
++msgid ""
++"If you experience audio being not in sync with the 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/post/goom/xine_goom.c:219
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+
+-#: src/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/mosaico/switch.c:230
+-msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/post/planar/boxblur.c:103
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
+-msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
+-"\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
+-msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++#: src/audio_out/audio_oss_out.c:1074
++#, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
+-msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++# src/audio_out/audio_oss_out.c:923
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+ msgstr ""
++"wtyczka wyjścia dźwięku xine, używająca urządzeń/sterowników kompatybilnych "
++"z oss"
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#, c-format
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
+ msgstr ""
+
+-#: src/post/planar/pp.c:114
+-msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
+ msgstr ""
+
+-#: src/post/planar/unsharp.c:219
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++# src/audio_out/audio_sun_out.c:748
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
++"wtyczka wyjścia dźwięku xine kompatybilna z urządzeniami/sterownikami sun"
+
+-#: src/video_out/alphablend.c:1768
++# src/audio_out/audio_irixal_out.c:382
++#: src/audio_out/audio_irixal_out.c:385
++#, fuzzy
++msgid "irixal audio output maximum gap length"
++msgstr "maksymalna długość przerwy wyjścia dźwięku irixal w 1/90000s"
++
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-# src/video_out/video_out_aa.c:307
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
++# src/audio_out/audio_irixal_out.c:411
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "wtyczka wyjścia dźwięku xine używająca IRIX libaudio"
+
+-# src/video_out/video_out_aa.c:307
+-#: src/video_out/video_out_caca.c:311
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_none_out.c:223
+ #, fuzzy
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
++msgid "xine dummy audio output plugin"
++msgstr "wtyczka wyjścia dźwięku używająca esound"
+
+-# src/video_out/video_out_directfb.c:569
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr "wtyczka wyjścia obrazu xine używająca biblioteki DirectFB"
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
++msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
+
+-# src/video_out/video_out_vidix.c:869
+-#: src/video_out/video_out_directx.c:1223
+-#, fuzzy
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
++msgstr ""
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+ msgstr ""
+
+-# src/video_out/video_out_fb.c:721
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-#, fuzzy
+-msgid "framebuffer device name"
+-msgstr "urządzenie buforu ramki"
+-
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
++msgid ""
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:932
++#: src/audio_out/audio_alsa_out.c:1327
+ #, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgid "snd_lib_error_set_handler() failed: %d"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:938
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:181 src/audio_out/audio_alsa_out.c:728
++# src/audio_out/audio_alsa_out.c:913 src/audio_out/audio_alsa_out.c:957
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "urządzenie użyte w trybie mono"
+
+-# src/video_out/video_out_fb.c:885
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
++#: src/audio_out/audio_alsa_out.c:1345
++msgid ""
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"xtyczka wyjścia obrazu xine używająca linuxowego urządzenia buforu ramki"
+
+-# src/video_out/video_out_vidix.c:869
+-#: src/video_out/video_out_none.c:277
+-#, fuzzy
+-msgid "xine video output plugin which displays nothing"
+-msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
+-
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:191 src/audio_out/audio_alsa_out.c:920
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "urządzenie użyte w trybie stereo"
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "urządzenie użyte do wyjścia 4-kanałowego"
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
+-msgstr ""
++# src/audio_out/audio_alsa_out.c:221 src/audio_out/audio_alsa_out.c:232
++# src/audio_out/audio_alsa_out.c:941 src/audio_out/audio_alsa_out.c:948
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "urządzenie użyte do wyjścia 5.1-kanałowego"
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-# src/video_out/video_out_xshm.c:1445
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
++#: src/audio_out/audio_alsa_out.c:1383
++msgid ""
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"wtyczka wyjścia obrazu xine używajaca rozszerzenie dzielonej pamięci MIT X"
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1403
++#, fuzzy, c-format
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "osd: zawiodło iconv_open()\n"
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:300
+-#, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:287
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-#, fuzzy
+-msgid "video overlay colour key"
+-msgstr "dxr3: wartość koloru kluczowego dla overlay"
+-
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1483
++# src/audio_out/audio_alsa_out.c:862 src/audio_out/audio_alsa_out.c:1072
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "urządzenie miksera alsa"
++
++#: src/audio_out/audio_alsa_out.c:1551
+ msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
++# src/audio_out/audio_alsa_out.c:1105
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
++"wtyczka wyjścia dźwięku xine używająca sprzętu/sterowników kompatybilnych z "
++"systemem alsa"
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:480
+-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."
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-# src/video_out/video_out_sdl.c:696
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "wtyczka wyjścia obrazu xine używająca Simple Direct Media Layer"
+-
+-# src/video_out/video_out_aa.c:307
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-#, fuzzy
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr "wtyczka wyjścia obrazu xine używająca biblioteki ascii-art"
+-
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-# src/video_out/video_out_syncfb.c:1170
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+-"wtyczka wyjścia obrazu xine używająca modułu SyncFB dla kart Matrox G200/G400"
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:290
+-#: src/video_out/video_out_vidix.c:1129
+-#, fuzzy
+-msgid "video overlay colour key red component"
+-msgstr "dxr3: zakres koloru kluczowego"
+-
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+
+-# src/dxr3/video_out_dxr3.c:290
+-#: src/video_out/video_out_vidix.c:1136
+-#, fuzzy
+-msgid "video overlay colour key green component"
+-msgstr "dxr3: zakres koloru kluczowego"
+-
+-# src/dxr3/video_out_dxr3.c:287
+-#: src/video_out/video_out_vidix.c:1143
+-#, fuzzy
+-msgid "video overlay colour key blue component"
+-msgstr "dxr3: wartość koloru kluczowego dla overlay"
+-
+-# src/video_out/video_out_vidix.c:869
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "wtyczka wyjścia obrazu xine używająca libvidix dla X11"
+-
+-# src/video_out/video_out_fb.c:885
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+-"wtyczka wyjścia obrazu xine używająca libvidix dla linuxowego urządzenia "
+-"buforu ramki"
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:540
++msgid "Unable to create primary direct sound buffer."
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
++#: src/audio_out/audio_directx2_out.c:651
+ #, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
++# src/xine-engine/video_out.c:890
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr ""
++# src/xine-engine/video_out.c:890
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++# src/input/input_rtp.c:339
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++# src/xine-engine/video_out.c:890
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+
+-#: src/video_out/video_out_xv.c:305
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1304
+-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/xine-engine/video_out.c:890
++#: src/audio_out/audio_directx2_out.c:883
++#, fuzzy, c-format
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:943
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++msgid ": unknown control command %d\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-#, fuzzy
+-msgid "autopaint colour key"
+-msgstr "Auto-tworzenie koloru-klucza przez Xv"
+-
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-#, fuzzy
+-msgid "Make Xv autopaint its colorkey."
+-msgstr "Auto-tworzenie koloru-klucza przez Xv"
+-
+-# src/video_out/video_out_xv.c:1408
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_directx2_out.c:996
+ #, fuzzy
+-msgid "bilinear scaling mode"
+-msgstr "tryb skalowania bilinearnego (permedia 2/3)"
++msgid "second xine audio output plugin using directx"
++msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
+-msgstr ""
++# src/audio_out/audio_esd_out.c:414
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "opóźnienie wyjścia dźwieku esd (regulacja synchronizacji a/v)"
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
+-msgstr ""
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
++msgstr "wtyczka wyjścia dźwięku używająca esound"
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
+-msgstr ""
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_coreaudio_out.c:452
++#, fuzzy
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_directx_out.c:827
++#, fuzzy
++msgid "xine audio output plugin for win32 using directx"
++msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
+
+-# src/video_out/video_out_xv.c:1479
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_file_out.c:362
++#, fuzzy
++msgid "xine file audio output plugin"
++msgstr "wtyczka wyjścia dźwięku używająca esound"
+
+-# src/video_out/video_out_xv.c:1479
+-#: src/video_out/video_out_xvmc.c:1652
++# src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
++#: src/audio_out/audio_polyp_out.c:489
+ #, fuzzy
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
++msgid "device used for polypaudio"
++msgstr "urządzenie użyte do wyjścia 4-kanałowego"
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
++# src/audio_out/audio_esd_out.c:441
++#: src/audio_out/audio_polyp_out.c:535
++#, fuzzy
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "wtyczka wyjścia dźwięku używająca esound"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:347
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++msgid "audio_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:611
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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/video_out/video_out_xxmc.c:619
++#: src/xine-engine/video_decoder.c:373
+ #, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgid "video_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/video_decoder.c:447
++#, c-format
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2195
++#: src/xine-engine/video_decoder.c:484
+ 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"
++"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/video_out/video_out_xxmc.c:2204
+-#, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
+-msgstr ""
++#: src/xine-engine/info_helper.c:204
++#, fuzzy
++msgid "info_helper: can't find out current locale character set\n"
++msgstr "osd: nie można znaleźć zestawu znaków dla aktualnej lokalizacji\n"
+
+-#: src/video_out/video_out_xxmc.c:2429
++#: src/xine-engine/info_helper.c:212
++#, fuzzy, c-format
+ msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
+-msgstr ""
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgstr "osd: niewspierana konwersja %s -> UCS-2\n"
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3757,59 +3782,328 @@
+ "video_out: przykro mi, to nie powinno sie zdarzyć.\n"
+ "Proszę ponownie uruchomić xine.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++# src/xine-engine/video_out.c:308
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d ramek dostarczonych, %d ramek pominiętych, %d ramek porzuconych\n"
++
++# src/xine-engine/video_out.c:351
++#: src/xine-engine/video_out.c:739
++#, fuzzy, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
++msgstr "video_out: odrzucam obraz o pts %lld bo jest za stary (diff : %lld).\n"
++
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:893
++#: src/xine-engine/video_out.c:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++"video_out: przykro mi, to nie powinno sie zdarzyć.\n"
++"Proszę ponownie uruchomić xine.\n"
++
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
++msgstr ""
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "osd: nie został zdefiniowany font\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr ""
++
++# src/xine-engine/xine.c:415
++#: src/xine-engine/xine.c:681
++#, fuzzy, c-format
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
++
++# src/xine-engine/xine.c:415
++#: src/xine-engine/xine.c:689
++#, fuzzy, c-format
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
++
++# src/xine-engine/xine.c:415
++#: src/xine-engine/xine.c:707
++#, fuzzy, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
++
++# src/xine-engine/xine.c:471
++#: src/xine-engine/xine.c:733
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine: zawiódł start wybranego demultiplexera %s\n"
++
++# src/input/input_http.c:640
++#: src/xine-engine/xine.c:769
++#, fuzzy
++msgid "xine: join rip input plugin\n"
++msgstr "wtyczka wejścia VCD"
++
++# src/input/input_http.c:640
++#: src/xine-engine/xine.c:774
++#, fuzzy
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "wtyczka wejścia VCD"
++
++# src/xine-engine/xine.c:471
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine: zawiódł start ostatnio próbowanego demultiplexera %s\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:948
++msgid "xine: error opening subtitle mrl\n"
++msgstr ""
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr ""
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1108
++# src/xine-engine/xine.c:436
++#: src/xine-engine/xine.c:1007
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
++
++# src/xine-engine/xine.c:436
++#: src/xine-engine/xine.c:1023
++#, fuzzy, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
++
++# src/xine-engine/xine.c:471
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr "xine: zawiódł start demultiplexera\n"
++
++# src/xine-engine/xine.c:471
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: brak dostępnego demultiplexera\n"
++
++# src/xine-engine/xine.c:471
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: zawiódł start demultiplexera\n"
++
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr ""
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr ""
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
++msgstr ""
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr ""
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++
++# src/xine-engine/xine.c:1025
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "wiadomości"
++
++# src/xine-engine/xine.c:1026
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "wtyczka"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr ""
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgid "font '%s-%d' already loaded, weird.\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-#, fuzzy
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/osd.c:678
++#, c-format
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:901
++#, c-format
++msgid ""
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++"osd: nieznana sekwencja zaczynająca się od bajtu 0x%02X w kodowaniu \"%s\", "
++"pomijanie\n"
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
+ msgstr "osd: nie można znaleźć zestawu znaków dla aktualnej lokalizacji\n"
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/osd.c:967
+ #, fuzzy, c-format
+-msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+ msgstr "osd: niewspierana konwersja %s -> UCS-2\n"
+
+-#: src/xine-engine/input_cache.c:164
+-msgid ": open() function should never be called\n"
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr "osd: nie został zdefiniowany font\n"
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:323
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1234
+ #, fuzzy
+-msgid ": input plugin not defined!\n"
++msgid "osd: error in rendering\n"
+ msgstr "osd: nie został zdefiniowany font\n"
+
++# src/xine-engine/osd.c:863
++#: src/xine-engine/osd.c:1481
++#, fuzzy
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr "paleta użyta przy napisach (tło-napisy-kontur)"
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
++
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, c-format
+ msgid "input_rip: reading of saved data failed: %s\n"
+@@ -3825,7 +4119,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3843,7 +4137,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3881,22 +4175,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -4010,160 +4288,17 @@
+ msgstr "load_plugins: wtyczka %s znaleziona\n"
+
+ # src/xine-engine/load_plugins.c:520
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, fuzzy, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "load_plugins: nie udał się start %s\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-"osd: nieznana sekwencja zaczynająca się od bajtu 0x%02X w kodowaniu \"%s\", "
+-"pomijanie\n"
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr "osd: nie można znaleźć zestawu znaków dla aktualnej lokalizacji\n"
+-
+-#: src/xine-engine/osd.c:963
+-#, fuzzy, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr "osd: niewspierana konwersja %s -> UCS-2\n"
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr "osd: nie został zdefiniowany font\n"
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-#, fuzzy
+-msgid "osd: error in rendering\n"
+-msgstr "osd: nie został zdefiniowany font\n"
+-
+-# src/xine-engine/osd.c:863
+-#: src/xine-engine/osd.c:1421
+-#, fuzzy
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr "paleta użyta przy napisach (tło-napisy-kontur)"
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:308
+-#: src/xine-engine/video_out.c:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d ramek dostarczonych, %d ramek pominiętych, %d ramek porzuconych\n"
+-
+-# src/xine-engine/video_out.c:351
+-#: src/xine-engine/video_out.c:739
+-#, fuzzy, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr "video_out: odrzucam obraz o pts %lld bo jest za stary (diff : %lld).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:893
+-#: src/xine-engine/video_out.c:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-"video_out: przykro mi, to nie powinno sie zdarzyć.\n"
+-"Proszę ponownie uruchomić xine.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr ""
+@@ -4205,210 +4340,296 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
++#: src/libreal/audio_decoder.c:207
++#, c-format
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+ msgstr ""
+
+-# src/xine-engine/xine.c:415
+-#: src/xine-engine/xine.c:667
+-#, fuzzy, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
+-
+-# src/xine-engine/xine.c:415
+-#: src/xine-engine/xine.c:675
+-#, fuzzy, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
+-
+-# src/xine-engine/xine.c:415
+-#: src/xine-engine/xine.c:693
+-#, fuzzy, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
++#: src/libreal/audio_decoder.c:364
++#, c-format
++msgid "libareal: decoder init failed, error code: 0x%x\n"
++msgstr ""
+
+-# src/xine-engine/xine.c:471
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine: zawiódł start wybranego demultiplexera %s\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgstr ""
+
+-# src/input/input_http.c:640
+-#: src/xine-engine/xine.c:755
+-#, fuzzy
+-msgid "xine: join rip input plugin\n"
+-msgstr "wtyczka wejścia VCD"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgstr ""
+
+-# src/input/input_http.c:640
+-#: src/xine-engine/xine.c:760
++# src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+ #, fuzzy
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "wtyczka wejścia VCD"
+-
+-# src/xine-engine/xine.c:471
+-#: src/xine-engine/xine.c:791
+-#, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine: zawiódł start ostatnio próbowanego demultiplexera %s\n"
++msgid "path to RealPlayer codecs"
++msgstr "ścieżka do kodeków dll win32"
+
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-msgid "xine: error opening subtitle mrl\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+ msgstr ""
+
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
+ msgstr ""
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
+ msgstr ""
+
+-# src/xine-engine/xine.c:436
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
+-
+-# src/xine-engine/xine.c:436
+-#: src/xine-engine/xine.c:1009
+-#, fuzzy, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
+-
+-# src/xine-engine/xine.c:471
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine: zawiódł start demultiplexera\n"
+-
+-# src/xine-engine/xine.c:471
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: brak dostępnego demultiplexera\n"
+-
+-# src/xine-engine/xine.c:471
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: zawiódł start demultiplexera\n"
+-
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr ""
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-# src/xine-engine/xine.c:1025
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "wiadomości"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr ""
+
+-# src/xine-engine/xine.c:1026
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "wtyczka"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+ # src/video_out/video_out_opengl.c:1124
+--- ./po/pt_BR.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/pt_BR.po 2005-02-12 22:28:46.000000000 +0000
+@@ -5,8 +5,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib 0.9.13\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2002-01-22 18:31GMT-3\n"
+ "Last-Translator: Marcelo Roberto Jimenez <mroberto@cetuc.puc-rio.br>\n"
+ "Language-Team: Portuguese (Brazilian) <pt_BR@li.org>\n"
+@@ -16,501 +17,1082 @@
+ "X-Generator: KBabel 0.9.5\n"
+ "Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
++#: src/libsputext/demux_sputext.c:1507
++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_decoder.c:900
++msgid "subtitle size"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:901
++msgid ""
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:923
++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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:714
+ #, c-format
+-msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libffmpeg/dvaudio_decoder.c:303
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr ""
++
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
+-#, fuzzy, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "input_cda: open(%s) failed: %s.\n"
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
++msgstr ""
++
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "demux_qt: não consigo criar um novo thread (%s)\n"
++
++#: src/libmusepack/xine_decoder.c:237
++#, c-format
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-#, fuzzy
+-msgid "mono "
+-msgstr "metronom"
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
+ msgstr ""
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-msgid "xine output plugin for Coreaudio/Mac OS X"
++#: src/video_out/video_out_xvmc.c:1797
++msgid ""
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgid "video_out_vidix: using driver: %s by %s\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
+ msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
+-#, fuzzy
+-msgid "xine file audio output plugin"
+-msgstr "http network stream input plugin"
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:385
+-msgid "irixal audio output maximum gap length"
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++msgid "framebuffer device name"
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
+ msgstr ""
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, fuzzy, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:773
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
+-#, fuzzy, c-format
++#: src/video_out/video_out_xxmc.c:651
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
+-msgstr "input_cda: opening server '%s:%d' failed: %s\n"
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:800
+-msgid "a/v sync method to use by OSS"
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2195
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
++"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:2204
++#, c-format
++msgid ""
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
++msgid ""
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:190
++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:206
++#, 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:216
++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:233
++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:1138
++#, c-format
++msgid ""
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:856
+-msgid "OSS audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_fb.c:762
++#, c-format
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_fb.c:949
++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/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:1016
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1074
+-#, fuzzy, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "input_cda: open(%s) failed: %s.\n"
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:489
+-msgid "device used for polypaudio"
++#: src/video_out/video_out_sdl.c:480
++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/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_sdl.c:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
+-msgid "xine audio output plugin using polypaudio sound server"
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr ""
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr ""
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr ""
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, fuzzy, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "input_cda: opening server '%s:%d' failed: %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
++
++#: src/video_out/alphablend.c:1768
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
+-"This setting is security critical, because when changed to a different file, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:468
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, fuzzy, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: copyright : %s\n"
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
++#: src/video_out/video_out_xv.c:1304
++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/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
++#: src/video_out/video_out_xv.c:1313
+ #, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: o índice do avi está quebrado\n"
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, fuzzy, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
+-msgstr "demux_avi: ir para o início do vídeo falhou\n"
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
++
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr ""
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -520,19 +1102,15 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+ #: src/demuxers/demux_mpeg_block.c:296
+@@ -560,6 +1138,29 @@
+ "demux_mpeg_block: aviso: o cabeçalho de pes inidca que este stream pode "
+ "estar encriptado (encryption mode %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:1738
++#, fuzzy, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: copyright : %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:149
++#, fuzzy, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_asf: tipo de audio desconhecido 0x%x\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -592,29 +1193,23 @@
+ "xine developers.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
+ msgstr ""
+
+-#: src/demuxers/demux_snd.c:149
+-#, fuzzy, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_asf: tipo de audio desconhecido 0x%x\n"
+-
+-#: src/demuxers/demux_voc.c:105
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
+ msgstr ""
+
+-#: src/demuxers/demux_voc.c:120
+-#, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
+-msgstr ""
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: o índice do avi está quebrado\n"
++
++#: src/demuxers/demux_avi.c:850
++#, fuzzy, c-format
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
++msgstr "demux_avi: ir para o início do vídeo falhou\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -625,599 +1220,531 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
+-msgstr ""
+-
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:235
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgid "iff-8svx/16sv: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:250
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
+-msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
+-#, fuzzy, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:685
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgid ""
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:696
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
+-msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++#: src/libw32dll/w32codec.c:1216
++#, c-format
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:182
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:201
++#, fuzzy, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:209
++#, fuzzy, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "socket(): %s.\n"
++
++#: src/input/input_rtp.c:216
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr ""
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
+-msgstr ""
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++msgstr "setsockopt(IP_ADD_MEMBERSHIP) falhou (multicast kernel?): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
+-msgstr ""
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "incapaz de resolver '%s'.\n"
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
+-msgstr ""
++#: src/input/input_rtp.c:286
++#, fuzzy, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "incapaz de conectar com '%s'.\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
+-msgstr ""
++#: src/input/input_rtp.c:314
++#, fuzzy, c-format
++msgid "recv(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
+-msgstr ""
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: não consigo criar um novo thread (%s)\n"
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr ""
++#: src/input/input_rtp.c:742
++#, fuzzy
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "net input plugin tal como enviado com xine"
+
+-#: src/dxr3/video_out_dxr3.c:272
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
++#: src/input/mmsh.c:232
++#, fuzzy
++msgid "libmmsh: send error\n"
++msgstr "input_http: read error\n"
++
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "input_http: 3xx redirection not implemented: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, fuzzy, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "input_http: http status not 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
++#: src/input/mmsh.c:298
++#, fuzzy
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "input_http: Location redirection not implemented\n"
++
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
+-msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
++#: src/input/vcd/xineplug_inp_vcd.c:1713
++msgid ""
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-#, fuzzy
+-msgid "video_out_dxr3: setting video mode failed.\n"
+-msgstr "video_out: sigprocmask failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
++msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
+-msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "http: unable to connect to >%s<\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
++msgstr ""
+
+-#: src/input/input_cdda.c:1540
+-#, fuzzy, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cda: server '%s:%d' successfuly connected.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++msgid ""
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
++msgstr ""
+
+-#: src/input/input_cdda.c:1545
+-#, fuzzy, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_net: incapaz de conectar em '%s'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
++msgstr ""
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1754
++msgid ""
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2586
+-msgid "device used for CD audio"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/vcdio.c:217
++#, fuzzy
++msgid "SEEK_CUR not implemented for non-zero offset"
++msgstr "input_vcd: SEEK_CUR not implemented for offset != 0\n"
++
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
+ msgstr ""
+
+-#: src/input/input_dvb.c:834
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr ""
++
++#: src/input/input_dvb.c:838
+ #, fuzzy, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ #, fuzzy
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_vcd: read data failed\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ #, fuzzy
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvd: não consigo abrir o acionador de dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, fuzzy, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvd: não consigo abrir o acionador de dvd >%s<\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: não consigo criar um novo thread (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ #, fuzzy
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "http network stream input plugin"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ #, fuzzy
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ msgid "device used for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1228,22 +1755,22 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1252,44 +1779,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1308,11 +1835,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1326,154 +1853,168 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: erro de leitura (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr ""
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, fuzzy, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_cda: fopen(%s) failed: %s\n"
++msgid "stdin: failed to open '%s'\n"
++msgstr "input_http: failed to open socket\n"
+
+-#: src/input/input_file.c:286
+-#, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: erro de leitura (%s)\n"
++#: src/input/input_stdin_fifo.c:342
++#, fuzzy
++msgid "stdin streaming input plugin"
++msgstr "http network stream input plugin"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr ""
++#: src/input/input_mms.c:424
++#, fuzzy
++msgid "mms streaming input plugin"
++msgstr "http network stream input plugin"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
+ msgstr ""
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
+ msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-#: src/input/input_gnome_vfs.c:218
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr ""
++
++#: src/input/input_pnm.c:266
+ #, fuzzy
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "net input plugin tal como enviado com xine"
++msgid "pnm streaming input plugin"
++msgstr "http network stream input plugin"
+
+-#: src/input/input_http.c:170
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_cda: fopen(%s) failed: %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, fuzzy, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: read error\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr ""
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: invalid http answer\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, fuzzy, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: 3xx redirection not implemented: >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: http status not 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: content length = %Ld bytes\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ #, fuzzy
+ msgid "http input plugin"
+ msgstr "http network stream input plugin"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr ""
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr ""
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-#, fuzzy
+-msgid "mms streaming input plugin"
+-msgstr "http network stream input plugin"
+-
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++#: src/input/librtsp/rtsp.c:507
++#, fuzzy, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "http: unable to connect to >%s<\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++#: src/input/librtsp/rtsp_session.c:84
++#, fuzzy, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "http: unable to connect to >%s<\n"
++
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+
++#: src/input/input_gnome_vfs.c:218
++#, fuzzy
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "net input plugin tal como enviado com xine"
++
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+ msgid "input_net: socket(): %s\n"
+@@ -1484,160 +2025,40 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: incapaz de resolver '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: incapaz de conectar em '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "net input plugin tal como enviado com xine"
+
+-#: src/input/input_pnm.c:266
+-#, fuzzy
+-msgid "pnm streaming input plugin"
+-msgstr "http network stream input plugin"
+-
+-#: src/input/input_pvr.c:604
+-#, fuzzy, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+-
+-#: src/input/input_pvr.c:761
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+-
+-#: src/input/input_pvr.c:837
+-#, fuzzy, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_http: read error (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, fuzzy, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:201
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, fuzzy, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr "setsockopt(IP_ADD_MEMBERSHIP) falhou (multicast kernel?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "incapaz de resolver '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, fuzzy, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "incapaz de conectar com '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, fuzzy, c-format
+-msgid "recv(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: não consigo criar um novo thread (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-#, fuzzy
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "net input plugin tal como enviado com xine"
+-
+-#: src/input/input_rtsp.c:278
+-#, fuzzy
+-msgid "rtsp streaming input plugin"
+-msgstr "http network stream input plugin"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, fuzzy, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "input_http: failed to open socket\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_net: incapaz de conectar em '%s'.\n"
+
+-#: src/input/input_stdin_fifo.c:342
++#: src/input/pnm.c:766
+ #, fuzzy
+-msgid "stdin streaming input plugin"
+-msgstr "http network stream input plugin"
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_http: failed to open socket\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -1681,1726 +2102,1326 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr ""
+
+-#: src/input/input_vcd.c:849
+-#, fuzzy
+-msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+-msgstr "input_vcd: MRL mal formada. Use vcd://<track #>\n"
+-
+-#: src/input/input_vcd.c:855
+-#, c-format
+-msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
+-msgstr "input_vcd: trilha invalida %d (faixa valida: 0 .. %d)\n"
+-
+-#: src/input/input_vcd.c:922
+-#, fuzzy
+-msgid "Video CD input plugin"
+-msgstr "http network stream input plugin"
+-
+-#: src/input/input_vcd.c:964
+-#, c-format
+-msgid "unable to open %s: %s.\n"
+-msgstr "incapaz de abrir %s: %s.\n"
+-
+-#: src/input/input_vcd.c:1040
+-#, fuzzy, c-format
+-msgid "input_vcd: unable to open %s: %s.\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+-
+-#: src/input/input_vcd.c:1094
+-msgid "device used for VCD playback"
+-msgstr ""
+-
+-#: src/input/input_vcd.c:1095
+-msgid ""
+-"The path to the device, usually a CD or DVD drive, you intend to play your "
+-"VideoCDs with."
+-msgstr ""
+-
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr ""
+-
+-#: src/input/mms.c:646
++#: src/input/mms.c:650
+ msgid "Connecting MMS server (over tcp)..."
+ msgstr ""
+
+-#: src/input/mmsh.c:232
+-#, fuzzy
+-msgid "libmmsh: send error\n"
+-msgstr "input_http: read error\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:283
++#: src/input/input_cdda.c:1494
+ #, fuzzy, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "input_http: 3xx redirection not implemented: >%d %s<\n"
++msgid "%s: can't connect to %s:%d\n"
++msgstr "http: unable to connect to >%s<\n"
+
+-#: src/input/mmsh.c:290
++#: src/input/input_cdda.c:1540
+ #, fuzzy, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "input_http: http status not 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-#, fuzzy
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "input_http: Location redirection not implemented\n"
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr ""
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr ""
+-
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr ""
+-
+-#: src/input/pnm.c:617
+-#, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
+-msgstr ""
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cda: server '%s:%d' successfuly connected.\n"
+
+-#: src/input/pnm.c:755
++#: src/input/input_cdda.c:1545
+ #, fuzzy, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+ msgstr "input_net: incapaz de conectar em '%s'.\n"
+
+-#: src/input/pnm.c:766
+-#, fuzzy
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_http: failed to open socket\n"
+-
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp.c:507
+-#, fuzzy, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "http: unable to connect to >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:84
+-#, fuzzy, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "http: unable to connect to >%s<\n"
+-
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
+-
+-#: src/input/vcd/vcdio.c:210
+-#, fuzzy
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr "input_vcd: SEEK_CUR not implemented for offset != 0\n"
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
++#: src/input/input_cdda.c:2586
++msgid "device used for CD audio"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_cdda.c:2615
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
+-msgstr ""
++#: src/input/input_vcd.c:849
++#, fuzzy
++msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
++msgstr "input_vcd: MRL mal formada. Use vcd://<track #>\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
+-msgstr ""
++#: src/input/input_vcd.c:855
++#, c-format
++msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n"
++msgstr "input_vcd: trilha invalida %d (faixa valida: 0 .. %d)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
+-msgstr ""
++#: src/input/input_vcd.c:922
++#, fuzzy
++msgid "Video CD input plugin"
++msgstr "http network stream input plugin"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr ""
++#: src/input/input_vcd.c:964
++#, c-format
++msgid "unable to open %s: %s.\n"
++msgstr "incapaz de abrir %s: %s.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr ""
++#: src/input/input_vcd.c:1040
++#, fuzzy, c-format
++msgid "input_vcd: unable to open %s: %s.\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
++#: src/input/input_vcd.c:1094
++msgid "device used for VCD playback"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/input/input_vcd.c:1095
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"The path to the device, usually a CD or DVD drive, you intend to play your "
++"VideoCDs with."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr ""
++#: src/input/input_rtsp.c:278
++#, fuzzy
++msgid "rtsp streaming input plugin"
++msgstr "http network stream input plugin"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
+-msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
+-msgstr ""
++#: src/input/input_pvr.c:604
++#, fuzzy, c-format
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr ""
++#: src/input/input_pvr.c:761
++#, fuzzy, c-format
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr ""
++#: src/input/input_pvr.c:837
++#, fuzzy, c-format
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_http: read error (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr ""
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, fuzzy, c-format
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
+-msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr ""
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: erro de leitura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
+-msgstr ""
++#: src/input/input_file.c:282
++#, fuzzy, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_cda: fopen(%s) failed: %s\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr ""
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: erro de leitura (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
++#: src/input/input_file.c:510
++msgid "file input plugin"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
++#: src/input/input_file.c:872
++msgid "file browsing start location"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
++#: src/input/input_file.c:880
++msgid "list hidden files"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:781
++#: src/input/input_file.c:881
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:261
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
+-msgstr ""
+-
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
++#: src/dxr3/video_out_dxr3.c:272
++msgid ""
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:280
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:288
++#, fuzzy, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
+ msgstr ""
+
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
++#: src/dxr3/video_out_dxr3.c:361
++msgid ""
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++#: src/dxr3/video_out_dxr3.c:367
++msgid ""
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++#: src/dxr3/video_out_dxr3.c:383
++msgid ""
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:430
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:478
++#, fuzzy
++msgid "video_out_dxr3: setting video mode failed.\n"
++msgstr "video_out: sigprocmask failed.\n"
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
+-msgstr ""
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+ msgstr ""
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "demux_ts: não consigo criar novo thread (%s)\n"
+-
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
+ msgstr ""
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
+-msgstr ""
+-
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:908
+-msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/dxr3/dxr3_decode_video.c:257
++msgid ""
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
++#: src/dxr3/dxr3_decode_video.c:547
++#, fuzzy, c-format
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+
+-#: src/libw32dll/w32codec.c:595
+-#, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:628
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:696
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgid ""
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:225
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_oss_out.c:737
++msgid ""
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:745
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
+ msgstr ""
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, fuzzy, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
+-msgstr ""
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
++msgstr "input_cda: opening server '%s:%d' failed: %s\n"
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:800
++msgid "a/v sync method to use by OSS"
+ msgstr ""
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
+-msgstr ""
+-
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
++#: src/audio_out/audio_oss_out.c:856
++msgid "OSS audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:219
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
++"If you experience audio being not in sync with the 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/post/mosaico/mosaico.c:273
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+
+-#: src/post/mosaico/switch.c:230
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/post/planar/boxblur.c:103
+-msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
+-"\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
+-msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
+-msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++#: src/audio_out/audio_oss_out.c:1074
++#, fuzzy, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "input_cda: open(%s) failed: %s.\n"
++
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#, fuzzy, c-format
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "input_cda: opening server '%s:%d' failed: %s\n"
++
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
+ msgstr ""
+
+-#: src/post/planar/pp.c:114
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/post/planar/unsharp.c:219
+-msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_irixal_out.c:385
++msgid "irixal audio output maximum gap length"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
+ msgstr ""
+
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
+ msgstr ""
+
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
+ msgstr ""
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_alsa_out.c:391
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-msgid "framebuffer device name"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
+ 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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:938
++#: src/audio_out/audio_alsa_out.c:1327
+ #, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++msgid "snd_lib_error_set_handler() failed: %d"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
+-msgstr ""
+-
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:1345
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
+-msgstr ""
+-
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, fuzzy, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
+-
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1373
++msgid ""
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1383
++msgid ""
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:300
++#: src/audio_out/audio_alsa_out.c:1403
+ #, fuzzy, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "input_dvd: incapaz de abrir o acionador de dvd (%s): %s\n"
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "input_cda: open(%s) failed: %s.\n"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1481
++#, fuzzy
++msgid "mono "
++msgstr "metronom"
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:480
++#: src/audio_out/audio_alsa_out.c:1551
+ 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:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-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/audio_out/audio_directx2_out.c:540
++#, fuzzy
++msgid "Unable to create primary direct sound buffer."
++msgstr "incapaz de alocar buffer de entrada.\n"
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
++#: src/audio_out/audio_directx2_out.c:651
+ #, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "video_out : não consigo criar thread (%s)\n"
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "video_out : não consigo criar thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "demux_qt: não consigo criar um novo thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "demux_qt: não consigo criar um novo thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:305
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1304
+-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/audio_out/audio_directx2_out.c:883
++#, fuzzy, c-format
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr "video_out : não consigo criar thread (%s)\n"
+
+-#: src/video_out/video_out_xv.c:1313
++#: src/audio_out/audio_directx2_out.c:943
+ #, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
++msgid ": unknown control command %d\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:996
++#, fuzzy
++msgid "second xine audio output plugin using directx"
++msgstr "http network stream input plugin"
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
++#: src/audio_out/audio_coreaudio_out.c:452
++msgid "xine output plugin for Coreaudio/Mac OS X"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
+-msgstr ""
++#: src/audio_out/audio_file_out.c:362
++#, fuzzy
++msgid "xine file audio output plugin"
++msgstr "http network stream input plugin"
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
++#: src/audio_out/audio_polyp_out.c:489
++msgid "device used for polypaudio"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/audio_out/audio_polyp_out.c:535
++msgid "xine audio output plugin using polypaudio sound server"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
++#: src/xine-engine/audio_decoder.c:347
++#, fuzzy, c-format
++msgid "audio_decoder: no plugin available to handle '%s'\n"
++msgstr "audio decoder plugin achado : %s\n"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_decoder.c:364
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
+-#, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
++#: src/xine-engine/audio_decoder.c:467
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"The number of audio 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/video_out/video_out_xxmc.c:611
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
++#: src/xine-engine/video_decoder.c:373
++#, fuzzy, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
++msgstr "video decoder plugin achado : %s\n"
+
+-#: src/video_out/video_out_xxmc.c:619
++#: src/xine-engine/video_decoder.c:447
+ #, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2195
++#: src/xine-engine/video_decoder.c:484
+ 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"
++"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/video_out/video_out_xxmc.c:2204
+-#, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/configfile.c:1098
++#, c-format
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
++#: src/xine-engine/info_helper.c:204
++msgid "info_helper: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2429
++#: src/xine-engine/info_helper.c:212
++#, c-format
+ msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:347
+-#, fuzzy, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
+-msgstr "audio decoder plugin achado : %s\n"
+-
+-#: src/xine-engine/audio_decoder.c:364
+-#, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3514,57 +3535,312 @@
+ "video_out : desculpe, isto não deveria acontecer, reinicie o xine por "
+ "favor.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "%d quadros enviados, %d quadros pulados, %d quadros descartados\n"
++
++#: src/xine-engine/video_out.c:739
++#, fuzzy, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
++"video_out : descartando imagem com pts %d porque é muito velha (diff : %d > %"
++"d).\n"
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:1780
++#, fuzzy
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++"video_out : desculpe, isto não deveria acontecer, reinicie o xine por "
++"favor.\n"
++
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
++msgstr ""
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "xine: usando plugin de entrada >%s< para este MRL (%s).\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:681
++#, fuzzy, c-format
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: não consigo achar um plugin para este MRL\n"
++
++#: src/xine-engine/xine.c:689
++#, fuzzy, c-format
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: usando plugin de entrada >%s< para este MRL (%s).\n"
++
++#: src/xine-engine/xine.c:707
++#, fuzzy, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: não consigo achar um plugin para este MRL\n"
++
++#: src/xine-engine/xine.c:733
++#, fuzzy, c-format
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine_play: demuxer falhou em começar\n"
++
++#: src/xine-engine/xine.c:769
++#, fuzzy
++msgid "xine: join rip input plugin\n"
++msgstr "http network stream input plugin"
++
++#: src/xine-engine/xine.c:774
++#, fuzzy
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "http network stream input plugin"
++
++#: src/xine-engine/xine.c:805
++#, fuzzy, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine_play: demuxer falhou em começar\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/xine.c:948
++#, fuzzy
++msgid "xine: error opening subtitle mrl\n"
++msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:1007
++#, fuzzy, c-format
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: não conseguí achar o demuxer para >%s<\n"
++
++#: src/xine-engine/xine.c:1023
++#, fuzzy, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: usando o plugin de demuxer >%s< para este MRL.\n"
++
++#: src/xine-engine/xine.c:1043
++#, fuzzy
++msgid "xine: demuxer failed to start\n"
++msgstr "xine_play: demuxer falhou em começar\n"
++
++#: src/xine-engine/xine.c:1106
++#, fuzzy
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: demuxer falhou em começar\n"
++
++#: src/xine-engine/xine.c:1176
++#, fuzzy
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: demuxer falhou em começar\n"
++
++#: src/xine-engine/xine.c:1446
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr ""
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
++msgstr ""
++
++#: src/xine-engine/xine.c:1485
++msgid ""
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
++msgstr ""
++
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr ""
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "menssagens"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "plugin"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr ""
++
++#: src/xine-engine/osd.c:666
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "font '%s-%d' already loaded, weird.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/osd.c:678
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgid "font '%s' loading failed (%d < %d)\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:901
+ #, c-format
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:164
+-msgid ": open() function should never be called\n"
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:323
+-#, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "xine: usando plugin de entrada >%s< para este MRL (%s).\n"
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr ""
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, fuzzy, c-format
+@@ -3579,7 +3855,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3598,7 +3874,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3636,22 +3912,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -3755,157 +4015,19 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: achado o plugin de entrada: %s\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, fuzzy, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr ""
+ "load_plugins: carga do plugin %s falhou:\n"
+ "%s\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, fuzzy, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr "video decoder plugin achado : %s\n"
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "%d quadros enviados, %d quadros pulados, %d quadros descartados\n"
+-
+-#: src/xine-engine/video_out.c:739
+-#, fuzzy, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out : descartando imagem com pts %d porque é muito velha (diff : %d > %"
+-"d).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-#, fuzzy
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-"video_out : desculpe, isto não deveria acontecer, reinicie o xine por "
+-"favor.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr ""
+@@ -3945,200 +4067,294 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
++#: src/libreal/audio_decoder.c:207
++#, c-format
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:667
+-#, fuzzy, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: não consigo achar um plugin para este MRL\n"
+-
+-#: src/xine-engine/xine.c:675
+-#, fuzzy, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: usando plugin de entrada >%s< para este MRL (%s).\n"
+-
+-#: src/xine-engine/xine.c:693
+-#, fuzzy, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: não consigo achar um plugin para este MRL\n"
+-
+-#: src/xine-engine/xine.c:719
+-#, fuzzy, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine_play: demuxer falhou em começar\n"
+-
+-#: src/xine-engine/xine.c:755
+-#, fuzzy
+-msgid "xine: join rip input plugin\n"
+-msgstr "http network stream input plugin"
+-
+-#: src/xine-engine/xine.c:760
+-#, fuzzy
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "http network stream input plugin"
+-
+-#: src/xine-engine/xine.c:791
+-#, fuzzy, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine_play: demuxer falhou em começar\n"
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
++#: src/libreal/audio_decoder.c:364
++#, c-format
++msgid "libareal: decoder init failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
++#: src/libreal/audio_decoder.c:378
++#, c-format
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-#, fuzzy
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:993
+-#, fuzzy, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: não conseguí achar o demuxer para >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1009
+-#, fuzzy, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: usando o plugin de demuxer >%s< para este MRL.\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1029
+-#, fuzzy
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine_play: demuxer falhou em começar\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1090
+-#, fuzzy
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: demuxer falhou em começar\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1160
+-#, fuzzy
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: demuxer falhou em começar\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr ""
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "menssagens"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "plugin"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+ #, fuzzy
+@@ -4172,10 +4388,6 @@
+ #~ msgstr "Abrindo >%s<\n"
+
+ #, fuzzy
+-#~ msgid "video_out: can't create thread (%s)\n"
+-#~ msgstr "video_out : não consigo criar thread (%s)\n"
+-
+-#, fuzzy
+ #~ msgid "demux_wc3movie: encountered unknown chunk: %c%c%c%c\n"
+ #~ msgstr "demux_film: video codec desconhecido >%s<\n"
+
+@@ -4204,9 +4416,6 @@
+ #~ msgid "rtp input plugin as shipped with xine"
+ #~ msgstr "plugin de entrada rtp como mandado com o xine"
+
+-#~ msgid "unable to allocate input buffer.\n"
+-#~ msgstr "incapaz de alocar buffer de entrada.\n"
+-
+ #, fuzzy
+ #~ msgid "demux_mpgaudio: no audio driver!\n"
+ #~ msgstr "demux_mpgaudio_block: stop...ignorado\n"
+@@ -4379,6 +4588,9 @@
+ #~ msgid "demux %u ts_open!\n"
+ #~ msgstr "demux %u ts_open!\n"
+
++#~ msgid "demux_ts: can't create new thread (%s)\n"
++#~ msgstr "demux_ts: não consigo criar novo thread (%s)\n"
++
+ #, fuzzy
+ #~ msgid "demux_mpeg: please specify mpeg(mpeg1/mpeg2) stream type.\n"
+ #~ msgstr "Voce deve especificar mpeg(mpeg1/mpeg2) como tipo de stream.\n"
+@@ -5366,9 +5578,6 @@
+ #~ msgid "demux_qt: unknown audio codec >%s<\n"
+ #~ msgstr "demux_qt: audio codec desconhecido >%s<\n"
+
+-#~ msgid "demux_qt: can't create new thread (%s)\n"
+-#~ msgstr "demux_qt: não consigo criar um novo thread (%s)\n"
+-
+ #~ msgid ""
+ #~ "demux_ogg: beginning of stream\n"
+ #~ "demux_ogg: serial number %d\n"
+--- ./po/sk.po 2005-02-12 22:28:44.000000000 +0000
++++ ./po/sk.po 2005-02-12 22:28:46.000000000 +0000
+@@ -5,8 +5,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xine-lib 1.0\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\n"
+ "PO-Revision-Date: 2004-09-15 13:53+0100\n"
+ "Last-Translator: \n"
+ "Language-Team: Slovak <ski18n@lists.isternet.sk>\n"
+@@ -17,535 +18,1199 @@
+ "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+ "X-Generator: KBabel 1.9\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
+-msgstr "audio_alsa_out:Už otvorené...PREČO!"
++#: src/libsputext/demux_sputext.c:1506
++#, fuzzy
++msgid "default duration of subtitle display in seconds"
++msgstr "Predvolený čas na skrytie titulkov v sekundách"
+
+-#: src/audio_out/audio_alsa_out.c:390
+-#, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+-msgstr "audio_alsa_out: snd_pcm_open() z %s zlyhal: %s\n"
++#: src/libsputext/demux_sputext.c:1507
++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/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+-msgstr "audio_alsa_out: >>> skontrolujte či už iný program používa PCM <<<\n"
++#: src/libsputext/xine_decoder.c:900
++msgid "subtitle size"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
+-#, c-format
++#: src/libsputext/xine_decoder.c:901
+ msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
+ msgstr ""
+-"audio_alsa_out: poškodená konfigurácia pre toto PCM: konfigurácia "
+-"nedostupná: %s\n"
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libsputext/xine_decoder.c:907
++#, fuzzy
++msgid "subtitle vertical offset"
++msgstr "Vertikálny posun titulkov (vzhľadom k velkosti okna)"
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libsputext/xine_decoder.c:914
++#, fuzzy
++msgid "font for subtitles"
++msgstr "Font pre externé titulky"
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:922
++#, fuzzy
++msgid "encoding of the subtitles"
++msgstr "Kódovanie titulkov"
++
++#: src/libsputext/xine_decoder.c:923
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libsputext/xine_decoder.c:931
++#, fuzzy
++msgid "use unscaled OSD if possible"
++msgstr "Použiť OSD bez zmeny mierky, ak je možné"
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
+-msgstr "snd_lib_error_set_handler() zlyhal: %d"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_audio_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr "ffmpeg_audio_dec: nenašiel ffmpeg dekóder pre buf typu 0x%X\n"
++
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n"
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
++
++#: src/libffmpeg/video_decoder.c:153
++#, fuzzy
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n"
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr "ffmpeg_video_dec: priame vykreslovanie zapnuté\n"
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) zlyhal.\n"
++
++#: src/libffmpeg/video_decoder.c:714
++#, c-format
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_video_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
++
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
++msgstr "ffmpeg_video_dec: nenájdený ffmpeg dekóder pre buf typu 0x%X\n"
++
++#: src/libffmpeg/video_decoder.c:1274
++#, fuzzy
++msgid "MPEG-4 postprocessing quality"
++msgstr "kvalita ffmpeg mpeg-4 postspracovania"
++
++#: src/libffmpeg/video_decoder.c:1275
++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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/dvaudio_decoder.c:303
++#, fuzzy, c-format
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
++msgstr "ffmpeg_audio_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
++
++#: src/libffmpeg/xine_encoder.c:164
++#, fuzzy
++msgid "libavcodec mpeg output bitrate (kbit/s)"
++msgstr "Dxr3enc: výstupná rýchlosť libavcodec mpeg (kbit/s)"
++
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
+-msgstr "zariadenie pre mono výstup"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
+-msgstr "zariadenie pre stereo výstup"
++#: src/libffmpeg/xine_encoder.c:180
++#, fuzzy
++msgid "minimum compression"
++msgstr "iff-ilbm: neznáma kompresia: %d\n"
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++#, fuzzy
++msgid "maximum quantizer"
++msgstr "Dxr3enc: Maximálny kvantizér"
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr "POMOC! iba mono audio ovládač?!\n"
++
++#: src/liba52/xine_decoder.c:780
++#, fuzzy
++msgid "A/52 volume"
++msgstr "Hlasitosť"
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
+-msgstr "zariadenie pre 4-kanálový výstup"
++#: src/liba52/xine_decoder.c:789
++#, fuzzy
++msgid "use A/52 dynamic range compression"
++msgstr "povoliť a/52 dynamickú úpravu rozsahu"
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
+-msgstr "zariadenie pre 5.1-kanálový výstup"
++#: src/liba52/xine_decoder.c:797
++#, fuzzy
++msgid "downmix audio to 2 channel surround stereo"
++msgstr "povoliť audio zmiešanie na 2.0 priestorové stereo"
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr ""
++
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr "Testovanie výkonnosti memcpy metód (menej je lepšie):\n"
++
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
++msgstr "libfaad: libfaad faacDecOpen() zlyhal.\n"
++
++#: src/libfaad/xine_decoder.c:99
++#, fuzzy
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
++msgstr "libfaad: libfaad faacDecInit2() zlyhal.\n"
++
++#: src/libfaad/xine_decoder.c:123
++#, fuzzy
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr "libfaad: libfaad faacDecInit() zlyhal.\n"
++
++#: src/libspucmml/xine_decoder.c:478
++#, fuzzy
++msgid "font for external subtitles"
++msgstr "Font pre externé titulky"
++
++#: src/libspucmml/xine_decoder.c:484
++#, fuzzy
++msgid "subtitle vertical offset (relative window size)"
++msgstr "Vertikálny posun titulkov (vzhľadom k velkosti okna)"
++
++#: src/libspucmml/xine_decoder.c:530
++#, fuzzy
++msgid "encoding of subtitles"
++msgstr "Kódovanie titulkov"
++
++#: src/libspudvb/xine_decoder.c:622
++#, fuzzy
++msgid "dvbsub: cannot create timer thread\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
++
++#: src/libmusepack/xine_decoder.c:237
+ #, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
+-msgstr "snd_pcm_open() zlyhal:%d:%s\n"
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
+-msgstr ">>> Skontrolujte či už iný program používa PCM <<<\n"
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:192
++#, fuzzy
++msgid "display closed captions in MPEG-2 streams"
++msgstr "Povoliť skyté titulky v MPEG-2 prúdoch"
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
+-msgstr "audio_alsa_out : podporované módy sú "
++#: src/libspucc/xine_decoder.c:200
++#, fuzzy
++msgid "closed-captioning foreground/background scheme"
++msgstr "Schéma skrytých titulkov popredie/pozadie"
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
+-msgstr "8bit "
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
++#: src/libspucc/xine_decoder.c:207
+ #, fuzzy
+-msgid "16bit "
+-msgstr "8bit "
++msgid "standard closed captioning font"
++msgstr "Štandardný font skrytých titulkov"
+
+-#: src/audio_out/audio_alsa_out.c:1468
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:214
+ #, fuzzy
+-msgid "24bit "
+-msgstr "8bit "
++msgid "italic closed captioning font"
++msgstr "Font kurzívy skrytých titulkov"
+
+-#: src/audio_out/audio_alsa_out.c:1472
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:221
+ #, fuzzy
+-msgid "32bit "
+-msgstr "8bit "
++msgid "closed captioning font size"
++msgstr "Veľkosť fontu skrytých titulkov"
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
+-msgstr "mono "
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
+-msgstr "stereo "
++#: src/libspucc/xine_decoder.c:226
++#, fuzzy
++msgid "center-adjust closed captions"
++msgstr "Prispôsobenie centrovania skrytých titulkov"
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
+-msgstr "4-kanály "
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
+-msgstr "(4-kanály nepovolené v xine konfigu) "
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
++msgstr "výstupný modul xine s použitím DirectFB knižnice."
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
+-msgstr "4.1-kanálov "
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++#, fuzzy
++msgid "video overlay colour key"
++msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
+-msgstr "(4.1-kanálov nepovolené v xine konfigu) "
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
+-msgstr "5-kanálov "
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++#, fuzzy
++msgid "autopaint colour key"
++msgstr "Donútiť Xv automaticky kresliť svojou kľúčovou farbou"
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
+-msgstr "(5-kanálov nepovolené v xine konfigu) "
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++#, fuzzy
++msgid "Make Xv autopaint its colorkey."
++msgstr "Donútiť Xv automaticky kresliť svojou kľúčovou farbou"
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
+-msgstr "5.1-kanálov "
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
+-msgstr "(5.1-kanálov nepovolené v xine konfigu) "
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
+-msgstr "a/52 a DTS pass-through\n"
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+-msgstr "(a/52 a DTS pass-through not enabled in xine config)\n"
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
++msgid ""
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
++msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
+-msgstr "alsa mixovacie zaridenie"
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
++msgstr "výstupný video xine modul použitím XvMC X video rozšírenia"
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
++msgstr "video_out_xvmc: XvMC rozšírenie neprítomné.\n"
++
++#: src/video_out/video_out_xvmc.c:1797
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
+ msgstr ""
++"video_out_xvmc: Xv rozšírenie je prítomné, ale nenašiel som použiteľný yuv12 "
++"port.\n"
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+-"výstupný xine audio plugin používa alsa-compliant audio zariadenia/ovládače"
++"video_out_xvmc: používam Xv port %ld z adaptéru %s\n"
++" pre hardvérovú konverziu farebného priestoru a škálovania\n"
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
+-msgstr "výstupný xine audio plugin používa kde artsd"
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr " idct a akcelerácia kompenzácie pohybu \n"
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-#, fuzzy
+-msgid "xine output plugin for Coreaudio/Mac OS X"
+-msgstr "výstupný xine audio plugin pre win32 používa directx"
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr " iba akcelerácia kompenzácie pohybu\n"
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
+-msgstr "výstupný xine audio plugin pre win32 používa directx"
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr " žiadna XvMC podpora \n"
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+-msgstr "audio_esd_out: pripájanie na ESD server %s: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++msgstr " S Prekrývaním = %d; UnsignedIntra = %d.\n"
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
+-msgstr "audio_esd_out: pripájanie na esd server ...\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
+-#, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+-msgstr "audio_esd_out: nemôžem sa pripojiť na %s ESD server: %s\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
+-msgstr "výstupné oneskorenie esd audia (nastavte odstup a/v)"
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
+-msgstr "výstupný xine audio plugin používa esound"
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
+-msgid "xine file audio output plugin"
+-msgstr "xine file audio output plugin"
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:385
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr "video_out_vidix: karta podporuje yuy2 formát\n"
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr "video_out_vidix: karta podporuje yv12 formát\n"
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr "video_out_vidix: Máte zlú verziu knižnice VIDIX\n"
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr "video_out_vidix: Nemôžem nájsť funkčný VIDIX ovládač\n"
++
++#: src/video_out/video_out_vidix.c:1107
++#, c-format
++msgid "video_out_vidix: using driver: %s by %s\n"
++msgstr "video_out_vidix: používam ovládač: %s od %s\n"
++
++#: src/video_out/video_out_vidix.c:1154
+ #, fuzzy
+-msgid "irixal audio output maximum gap length"
+-msgstr "maximálna dľžka medzery irixal audio výstupu v 1/90000s"
++msgid "video overlay colour key red component"
++msgstr "rozsah kľúčovej farby prekrývánia"
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1161
++#, fuzzy
++msgid "video overlay colour key green component"
++msgstr "rozsah kľúčovej farby prekrývánia"
++
++#: src/video_out/video_out_vidix.c:1168
++#, fuzzy
++msgid "video overlay colour key blue component"
++msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
++
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
++msgstr "výstupný video modul xine použitím libvidix pre x11"
++
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++#, fuzzy
++msgid "framebuffer device name"
++msgstr "zariadenie framebufferu"
++
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
+-msgstr "výstupný xine audio plugin používa IRIX libaudio"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
++msgstr "výstupný video modul xine použitím libvidix pre linux frame buffer"
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
+-msgstr "mĺkvy výstupný xine audio plugin"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: XShape rozšírenie nedostupné. Prekrývanie bez zmien merítka "
++"zakázané.\n"
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: chyba vytvorenia okna. Prekrývanie bez zmien merítka zakázané.\n"
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++"x11osd: chyba vytvorenia mapy bodov. Prekrývanie bez zmien merítka "
++"zakázané.\n"
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
+-msgstr "audio_oss_out: Otváram audio zariadenie %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr "výstupný modul xine s použitím ascii-art knižnice"
++
++#: src/video_out/video_out_pgx64.c:282
++#, fuzzy
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++
++#: src/video_out/video_out_pgx64.c:300
++#, fuzzy, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+-"audio_oss_out: varovanie: vzork. frekvencia %d Hz nepodporovaná, skúšam "
+-"44100 Hz\n"
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+-"audio_oss_out: audio frekv. : %d požadovaná, %d poskytnutá zariadením\n"
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
+-msgstr "názov OSS audio zariadenia"
++#: src/video_out/video_out_pgx64.c:341
++#, fuzzy
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++msgstr ""
++"video_out_pgx64: Varovanie: málo video pamäte, multi-buffering zakázaný\n"
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++#, fuzzy
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++"video_out_pgx64: Varovanie: málo video pamäte, multi-buffering zakázaný\n"
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++"video_out_pgx64: Varovanie: málo video pamäte, dvoj-buffering zakázaný\n"
++
++#: src/video_out/video_out_pgx64.c:1401
+ #, fuzzy
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+-"Špecifikujte zákl. čast mena audio zariadenia, potom použite "
+-"oss_device_number na nastavenie čísla zariadenia. Vyberte auto ak autom. "
+-"hľadať zariadenie."
+
+-#: src/audio_out/audio_oss_out.c:744
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
++msgid ""
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
++msgstr ""
++
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr "výstupný video modul použitím Libstk Surface Set-top Toolkit"
++
++#: src/video_out/video_out_xxmc.c:601
+ #, fuzzy
+-msgid "OSS audio device number, -1 for none"
+-msgstr "názov OSS audio zariadenia"
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: XvShmCreateImage zlyhala\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_xxmc.c:611
+ #, fuzzy
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+-"Názov audio zariadenia je tvorený z oss_device_name a čísla zariadenia "
+-"(napr. /dev/sound/dsp2). Ak nepotrebujete číslo, nastavte na -1 (eg /dev/"
+-"sound/dsp). Rozsah čísla je -1 alebo 0-15."
++"video_out_xv: XvShmCreateImage vrátila nulovú veľkosť\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+-msgstr "audio_oss_out: audio.device.oss_device_name = auto, skúšam devs\n"
++#: src/video_out/video_out_xxmc.c:619
++#, fuzzy, c-format
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: chyba zdielanej pamäte v shmget: %s\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
+-msgstr "audio_oss_out: Automatické hľadanie audio zar. zlyhalo\n"
++#: src/video_out/video_out_xxmc.c:651
++#, fuzzy
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
++"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_oss_out.c:773
+-#, c-format
+-msgid "audio_oss_out: using device >%s<\n"
+-msgstr "audio_oss_out: používam zariadenie >%s<\n"
++#: src/video_out/video_out_xxmc.c:2158
++#, fuzzy
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr "video_out_xvmc: XvMC rozšírenie neprítomné.\n"
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
+-#, c-format
++#: src/video_out/video_out_xxmc.c:2195
++#, fuzzy
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"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 ""
+-"audio_oss_out: zlyhalo otvorenie audio zariadenia %s:\n"
+-"%s\n"
++"video_out_xv: rozšírenie Xv je prítomné, ale nenašiel som použiteľný yuv12 "
++"port.\n"
++" Vyzerá to tak, že vaša grafická karta nepodoruje Xv?!\n"
+
+-#: src/audio_out/audio_oss_out.c:800
++#: src/video_out/video_out_xxmc.c:2204
++#, fuzzy, c-format
++msgid ""
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++"video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
++"farebného priestoru a škálovania.\n"
++
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
+ #, fuzzy
+-msgid "a/v sync method to use by OSS"
+-msgstr "synchronizačná A/V metóda použitá OSS, závisí od ovládača/hardvéru"
++msgid "bilinear scaling mode"
++msgstr "bilinearny škálovací mód (permedia 2/3)"
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"The meaning of the values is as follows:\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2380
++#, fuzzy
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje yv12 formát.\n"
++
++#: src/video_out/video_out_xxmc.c:2385
++#, fuzzy
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n"
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
++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:2421
++msgid "Unichrome cpu save"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2422
++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:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr "výstupný video xine modul použitím MIT X video rozšírenia"
++
++#: src/video_out/video_out_xshm.c:190
++msgid ""
++"video_out_xshm: shared memory error when allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: chyba dielanej pamäte pri alokácii obrazu\n"
++"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
++
++#: src/video_out/video_out_xshm.c:206
++#, c-format
++msgid ""
++"video_out_xshm: %s: allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: %s: alokácia obrazu\n"
++"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
++
++#: src/video_out/video_out_xshm.c:216
++msgid ""
++"video_out_xshm: shared memory error (address error) when allocating image \n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: chyba dielanej pamäte (chyba adresy) pri alokácii obrazu\n"
++"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
++
++#: src/video_out/video_out_xshm.c:233
++msgid ""
++"video_out_xshm: x11 error during shared memory XImage creation\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xshm: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
++"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
++
++#: src/video_out/video_out_xshm.c:1138
++#, c-format
++msgid ""
+ "\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
+ "\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++msgstr ""
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
++"\n"
++"VAROVANIE: aktuálna hĺbka zobrazenia je %d. Pre lepší výkon\n"
++"je doporučená hĺbka 16 bit/bod!\n"
++"\n"
++
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+ msgstr ""
++"video_out_xshm: rozšírenie zdielanej pamäte MIT neprítomné na obrazovke.\n"
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++msgstr "video_out_xshm: váš video mód nebol rozoznaný, prepáčte :-(\n"
++
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+-"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
+-"audio_oss_out: ...budú použité systémové hodiny skut.času pre softvérovú\n"
+-"audio_oss_out: ...preto môžu byť problémy s audio/video synchronizáciou\n"
+
+-#: src/audio_out/audio_oss_out.c:856
+-#, fuzzy
+-msgid "OSS audio output latency (adjust a/v sync)"
+-msgstr "výstupné oneskorenie esd audia (nastavte odstup a/v)"
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr "výstupný video xine modul použitím rozšírenia zdielanej pamäte MIT X"
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_fb.c:762
++#, c-format
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+-"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
+-"audio_oss_out: ...zisťujem veľkosť výst. vyrovn. pamäte: "
++"video_out_fb: sú podporované iba pravé farby truecolor/directcolor (%d).\n"
++" Zkontrolujte 'fbset -i' alebo skúste 'fbset -depth 16'.\n"
+
+-#: src/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++msgstr "video_out_fb: Váš video mód nebol rozpoznaný, prepáčte.\n"
++
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr "video_out_fb: %d video RAM buffere dostupné.\n"
++
++#: src/video_out/video_out_fb.c:938
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+-"%d bytov\n"
+-"audio_oss_out: ...môžu byť problémy s audio/video synchronizáciou\n"
++"WARNING: video_out_fb: Buffere s nulami sú ZAKÁZANÉ lebo je iba %d buffrov\n"
++" k dispozícii, čo je menej neždoporučených %d buffrov. Zníženie\n"
++" rozlíšenia bufferu snímkov môže pomôcť.\n"
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_fb.c:949
++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 ""
++"WARNING: video_out_fb: Buffere s nulami sú ZAKÁZANÉ lebo lebo kernel "
++"ovládač\n"
++" nepodporuje screen panning (používaný pre prepínanie snímkov).\n"
+
+-#: src/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_fb.c:1016
++#, c-format
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
++"WARNING: video_out_fb: terajšia hĺbka zobrazenia je %d. Pre lepší výkon\n"
++" hĺbka 16 bit/bod je doporučená!\n"
++"\n"
+
+-#: src/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
++msgstr ""
++"výstupný xine video modul s použitím Linux kernelového frame buffer "
++"zariadenia"
++
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:480
++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:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr "sdl musí emulovať 16 bitové povrchy, to všetko spomalí.\n"
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr "video_out_sdl: plnoobrazovkový mód NIE JE podporovaný\n"
++
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr "výstupný xine video modul používajúci Simple Direct Media Layer"
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr "výstupný video modul pre win32 použitím directx"
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr "výstupný xine video modul, ktorý nič nezobrazuje"
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr "výstupný video modul použitím Color AsCii Art knižnice"
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
++#, fuzzy, c-format
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++msgstr "video_out_dxr3: Zlyhalo otvorenie video zariadenia %s (%s)\n"
++
++#: src/video_out/video_out_pgx32.c:217
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
+-msgstr "audio_oss_out: open() mixer %s zlyhal: %s\n"
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
+ msgstr ""
+-"výstupný xine audio plugin používa oss-compliant audio zariadenia/ovládače"
+
+-#: src/audio_out/audio_polyp_out.c:489
+-#, fuzzy
+-msgid "device used for polypaudio"
+-msgstr "zariadenie pre cdda mechaniku"
++#: src/video_out/alphablend.c:1768
++msgid ""
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
++msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
++"video_out_xv: XvShmCreateImage zlyhala\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_polyp_out.c:535
+-#, fuzzy
+-msgid "xine audio output plugin using polypaudio sound server"
+-msgstr "výstupný xine audio plugin používa esound"
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: XvShmCreateImage vrátila nulovú veľkosť\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
+-msgstr "audio_sun_out: otvorenie audio zariadenia %s zlyhalo: %s\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: chyba zdielanej pamäte v shmget: %s\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/audio_out/audio_sun_out.c:889
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++"video_out_xv: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
++"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
++
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr "video_out_xv: Xv rozšírenie neprítomné.\n"
++
++#: src/video_out/video_out_xv.c:1304
++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 ""
++"video_out_xv: rozšírenie Xv je prítomné, ale nenašiel som použiteľný yuv12 "
++"port.\n"
++" Vyzerá to tak, že vaša grafická karta nepodoruje Xv?!\n"
++
++#: src/video_out/video_out_xv.c:1313
++#, c-format
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++"video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
++"farebného priestoru a škálovania.\n"
++
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje yv12 formát.\n"
++
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n"
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr "video_out_syncfb: chyba. (YUY2 nepodporovaný vašou video kartou)\n"
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr "video_out_syncfb: chyba. (YV12 nepodporované vašou graf. kartou)\n"
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++"video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:0 (3 roviny))\n"
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++"video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:0 (2 roviny))\n"
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr "video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:2)\n"
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr "video_out_syncfb: info. (SyncFB modul podporuje YUY2)\n"
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr "video_out_syncfb: info. (SyncFB modul podporuje RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++"video_out_syncfb: ruší sa. (SyncFB modul nepodporuje YV12, YUY2 ani RGB565)\n"
++
++#: src/video_out/video_out_syncfb.c:983
++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 ""
++"video_out_syncfb: info. (ovládanie jasu/kontrastu nebude dostupné lebo váš "
++"SyncFB kernel modul vyzerá veľmi zastaraný. Prosím pozrite README.syncfb "
++"kôli ďalším informáciam ako ho aktualizovať.)\n"
++
++#: src/video_out/video_out_syncfb.c:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++"výstupný video modul xine použitím SyncFB modulu pre Matrox G200/G400 karty"
++
++#: src/video_out/video_out_syncfb.c:1073
+ #, fuzzy
+-msgid "Sun audio device name"
++msgid "SyncFB device name"
+ msgstr "názov OSS audio zariadenia"
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/video_out_syncfb.c:1074
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
++"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, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
+ msgstr ""
+-"výstupný xine audio plugin používa sun-compliant audio zariadenia/ovládače"
+
+-#: src/demuxers/demux_asf.c:468
+-#, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
+-msgstr "demux_asf: varovanie: Prúd id=%d je kryptovaný.\n"
+-
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
+-msgstr "Media stream scrambled/encrypted"
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
+-#, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
+-msgstr "demux_asf: Zlá verzia ASX: %s\n"
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
+-msgstr "Obnovujem index..."
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
+-#, fuzzy, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
+-msgstr "demux_avi: neplatný avi blok \"%c%c%c%c\" na poz. %lld\n"
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
+-msgstr "demux_avi: index avi súboru je poškodený\n"
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
+-#, fuzzy, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
+-msgstr "demux_avi: zlyhalo preskočenie videa na nasl. blok (poz. %lld)\n"
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
++msgstr ""
++"stopa ogg: vorbis audio indikovaná, ale hlavička vorbis prúdu nenájdená.\n"
+
+ #: src/demuxers/demux_film.c:188
+ msgid "invalid FILM chunk size\n"
+@@ -555,20 +1220,16 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr "nerozoznaný FILM blok\n"
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr "iff-8svx/16sv: neznáma kompresia: %d\n"
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
+-msgstr "iff-ilbm: neznáma kompresia: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++msgstr "neznámy VOC blok typu (0x%02X); prosím nahlásiť tvorcom xine\n"
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
+-msgstr "iff: neznámy blok: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgstr "neznáma VOC kompresia typu (0x%02X); prosím nahlásiť tvorcom xine\n"
+
+ #: src/demuxers/demux_mpeg_block.c:296
+ #, c-format
+@@ -598,6 +1259,29 @@
+ "demux_mpeg_block: varovanie: hlavička PES indikuje, že tento prúd môže byť "
+ "zašifrovaný (režim šifrovania %d)\n"
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr "demux_asf: varovanie: Prúd id=%d je kryptovaný.\n"
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr "Media stream scrambled/encrypted"
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr "demux_asf: Zlá verzia ASX: %s\n"
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr "demux_snd: zlé parametre hlavičky\n"
++
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr "demux_snd: nepodporovaný typ zvuku: %d\n"
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -635,30 +1319,23 @@
+ "demux_mpeg_pes:Nerozoznaný súkr. prúd 1 0x%02x. Prosím nahláste to tvorcom "
+ "xine.\n"
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-"stopa ogg: vorbis audio indikovaná, ale hlavička vorbis prúdu nenájdená.\n"
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
+-msgstr "demux_snd: zlé parametre hlavičky\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
++msgstr "Obnovujem index..."
+
+-#: src/demuxers/demux_snd.c:149
+-#, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
+-msgstr "demux_snd: nepodporovaný typ zvuku: %d\n"
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
++#, fuzzy, c-format
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
++msgstr "demux_avi: neplatný avi blok \"%c%c%c%c\" na poz. %lld\n"
+
+-#: src/demuxers/demux_voc.c:105
+-#, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+-msgstr "neznámy VOC blok typu (0x%02X); prosím nahlásiť tvorcom xine\n"
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
++msgstr "demux_avi: index avi súboru je poškodený\n"
+
+-#: src/demuxers/demux_voc.c:120
+-#, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
+-msgstr "neznáma VOC kompresia typu (0x%02X); prosím nahlásiť tvorcom xine\n"
++#: src/demuxers/demux_avi.c:850
++#, fuzzy, c-format
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
++msgstr "demux_avi: zlyhalo preskočenie videa na nasl. blok (poz. %lld)\n"
+
+ #: src/demuxers/demux_wc3movie.c:190
+ #, c-format
+@@ -669,637 +1346,548 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr "demux_wc3movie: Bol problém pri nahrávaní blokov palety\n"
+
+-#: src/dxr3/dxr3.h:32
+-#, fuzzy
+-msgid "DXR3 device number"
+-msgstr "Dxr3: Názov zariadenia"
+-
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:235
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+-msgstr "dxr3_decode_spu: Zlyhalo otvorenie zariadenia titulkov %s (%s)\n"
+-
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
+-msgstr "požadované tlačidlo nedostupné\n"
++msgid "iff-8svx/16sv: unknown compression: %d\n"
++msgstr "iff-8svx/16sv: neznáma kompresia: %d\n"
+
+-#: src/dxr3/dxr3_decode_video.c:250
++#: src/demuxers/demux_iff.c:369
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+-msgstr "dxr3_decode_video: Zlyhalo otvorenie riadiaceho zariadenia %s (%s)\n"
+-
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
+-msgstr ""
+-
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+-msgstr ""
++msgid "iff-ilbm: unknown compression: %d\n"
++msgstr "iff-ilbm: neznáma kompresia: %d\n"
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-#, fuzzy
+-msgid "try to sync video every frame"
+-msgstr "Skúsiť zosynchronizovať každý snímok"
++#: src/demuxers/demux_iff.c:570
++#, c-format
++msgid "iff: unknown Chunk: %s\n"
++msgstr "iff: neznámy blok: %s\n"
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
+-msgstr ""
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
++msgstr "bitplane: chyba pri ByteRun1 dekomprimácii\n"
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-#, fuzzy
+-msgid "use smooth play mode"
+-msgstr "Použiť alternatívny Play mód"
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++msgstr "bitplane: Anim Opt 1 nie je podporovaný momentálne\n"
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
+-msgstr "Povolením tejto voľby sa použije hladšie prehrávanie."
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++msgstr "bitplane: Anim Opt 2 nie je podporovaný momentálne\n"
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-#, fuzzy
+-msgid "correct frame durations in broken streams"
+-msgstr "Opraviť trvanie snímku v poškodených prúdoch"
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++msgstr "bitplane: Anim ASCIIJ nie je podporovaný momentálne\n"
+
+-#: src/dxr3/dxr3_decode_video.c:288
+-msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
+-msgstr ""
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
++msgstr "bitplane: Tento anim-typ nie je podporovaný momentálne\n"
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:586
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+-msgstr "dxr3_decode_video: Zlyhalo otvorenie video zariadenia %s (%s)\n"
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
++msgstr "w32codec: ICOpen zlyhal! neznámy kódek %08lx / zlé parametre?\n"
+
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
+-msgstr "dxr3_decode_video: zápis na zariadenie by blokoval. vyprázdňujem\n"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++msgstr "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) zlyhal: Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:619
++#: src/libw32dll/w32codec.c:628
+ #, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
+-msgstr "dxr3_decode_video: zápis na video zariadenie zlyhal (%s)\n"
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++msgstr "w32codec: ICDecompressQuery zlyhal: Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:639
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+-msgstr "dxr3_decode_video: WARNING: neznámy kód rýchlosti snímkov %d\n"
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgstr "w32codec: ICDecompressBegin zlyhal: Chyba %ld\n"
+
+-#: src/dxr3/dxr3_decode_video.c:762
++#: src/libw32dll/w32codec.c:685
++#, c-format
+ msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"dxr3_decode_video: VAROVANIE: korigujem snímk. rýchlosť z PAL na NTSC\n"
+-
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
+-msgstr "dxr3_mpeg_encoder: init librte zlyhal\n"
++"w32codec: DS_VideoDecoder zlyhal! neznámy kódek %08lx / zlé parametre?\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
++#: src/libw32dll/w32codec.c:696
++#, c-format
+ msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+-"dxr3_mpeg_encoder: rte pracuje iba s rozmermi videa, ktoré sú násobkami 16\n"
++"w32codec: DMO_VideoDecoder zlyhal! neznámy kódek %08lx / zlé parametre?\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+-msgstr "dxr3_mpeg_encoder: zlyhalo získanie rte kontextu.\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
++msgstr "w32codec: dekóder zlyhal pri štarte. Je '%s' nainštalovaný?\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
+-msgstr "dxr3_mpeg_encoder: nemohol vytvoriť kodec.\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++msgstr "w32codec: (ACM_Decoder) Neadekvátny audio formát\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-#, fuzzy
+-msgid "rte mpeg output bitrate (kbit/s)"
+-msgstr "Dxr3enc: rte mpeg výstupná rýchlosť (kbit/s)"
++#: src/libw32dll/w32codec.c:1216
++#, c-format
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++msgstr "w32codec: (ACM_Decoder) acmStreamOpen chyba %d\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
++msgstr "w32codec: Chyba inicializácie DirectShow zvuku\n"
++
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
++msgstr "w32codec: Chyba inicializácie DMO zvuku\n"
++
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+ #, fuzzy
++msgid "path to Win32 codecs"
++msgstr "cesta k win32 dll kódekom"
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+-"Bitová rýchlosť, ktorú má mpeg kód. knižnica librte použiť pre dxr3 kódovací "
+-"mód"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:182
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+-msgstr "dxr3_mpeg_encoder: nedá sa inicializovat kontext: %s\n"
++msgid "socket(): %s.\n"
++msgstr "socket(): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
+-#, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+-msgstr "dxr3_mpeg_encoder: nemožno začať kódovanie: %s\n"
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
++msgstr "Špecifikovaná IP adresa je multicast\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+-msgstr "dxr3_mpeg_encoder: Nešlo naštartovať FAME knižnicu\n"
++#: src/input/input_rtp.c:201
++#, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
++msgstr "setsockopt(SO_RCVBUF): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-#, fuzzy
+-msgid "fame mpeg encoding quality"
+-msgstr "Dxr3enc: kvalita mpeg kódovania snímku"
++#: src/input/input_rtp.c:209
++#, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
++msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
+-msgstr ""
++#: src/input/input_rtp.c:216
++#, c-format
++msgid "bind(): %s.\n"
++msgstr "bind(): %s.\n"
+
+-#: src/dxr3/dxr3_scr.c:98
+-#, fuzzy
+-msgid "SCR plugin priority"
+-msgstr "Dxr3: priorita SCR modulu"
++#: src/input/input_rtp.c:236
++#, c-format
++msgid "Can't find address for iface %s:%s\n"
++msgstr "Nemôžem nájsť adresu rozhrania %s:%s\n"
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+ msgstr ""
++"zlyhala funkcia setsockopt(IP_ADD_MEMBERSHIG) (kernel s podporou "
++"multicastingu?): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
+-msgstr "prehodiť párne a nepárne riadky"
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
++msgstr "nemožno zistiť adresu '%s'.\n"
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
+-msgstr ""
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
++msgstr "nemožno sa naviazať k '%s'.\n"
+
+-#: src/dxr3/video_out_dxr3.c:265
+-#, fuzzy
+-msgid "add black bars to correct aspect ratio"
+-msgstr "Pridať čierne pruhy na korekciu pomeru obrazu"
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
++msgstr "recv(): %s.\n"
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
+-msgstr ""
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
++msgstr "RTP: zastavujem čítacie vlákno...\n"
+
+-#: src/dxr3/video_out_dxr3.c:271
+-#, fuzzy
+-msgid "use smooth play mode for mpeg encoder playback"
+-msgstr "dxr3: použije alternatívny mód pre prehratie mpeg kódovania"
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
++msgstr "RTP: čítacie vlákno ukončené\n"
+
+-#: src/dxr3/video_out_dxr3.c:272
+-#, fuzzy
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
+-msgstr "Povolením tejto voľby sa použije hladšie prehrávanie."
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
++msgstr "Otváranie >súbor:%s port:%d rozhranie:%s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/input_rtp.c:637
+ #, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+-msgstr "video_out_dxr3: Zlyhalo otvorenie ovládacieho zariadenia %s (%s)\n"
++msgid "input_rtp: can't create new thread (%s)\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
++msgstr "modul vstupu zo siete protokolom RTP a UDP dodávaný s xine"
++
++#: src/input/mmsh.c:232
++msgid "libmmsh: send error\n"
++msgstr "libmmsh: chyba posielania\n"
++
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
++msgstr "libmmsh: zlý formát odpovede\n"
++
++#: src/input/mmsh.c:283
+ #, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+-msgstr "video_out_dxr3: Zlyhalo otvorenie video zariadenia %s (%s)\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgstr "libmmsh: presmerovanie 3xx nie je implementované: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:330
+-#, fuzzy
+-msgid "encoder for non mpeg content"
+-msgstr "kóder pre nie mpeg obsah"
++#: src/input/mmsh.c:290
++#, c-format
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
++msgstr "libmmsh: stav http nie je 2xx: >%d %s<\n"
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
+-msgstr ""
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
++msgstr "libmmsh: Presmerovanie umiestnenia nie je implementované\n"
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+-msgstr "video_out_dxr3: Mpeg kóder libavcodec nešiel spustiť.\n"
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
++msgstr "Pripájanie na MMS server (cez http)..."
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+-msgstr "video_out_dxr3: Mpeg kóder rte nešiel spustiť.\n"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
++msgstr "neplatné url\n"
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+-msgstr "video_out_dxr3: Mpeg kóder fame nešiel spustiť.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
++msgstr "nepodporovaný protokol\n"
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: Mpeg kódovanie zakázané.\n"
+-"video_out_dxr3: to je v poriadku, nepotrebujetie to na mpeg video ako DVD, "
+-"ale\n"
+-"video_out_dxr3:nebudete schopní prehrať nie-mpeg obsah použitím tohto video "
+-"výstupného\n"
+-"video_out_dxr3: ovládača. Pozrite README.dxr3 pre detaily konfigurácie "
+-"kódera.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
++msgstr "zlyhalo hľadanie zariadenia s VCD"
+
+-#: src/dxr3/video_out_dxr3.c:367
+-msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
+-msgstr ""
+-"video_out_dxr3: Neskompilovaný mpeg kóder.\n"
+-"video_out_dxr3: to je v poriadku, nepotrebujetie to na mpeg video ako DVD, "
+-"ale\n"
+-"video_out_dxr3:nebudete schopní prehrať nie-mpeg obsah použitím tohto video "
+-"výstupného\n"
+-"video_out_dxr3: ovládača. Pozrite README.dxr3 pre detaily konfigurácie "
+-"kódera.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
++msgstr "bol poslaný parameter neznámej triedy"
+
+-#: src/dxr3/video_out_dxr3.c:382
+-#, fuzzy
+-msgid "video output mode (TV or overlay)"
+-msgstr "Dxr3: video výst. mód (tv alebo overlay)"
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
++msgstr "Neplatný typ aktuálnej položky"
+
+-#: src/dxr3/video_out_dxr3.c:383
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
+-msgstr ""
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
++msgstr "Video CD modul s PBC a podporou pre: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+
+-#: src/dxr3/video_out_dxr3.c:430
++#: src/input/vcd/xineplug_inp_vcd.c:1074
+ #, fuzzy
+-msgid "overlay colorkey value"
+-msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
++msgid "selection has no RETURN entry"
++msgstr "výber nemá ďaľšiu položku"
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
++#: src/input/vcd/xineplug_inp_vcd.c:1107
+ #, fuzzy
+-msgid "overlay colorkey tolerance"
+-msgstr "rozsah kľúčovej farby prekrývánia"
+-
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
+-msgstr ""
++msgid "selection has no NEXT entry"
++msgstr "výber nemá ďaľšiu položku"
+
+-#: src/dxr3/video_out_dxr3.c:441
++#: src/input/vcd/xineplug_inp_vcd.c:1115
+ #, fuzzy
+-msgid "crop the overlay area at top and bottom"
+-msgstr "Orezať prekrývanú oblasť zhora a zdola na zamedzenie zelených riadkov"
++msgid "selection has no PREVIOUS entry"
++msgstr "výber nemá ďaľšiu položku"
+
+-#: src/dxr3/video_out_dxr3.c:442
+-msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
+-msgstr ""
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
++msgstr "Udalosť neznámeho typu: "
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+-msgstr "video_out_dxr3: prosím spustite autocal, prekrývanie zakázané\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
++msgstr "Vyššie uvedená správa má neznámu log. úroveň vcdimageru"
+
+-#: src/dxr3/video_out_dxr3.c:456
+-#, fuzzy
+-msgid "preferred tv mode"
+-msgstr "dxr3 preferovaný tv mód"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
++msgstr "predvolený typ, ktorý sa použije na automat. prehratie VCD"
+
+-#: src/dxr3/video_out_dxr3.c:456
++#: src/input/vcd/xineplug_inp_vcd.c:1702
++#, fuzzy
+ msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
++"Jednotka prehrávania, ktorú použiť, keď nie je uvedená v MRL, napr. vcd:// "
++"alebo vcd:///dev/dvd:"
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
+-msgstr "video_out_dxr3: nastavenie video módu zlyhalo.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
++msgstr "predvolené CD zariadenie použité pre VCD, pokiaľ nie je žiadne zadané"
+
+-#: src/dxr3/video_out_dxr3.c:708
++#: src/input/vcd/xineplug_inp_vcd.c:1713
++#, fuzzy
+ msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
+-msgstr ""
+-"video_out_dxr3: Potrebujete mpeg kóder na prehratie nie-mpeg videa na dxr3\n"
+-"video_out_dxr3: Čítajte README.dxr3 kôli detailom.\n"
+-
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+-"video_out_dxr3: CHYBA Čítania init súboru prekrývania. Spustite autocal!\n"
++"Čo použiť ak nie je mechanika zadaná. Ak je zadané nič, xine preskenuje CD "
++"mechaniky."
+
+-#: src/input/input_cdda.c:1494
+-#, fuzzy, c-format
+-msgid "%s: can't connect to %s:%d\n"
+-msgstr "rtsp: nemožno sa pripojiť k '%s'\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
++msgstr "rozsah ukazovateľa pozície"
+
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+-msgstr "input_cdda: úspešne pripojenie na cddb server '%s:%d'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
++msgstr "Rozsah ukazovateľa pozície prehrávania použitého pri prehrávaní."
+
+-#: src/input/input_cdda.c:1545
+-#, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+-msgstr "input_cdda: nemožno sa pripojiť na cddb server '%s:%d' (%s).\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
++msgstr "Použijeme kešovanie predčítaním?"
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
+-msgstr "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
++msgstr "Na slabších strojoch by mohlo viesť k trhanému prehrávaniu"
+
+-#: src/input/input_cdda.c:2586
++#: src/input/vcd/xineplug_inp_vcd.c:1743
+ #, fuzzy
+-msgid "device used for CD audio"
+-msgstr "zariadenie pre cdda mechaniku"
++msgid "automatically advance track/entry"
++msgstr "Automaticky postupovať po stopách/položkách?"
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++#, fuzzy
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
++"Ak je povolené, mali by sme automaticky postúpiť na ďaľšiu položku alebo "
++"stopu. Použité iba ak nie je zapnutá kontola prehrávania (PBC)."
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
+-msgstr ""
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++#, fuzzy
++msgid "show 'rejected' LIDs"
++msgstr "Zobraziť 'odmietnuté' LID?"
+
+-#: src/input/input_cdda.c:2593
++#: src/input/vcd/xineplug_inp_vcd.c:1754
+ msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-#, fuzzy
+-msgid "CDDB server name"
+-msgstr "cddbp meno servera"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
++msgstr "formát reťazca pre nápis na obrazovke"
+
+-#: src/input/input_cdda.c:2601
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
++#, fuzzy
+ msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
++"Formát použitý v titulku GUI. Podobá sa zadaniu unixového dátumu. "
++"Špecifikátory formátu začínaju znakom percento. Špecifikátory sú %A, %C, %c, "
++"%F, %I, %L, %N, %P, %p, %S, %T, %V, %v, and %%."
+
+-#: src/input/input_cdda.c:2609
+-#, fuzzy
+-msgid "CDDB server port"
+-msgstr "cddbp port servra"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
++msgstr "formátovací reťazec pre pole komentáru prúdu dát"
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
++msgstr "debugovacia maska príznakov"
++
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
++#: src/input/vcd/vcdio.c:217
+ #, fuzzy
+-msgid "CDDB cache directory"
+-msgstr "cddbp cache adresár"
++msgid "SEEK_CUR not implemented for non-zero offset"
++msgstr "SEEK_CUR neimplementované pre nenulové offsety"
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
+-msgstr ""
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
++msgstr "SEEK_END neimplementované zatiaľ."
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
+-msgstr ""
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
++msgstr "skok neimplementovaný zatiaľ pre"
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
+-msgstr ""
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
++msgstr "zlý typ položky"
+
+-#: src/input/input_dvb.c:834
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
++msgstr "zlé číslo záznamu"
++
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
++msgstr "zlé číslo segmentu"
++
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
++msgstr "Chyba pri získavaní aktuálneho čísla segmentu"
++
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
++msgstr "Vyššie uvedené by malo byť prevedené"
++
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr "input_dvd: Zariadenie %s zlyhalo pri otvorení počas volania eject\n"
++
++#: src/input/input_dvb.c:838
+ #, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr "input_dvb: tuner_set_channel zlyhal\n"
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr "input_dvb: nemožno otvoriť dvb zariadenie\n"
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, fuzzy, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, fuzzy, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr "input_dvb: nemožno otvoriť dvr zariadenie '%s'\n"
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ #, fuzzy
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr "DVB (Digital TV) vstupný modul"
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr "input_dvd: Chyba pri získavaní ďaľšieho bloku z DVD (%s)\n"
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr "input_dvd: Nemožno otvoriť DVD zariadenie\n"
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ #, fuzzy
+ msgid "device used for DVD playback"
+ msgstr "zariadenie pre mono výstup"
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1310,23 +1898,23 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ #, fuzzy
+ msgid "path to the title key cache"
+ msgstr "cesta k video zariadeniu v4l"
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1335,45 +1923,45 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ #, fuzzy
+ msgid "read-ahead caching"
+ msgstr "Použijeme kešovanie predčítaním?"
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1392,11 +1980,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1410,158 +1998,171 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
+-#, c-format
+-msgid "input_file: read error (%s)\n"
+-msgstr "input_file: chyba pri čítaní (%s)\n"
+-
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:161
+ #, fuzzy, c-format
+-msgid "input_file: Permission denied: >%s<\n"
+-msgstr "input_rip: skok zlyhal: %s\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
++msgstr "stdin: nemôžem skočiť späť! (%lld > %lld)\n"
+
+-#: src/input/input_file.c:286
+-#, fuzzy, c-format
+-msgid "input_file: File not found: >%s<\n"
+-msgstr "input_file: chyba pri čítaní (%s)\n"
++#: src/input/input_stdin_fifo.c:249
++#, c-format
++msgid "stdin: failed to open '%s'\n"
++msgstr "stdin: nemožno otvoriť '%s'\n"
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
+-msgstr "modul vstupu zo súboru"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
++msgstr "modul vstupu zo štandard. vstupu"
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
+-msgstr "začiatočné miesto prehliadania súborov"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
++msgstr "modul vstupu zo siete protokolom mms"
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:456
++#, fuzzy
++msgid "network bandwidth"
++msgstr "Sieťové prenosové pásmo"
++
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
+-msgstr "zobraziť skryté súbory"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
++msgstr "MMS protokol"
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
++#, fuzzy
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
++"Vyberte protokol nad MMS. TCP je lepšie, ale možno budete potrebovať HTTP za "
++"firewall-om."
+
+-#: src/input/input_gnome_vfs.c:218
+-msgid "gnome-vfs input plugin as shipped with xine"
+-msgstr "modul vstupu gnome-vfs dodávaný so xine"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
++msgstr "Buffering..."
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr "modul vstupu z prúdu pnm"
++
++#: src/input/input_http.c:174
+ #, fuzzy, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr "input_rip: skok zlyhal: %s\n"
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr "input_http: chyba pri čítaní %d\n"
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr "Pripájam sa na HTTP server..."
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr "input_http: neplatná odpoveď http\n"
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr "input_http: presmerovanie 3xx: >%d %s<\n"
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr "input_http: stav http nie je 2xx: >%d %s<\n"
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, fuzzy, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr "input_http: dĺžka obsahu = %Ld bajtov\n"
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr "modul vstupu zo siete protokolom http"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ #, fuzzy
+ msgid "HTTP proxy host"
+ msgstr "adresa http proxy"
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ #, fuzzy
+ msgid "HTTP proxy port"
+ msgstr "port http proxy"
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ #, fuzzy
+ msgid "HTTP proxy username"
+ msgstr "meno používateľa pre http proxy"
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ #, fuzzy
+ msgid "HTTP proxy password"
+ msgstr "heslo pre http proxy"
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
+-msgstr "modul vstupu zo siete protokolom mms"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
++msgstr "rtsp: zlé mrl: %s\n"
+
+-#: src/input/input_mms.c:456
+-#, fuzzy
+-msgid "network bandwidth"
+-msgstr "Sieťové prenosové pásmo"
++#: src/input/librtsp/rtsp.c:507
++#, c-format
++msgid "rtsp: failed to connect to '%s'\n"
++msgstr "rtsp: nemožno sa pripojiť k '%s'\n"
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
+-msgstr ""
++#: src/input/librtsp/rtsp_session.c:84
++#, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
++msgstr "rtsp_session: nemožno sa pripojiť k servru %s\n"
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
+-msgstr "MMS protokol"
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
++msgstr "rtsp_session: nemožno zaviesť reláciu\n"
+
+-#: src/input/input_mms.c:467
+-#, fuzzy
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+ msgstr ""
+-"Vyberte protokol nad MMS. TCP je lepšie, ale možno budete potrebovať HTTP za "
+-"firewall-om."
++"rtsp_session: rtsp server typu '%s' nie je zatiaľ podporovaný. prepáčte.\n"
++
++#: src/input/input_gnome_vfs.c:218
++msgid "gnome-vfs input plugin as shipped with xine"
++msgstr "modul vstupu gnome-vfs dodávaný so xine"
+
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+ #, c-format
+@@ -1573,158 +2174,41 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr "input_net: connect(): %s\n"
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr "input_net: nemožno zistiť adresu '%s'.\n"
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr "input_net: nemožno sa pripojiť k '%s'.\n"
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr "modul vstupu zo siete dodávaný so xine"
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr "modul vstupu z prúdu pnm"
+-
+-#: src/input/input_pvr.c:604
+-#, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr "input_pvr: nedá sa vytvoriť pvr súbor (%s)\n"
+-
+-#: src/input/input_pvr.c:761
+-#, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
+-msgstr "input_pvr: nedá sa otvoriť pvr súbor (%s)\n"
+-
+-#: src/input/input_pvr.c:837
+-#, c-format
+-msgid "input_pvr: read error (%s)\n"
+-msgstr "input_pvr: chyba pri čítaní (%s)\n"
+-
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+-#, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr "input_pvr: nemožno otvoriť zariadenie %s\n"
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: IVTV_IOC_G_CODEC zlyhal, možno sa API zmenilo?\n"
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+-msgstr "input_pvr: IVTV_IOC_S_CODEC zlyhal, možno sa API zmenilo?\n"
+-
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
+-msgstr "modul vstupu z WinTV-PVR 250/350"
+-
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+-msgstr "zariadenie použité pre WinTV-PVR 250/350 (pvr modul)"
+-
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
+-msgstr ""
+-
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
+-msgstr "socket(): %s.\n"
+-
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
+-msgstr "Špecifikovaná IP adresa je multicast\n"
+-
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
+-msgstr "setsockopt(SO_RCVBUF): %s.\n"
+-
+-#: src/input/input_rtp.c:209
+-#, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
+-msgstr "setsockopt(SO_REUSEADDR): %s.\n"
+-
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
+-msgstr "bind(): %s.\n"
+-
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
+-msgstr "Nemôžem nájsť adresu rozhrania %s:%s\n"
+-
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+-msgstr ""
+-"zlyhala funkcia setsockopt(IP_ADD_MEMBERSHIG) (kernel s podporou "
+-"multicastingu?): %s.\n"
+-
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
+-msgstr "nemožno zistiť adresu '%s'.\n"
+-
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
+-msgstr "nemožno sa naviazať k '%s'.\n"
+-
+-#: src/input/input_rtp.c:314
+-#, c-format
+-msgid "recv(): %s.\n"
+-msgstr "recv(): %s.\n"
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr "RTP: zastavujem čítacie vlákno...\n"
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
+-msgstr "RTP: čítacie vlákno ukončené\n"
+-
+-#: src/input/input_rtp.c:620
+-#, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
+-msgstr "Otváranie >súbor:%s port:%d rozhranie:%s<\n"
+-
+-#: src/input/input_rtp.c:637
+-#, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+-
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr "modul vstupu zo siete protokolom RTP a UDP dodávaný s xine"
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr "modul vstupu zo siete protokolom rtsp"
+-
+ #: src/input/input_smb.c:145
+ msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
+-#, fuzzy, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
+-msgstr "stdin: nemôžem skočiť späť! (%lld > %lld)\n"
++#: src/input/pnm.c:617
++#, c-format
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
++msgstr ""
++"input_pnm: získaná spáva od servra počas čítania prúdu:\n"
++"%s\n"
+
+-#: src/input/input_stdin_fifo.c:249
++#: src/input/pnm.c:755
+ #, c-format
+-msgid "stdin: failed to open '%s'\n"
+-msgstr "stdin: nemožno otvoriť '%s'\n"
++msgid "input_pnm: failed to connect '%s'\n"
++msgstr "input_pnm: nemožno sa pripojiť k '%s'\n"
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
+-msgstr "modul vstupu zo štandard. vstupu"
++#: src/input/pnm.c:766
++msgid "input_pnm: failed to set up stream\n"
++msgstr "input_pnm: zlyhalo nastavenie prúdu dát\n"
+
+ #: src/input/input_v4l.c:378
+ msgid "Buffer underrun..."
+@@ -1770,6 +2254,101 @@
+ msgid "The path to your Video4Linux radio device."
+ msgstr "cesta k rádio zariadeniu v4l"
+
++#: src/input/mms.c:650
++msgid "Connecting MMS server (over tcp)..."
++msgstr "Pripájanie k MMS serveru (cez tcp)..."
++
++#: src/input/input_cdda.c:1494
++#, fuzzy, c-format
++msgid "%s: can't connect to %s:%d\n"
++msgstr "rtsp: nemožno sa pripojiť k '%s'\n"
++
++#: src/input/input_cdda.c:1540
++#, c-format
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++msgstr "input_cdda: úspešne pripojenie na cddb server '%s:%d'.\n"
++
++#: src/input/input_cdda.c:1545
++#, c-format
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++msgstr "input_cdda: nemožno sa pripojiť na cddb server '%s:%d' (%s).\n"
++
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
++msgstr "CD Digital Audio (aka. CDDA)"
++
++#: src/input/input_cdda.c:2586
++#, fuzzy
++msgid "device used for CD audio"
++msgstr "zariadenie pre cdda mechaniku"
++
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
++msgstr ""
++
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
++msgstr ""
++
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
++msgstr ""
++
++#: src/input/input_cdda.c:2601
++#, fuzzy
++msgid "CDDB server name"
++msgstr "cddbp meno servera"
++
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
++msgstr ""
++
++#: src/input/input_cdda.c:2609
++#, fuzzy
++msgid "CDDB server port"
++msgstr "cddbp port servra"
++
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
++msgstr ""
++
++#: src/input/input_cdda.c:2615
++#, fuzzy
++msgid "CDDB cache directory"
++msgstr "cddbp cache adresár"
++
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
++msgstr ""
++
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
++msgstr ""
++
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
++msgstr ""
++
+ #: src/input/input_vcd.c:849
+ msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n"
+ msgstr "input_vcd: neplatné MRL. Použite vcdo:/<číslo stopy>\n"
+@@ -1804,1985 +2383,1274 @@
+ "VideoCDs with."
+ msgstr ""
+
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr "input_dvd: Zariadenie %s zlyhalo pri otvorení počas volania eject\n"
+-
+-#: src/input/mms.c:646
+-msgid "Connecting MMS server (over tcp)..."
+-msgstr "Pripájanie k MMS serveru (cez tcp)..."
+-
+-#: src/input/mmsh.c:232
+-msgid "libmmsh: send error\n"
+-msgstr "libmmsh: chyba posielania\n"
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
+-msgstr "libmmsh: zlý formát odpovede\n"
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
++msgstr "modul vstupu zo siete protokolom rtsp"
+
+-#: src/input/mmsh.c:283
++#: src/input/input_pvr.c:604
+ #, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+-msgstr "libmmsh: presmerovanie 3xx nie je implementované: >%d %s<\n"
++msgid "input_pvr: error creating pvr file (%s)\n"
++msgstr "input_pvr: nedá sa vytvoriť pvr súbor (%s)\n"
+
+-#: src/input/mmsh.c:290
++#: src/input/input_pvr.c:761
+ #, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr "libmmsh: stav http nie je 2xx: >%d %s<\n"
+-
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr "libmmsh: Presmerovanie umiestnenia nie je implementované\n"
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
+-msgstr "Pripájanie na MMS server (cez http)..."
+-
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
+-msgstr "neplatné url\n"
+-
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
+-msgstr "nepodporovaný protokol\n"
+-
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
+-msgstr "Buffering..."
++msgid "input_pvr: error opening pvr file (%s)\n"
++msgstr "input_pvr: nedá sa otvoriť pvr súbor (%s)\n"
+
+-#: src/input/pnm.c:617
++#: src/input/input_pvr.c:837
+ #, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
+-msgstr ""
+-"input_pnm: získaná spáva od servra počas čítania prúdu:\n"
+-"%s\n"
++msgid "input_pvr: read error (%s)\n"
++msgstr "input_pvr: chyba pri čítaní (%s)\n"
+
+-#: src/input/pnm.c:755
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
+ #, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
+-msgstr "input_pnm: nemožno sa pripojiť k '%s'\n"
+-
+-#: src/input/pnm.c:766
+-msgid "input_pnm: failed to set up stream\n"
+-msgstr "input_pnm: zlyhalo nastavenie prúdu dát\n"
++msgid "input_pvr: error opening device %s\n"
++msgstr "input_pvr: nemožno otvoriť zariadenie %s\n"
+
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
+-msgstr "rtsp: zlé mrl: %s\n"
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: IVTV_IOC_G_CODEC zlyhal, možno sa API zmenilo?\n"
+
+-#: src/input/librtsp/rtsp.c:507
+-#, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
+-msgstr "rtsp: nemožno sa pripojiť k '%s'\n"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
++msgstr "input_pvr: IVTV_IOC_S_CODEC zlyhal, možno sa API zmenilo?\n"
+
+-#: src/input/librtsp/rtsp_session.c:84
+-#, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr "rtsp_session: nemožno sa pripojiť k servru %s\n"
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
++msgstr "modul vstupu z WinTV-PVR 250/350"
+
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
+-msgstr "rtsp_session: nemožno zaviesť reláciu\n"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
++msgstr "zariadenie použité pre WinTV-PVR 250/350 (pvr modul)"
+
+-#: src/input/librtsp/rtsp_session.c:135
+-#, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+-"rtsp_session: rtsp server typu '%s' nie je zatiaľ podporovaný. prepáčte.\n"
+-
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
+-msgstr "SEEK_CUR neimplementované pre nenulové offsety"
+-
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
+-msgstr "SEEK_END neimplementované zatiaľ."
+-
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
+-msgstr "skok neimplementovaný zatiaľ pre"
+-
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
+-msgstr "zlý typ položky"
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
+-msgstr "zlé číslo záznamu"
++#: src/input/input_file.c:127
++#, c-format
++msgid "input_file: read error (%s)\n"
++msgstr "input_file: chyba pri čítaní (%s)\n"
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
+-msgstr "zlé číslo segmentu"
++#: src/input/input_file.c:282
++#, fuzzy, c-format
++msgid "input_file: Permission denied: >%s<\n"
++msgstr "input_rip: skok zlyhal: %s\n"
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
+-msgstr "Chyba pri získavaní aktuálneho čísla segmentu"
++#: src/input/input_file.c:286
++#, fuzzy, c-format
++msgid "input_file: File not found: >%s<\n"
++msgstr "input_file: chyba pri čítaní (%s)\n"
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
+-msgstr "Vyššie uvedené by malo byť prevedené"
++#: src/input/input_file.c:510
++msgid "file input plugin"
++msgstr "modul vstupu zo súboru"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
+-msgstr "zlyhalo hľadanie zariadenia s VCD"
++#: src/input/input_file.c:872
++msgid "file browsing start location"
++msgstr "začiatočné miesto prehliadania súborov"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
+-msgstr "bol poslaný parameter neznámej triedy"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
++msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
+-msgstr "Neplatný typ aktuálnej položky"
++#: src/input/input_file.c:880
++msgid "list hidden files"
++msgstr "zobraziť skryté súbory"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/input/input_file.c:881
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-msgstr "Video CD modul s PBC a podporou pre: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-#, fuzzy
+-msgid "selection has no RETURN entry"
+-msgstr "výber nemá ďaľšiu položku"
+-
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-#, fuzzy
+-msgid "selection has no DEFAULT entry"
+-msgstr "výber nemá ďaľšiu položku"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
++msgstr "prehodiť párne a nepárne riadky"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-#, fuzzy
+-msgid "selection has no NEXT entry"
+-msgstr "výber nemá ďaľšiu položku"
++#: src/dxr3/video_out_dxr3.c:261
++msgid ""
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
++msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
++#: src/dxr3/video_out_dxr3.c:265
+ #, fuzzy
+-msgid "selection has no PREVIOUS entry"
+-msgstr "výber nemá ďaľšiu položku"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
+-msgstr "Udalosť neznámeho typu: "
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
+-msgstr "Vyššie uvedená správa má neznámu log. úroveň vcdimageru"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
+-msgstr "predvolený typ, ktorý sa použije na automat. prehratie VCD"
++msgid "add black bars to correct aspect ratio"
++msgstr "Pridať čierne pruhy na korekciu pomeru obrazu"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
+-#, fuzzy
++#: src/dxr3/video_out_dxr3.c:266
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+-"Jednotka prehrávania, ktorú použiť, keď nie je uvedená v MRL, napr. vcd:// "
+-"alebo vcd:///dev/dvd:"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
+-msgstr "predvolené CD zariadenie použité pre VCD, pokiaľ nie je žiadne zadané"
++#: src/dxr3/video_out_dxr3.c:271
++#, fuzzy
++msgid "use smooth play mode for mpeg encoder playback"
++msgstr "dxr3: použije alternatívny mód pre prehratie mpeg kódovania"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
++#: src/dxr3/video_out_dxr3.c:272
+ #, fuzzy
+ msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
+-msgstr ""
+-"Čo použiť ak nie je mechanika zadaná. Ak je zadané nič, xine preskenuje CD "
+-"mechaniky."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
+-msgstr "rozsah ukazovateľa pozície"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
+-msgstr "Rozsah ukazovateľa pozície prehrávania použitého pri prehrávaní."
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
++msgstr "Povolením tejto voľby sa použije hladšie prehrávanie."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
+-msgstr "Použijeme kešovanie predčítaním?"
++#: src/dxr3/video_out_dxr3.c:280
++#, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgstr "video_out_dxr3: Zlyhalo otvorenie ovládacieho zariadenia %s (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
+-msgstr "Na slabších strojoch by mohlo viesť k trhanému prehrávaniu"
++#: src/dxr3/video_out_dxr3.c:288
++#, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgstr "video_out_dxr3: Zlyhalo otvorenie video zariadenia %s (%s)\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
++#: src/dxr3/video_out_dxr3.c:330
+ #, fuzzy
+-msgid "automatically advance track/entry"
+-msgstr "Automaticky postupovať po stopách/položkách?"
++msgid "encoder for non mpeg content"
++msgstr "kóder pre nie mpeg obsah"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
+-#, fuzzy
++#: src/dxr3/video_out_dxr3.c:331
+ msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+-"Ak je povolené, mali by sme automaticky postúpiť na ďaľšiu položku alebo "
+-"stopu. Použité iba ak nie je zapnutá kontola prehrávania (PBC)."
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-#, fuzzy
+-msgid "show 'rejected' LIDs"
+-msgstr "Zobraziť 'odmietnuté' LID?"
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++msgstr "video_out_dxr3: Mpeg kóder libavcodec nešiel spustiť.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
+-msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++msgstr "video_out_dxr3: Mpeg kóder rte nešiel spustiť.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
+-msgstr "formát reťazca pre nápis na obrazovke"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++msgstr "video_out_dxr3: Mpeg kóder fame nešiel spustiť.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-#, fuzzy
++#: src/dxr3/video_out_dxr3.c:361
+ msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+-"Formát použitý v titulku GUI. Podobá sa zadaniu unixového dátumu. "
+-"Špecifikátory formátu začínaju znakom percento. Špecifikátory sú %A, %C, %c, "
+-"%F, %I, %L, %N, %P, %p, %S, %T, %V, %v, and %%."
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
+-msgstr "formátovací reťazec pre pole komentáru prúdu dát"
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
+-msgstr "debugovacia maska príznakov"
++"video_out_dxr3: Mpeg kódovanie zakázané.\n"
++"video_out_dxr3: to je v poriadku, nepotrebujetie to na mpeg video ako DVD, "
++"ale\n"
++"video_out_dxr3:nebudete schopní prehrať nie-mpeg obsah použitím tohto video "
++"výstupného\n"
++"video_out_dxr3: ovládača. Pozrite README.dxr3 pre detaily konfigurácie "
++"kódera.\n"
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
++#: src/dxr3/video_out_dxr3.c:367
++msgid ""
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
++"video_out_dxr3: Neskompilovaný mpeg kóder.\n"
++"video_out_dxr3: to je v poriadku, nepotrebujetie to na mpeg video ako DVD, "
++"ale\n"
++"video_out_dxr3:nebudete schopní prehrať nie-mpeg obsah použitím tohto video "
++"výstupného\n"
++"video_out_dxr3: ovládača. Pozrite README.dxr3 pre detaily konfigurácie "
++"kódera.\n"
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
+-msgstr "POMOC! iba mono audio ovládač?!\n"
+-
+-#: src/liba52/xine_decoder.c:780
++#: src/dxr3/video_out_dxr3.c:382
+ #, fuzzy
+-msgid "A/52 volume"
+-msgstr "Hlasitosť"
++msgid "video output mode (TV or overlay)"
++msgstr "Dxr3: video výst. mód (tv alebo overlay)"
+
+-#: src/liba52/xine_decoder.c:781
++#: src/dxr3/video_out_dxr3.c:383
+ msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:789
++#: src/dxr3/video_out_dxr3.c:430
+ #, fuzzy
+-msgid "use A/52 dynamic range compression"
+-msgstr "povoliť a/52 dynamickú úpravu rozsahu"
++msgid "overlay colorkey value"
++msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/video_out_dxr3.c:430
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:797
++#: src/dxr3/video_out_dxr3.c:435
+ #, fuzzy
+-msgid "downmix audio to 2 channel surround stereo"
+-msgstr "povoliť audio zmiešanie na 2.0 priestorové stereo"
++msgid "overlay colorkey tolerance"
++msgstr "rozsah kľúčovej farby prekrývánia"
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
+-msgstr "libfaad: libfaad faacDecOpen() zlyhal.\n"
+-
+-#: src/libfaad/xine_decoder.c:99
+-#, fuzzy
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
+-msgstr "libfaad: libfaad faacDecInit2() zlyhal.\n"
+-
+-#: src/libfaad/xine_decoder.c:123
+-#, fuzzy
+-msgid "libfaad: libfaad faacDecInit failed.\n"
+-msgstr "libfaad: libfaad faacDecInit() zlyhal.\n"
+-
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_audio_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
+-
+-#: src/libffmpeg/audio_decoder.c:149
+-#, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr "ffmpeg_audio_dec: nenašiel ffmpeg dekóder pre buf typu 0x%X\n"
+-
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n"
+-
+-#: src/libffmpeg/dvaudio_decoder.c:303
+-#, fuzzy, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_audio_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
+-
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
+-
+-#: src/libffmpeg/video_decoder.c:153
+-#, fuzzy
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+-msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
+-
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
+-msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n"
+-
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
+-msgstr "ffmpeg_video_dec: priame vykreslovanie zapnuté\n"
+-
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
+-msgstr "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) zlyhal.\n"
+-
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+-msgstr "ffmpeg_video_dec: zväčšujem buffer na %d aby sa predišlo pretečeniu.\n"
+-
+-#: src/libffmpeg/video_decoder.c:758
+-#, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr "ffmpeg_video_dec: nenájdený ffmpeg dekóder pre buf typu 0x%X\n"
+-
+-#: src/libffmpeg/video_decoder.c:1274
++#: src/dxr3/video_out_dxr3.c:441
+ #, fuzzy
+-msgid "MPEG-4 postprocessing quality"
+-msgstr "kvalita ffmpeg mpeg-4 postspracovania"
++msgid "crop the overlay area at top and bottom"
++msgstr "Orezať prekrývanú oblasť zhora a zdola na zamedzenie zelených riadkov"
+
+-#: src/libffmpeg/video_decoder.c:1275
++#: src/dxr3/video_out_dxr3.c:442
+ 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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++msgstr "video_out_dxr3: prosím spustite autocal, prekrývanie zakázané\n"
++
++#: src/dxr3/video_out_dxr3.c:456
+ #, fuzzy
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
+-msgstr "Dxr3enc: výstupná rýchlosť libavcodec mpeg (kbit/s)"
++msgid "preferred tv mode"
++msgstr "dxr3 preferovaný tv mód"
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/video_out_dxr3.c:456
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
+-msgstr ""
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
++msgstr "video_out_dxr3: nastavenie video módu zlyhalo.\n"
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/video_out_dxr3.c:708
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
+-msgstr ""
+-
+-#: src/libffmpeg/xine_encoder.c:180
+-#, fuzzy
+-msgid "minimum compression"
+-msgstr "iff-ilbm: neznáma kompresia: %d\n"
+-
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
++"video_out_dxr3: Potrebujete mpeg kóder na prehratie nie-mpeg videa na dxr3\n"
++"video_out_dxr3: Čítajte README.dxr3 kôli detailom.\n"
+
+-#: src/libffmpeg/xine_encoder.c:186
+-#, fuzzy
+-msgid "maximum quantizer"
+-msgstr "Dxr3enc: Maximálny kvantizér"
+-
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
++"video_out_dxr3: CHYBA Čítania init súboru prekrývania. Spustite autocal!\n"
+
+-#: src/libreal/audio_decoder.c:207
+-#, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+-msgstr "libareal: (audio) Nedajú sa zistiť symboly - nekompatibilná dll: %s\n"
+-
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
+-msgstr "libareal: decoder init zlyhal, kód chyby: 0x%x\n"
+-
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_spu.c:253
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+-msgstr "libareal: chutné nastavenie dekódera zlyhalo, kód chyby: 0x%x\n"
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgstr "dxr3_decode_spu: Zlyhalo otvorenie zariadenia titulkov %s (%s)\n"
+
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
+-msgstr "libareal: ach, real môže mať viac ako 2 kanály ?\n"
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
++msgstr "požadované tlačidlo nedostupné\n"
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++#: src/dxr3/dxr3.h:32
+ #, fuzzy
+-msgid "path to RealPlayer codecs"
+-msgstr "cesta k real player kódekom, ak sú nainštalované"
++msgid "DXR3 device number"
++msgstr "Dxr3: Názov zariadenia"
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+-msgstr "libreal: Chyba hľadania symbolov! (nekompatibilita verzii?)\n"
+-
+-#: src/libspucc/xine_decoder.c:192
+-#, fuzzy
+-msgid "display closed captions in MPEG-2 streams"
+-msgstr "Povoliť skyté titulky v MPEG-2 prúdoch"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
++msgstr "dxr3_mpeg_encoder: init librte zlyhal\n"
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:200
+-#, fuzzy
+-msgid "closed-captioning foreground/background scheme"
+-msgstr "Schéma skrytých titulkov popredie/pozadie"
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:207
+-#, fuzzy
+-msgid "standard closed captioning font"
+-msgstr "Štandardný font skrytých titulkov"
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
++"dxr3_mpeg_encoder: rte pracuje iba s rozmermi videa, ktoré sú násobkami 16\n"
+
+-#: src/libspucc/xine_decoder.c:214
+-#, fuzzy
+-msgid "italic closed captioning font"
+-msgstr "Font kurzívy skrytých titulkov"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++msgstr "dxr3_mpeg_encoder: zlyhalo získanie rte kontextu.\n"
+
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
+-msgstr ""
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
++msgstr "dxr3_mpeg_encoder: nemohol vytvoriť kodec.\n"
+
+-#: src/libspucc/xine_decoder.c:221
++#: src/dxr3/dxr3_mpeg_encoders.c:189
+ #, fuzzy
+-msgid "closed captioning font size"
+-msgstr "Veľkosť fontu skrytých titulkov"
+-
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
+-msgstr ""
++msgid "rte mpeg output bitrate (kbit/s)"
++msgstr "Dxr3enc: rte mpeg výstupná rýchlosť (kbit/s)"
+
+-#: src/libspucc/xine_decoder.c:226
++#: src/dxr3/dxr3_mpeg_encoders.c:190
+ #, fuzzy
+-msgid "center-adjust closed captions"
+-msgstr "Prispôsobenie centrovania skrytých titulkov"
+-
+-#: src/libspucc/xine_decoder.c:227
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
++"Bitová rýchlosť, ktorú má mpeg kód. knižnica librte použiť pre dxr3 kódovací "
++"mód"
+
+-#: src/libspucmml/xine_decoder.c:478
+-#, fuzzy
+-msgid "font for external subtitles"
+-msgstr "Font pre externé titulky"
+-
+-#: src/libspucmml/xine_decoder.c:484
+-#, fuzzy
+-msgid "subtitle vertical offset (relative window size)"
+-msgstr "Vertikálny posun titulkov (vzhľadom k velkosti okna)"
++#: src/dxr3/dxr3_mpeg_encoders.c:234
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgstr "dxr3_mpeg_encoder: nedá sa inicializovat kontext: %s\n"
+
+-#: src/libspucmml/xine_decoder.c:530
+-#, fuzzy
+-msgid "encoding of subtitles"
+-msgstr "Kódovanie titulkov"
++#: src/dxr3/dxr3_mpeg_encoders.c:242
++#, c-format
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgstr "dxr3_mpeg_encoder: nemožno začať kódovanie: %s\n"
+
+-#: src/libspudvb/xine_decoder.c:622
+-#, fuzzy
+-msgid "dvbsub: cannot create timer thread\n"
+-msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++msgstr "dxr3_mpeg_encoder: Nešlo naštartovať FAME knižnicu\n"
+
+-#: src/libsputext/demux_sputext.c:1506
++#: src/dxr3/dxr3_mpeg_encoders.c:387
+ #, fuzzy
+-msgid "default duration of subtitle display in seconds"
+-msgstr "Predvolený čas na skrytie titulkov v sekundách"
++msgid "fame mpeg encoding quality"
++msgstr "Dxr3enc: kvalita mpeg kódovania snímku"
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/dxr3/dxr3_mpeg_encoders.c:388
+ 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."
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
+-msgstr ""
++#: src/dxr3/dxr3_scr.c:98
++#, fuzzy
++msgid "SCR plugin priority"
++msgstr "Dxr3: priorita SCR modulu"
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/dxr3/dxr3_scr.c:99
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:907
+-#, fuzzy
+-msgid "subtitle vertical offset"
+-msgstr "Vertikálny posun titulkov (vzhľadom k velkosti okna)"
++#: src/dxr3/dxr3_decode_video.c:250
++#, c-format
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++msgstr "dxr3_decode_video: Zlyhalo otvorenie riadiaceho zariadenia %s (%s)\n"
+
+-#: src/libsputext/xine_decoder.c:908
+-msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:914
+-#, fuzzy
+-msgid "font for subtitles"
+-msgstr "Font pre externé titulky"
+-
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/dxr3/dxr3_decode_video.c:257
++msgid ""
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:922
++#: src/dxr3/dxr3_decode_video.c:276
+ #, fuzzy
+-msgid "encoding of the subtitles"
+-msgstr "Kódovanie titulkov"
++msgid "try to sync video every frame"
++msgstr "Skúsiť zosynchronizovať každý snímok"
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/dxr3/dxr3_decode_video.c:277
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
++#: src/dxr3/dxr3_decode_video.c:283
+ #, fuzzy
+-msgid "use unscaled OSD if possible"
+-msgstr "Použiť OSD bez zmeny mierky, ak je možné"
++msgid "use smooth play mode"
++msgstr "Použiť alternatívny Play mód"
+
+-#: src/libsputext/xine_decoder.c:932
+-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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
+-msgstr ""
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
++msgstr "Povolením tejto voľby sa použije hladšie prehrávanie."
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/dxr3/dxr3_decode_video.c:287
+ #, fuzzy
+-msgid "path to Win32 codecs"
+-msgstr "cesta k win32 dll kódekom"
++msgid "correct frame durations in broken streams"
++msgstr "Opraviť trvanie snímku v poškodených prúdoch"
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/dxr3/dxr3_decode_video.c:288
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr "w32codec: ICOpen zlyhal! neznámy kódek %08lx / zlé parametre?\n"
+-
+-#: src/libw32dll/w32codec.c:595
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+-msgstr "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) zlyhal: Chyba %ld\n"
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgstr "dxr3_decode_video: Zlyhalo otvorenie video zariadenia %s (%s)\n"
+
+-#: src/libw32dll/w32codec.c:628
+-#, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+-msgstr "w32codec: ICDecompressQuery zlyhal: Chyba %ld\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
++msgstr "dxr3_decode_video: zápis na zariadenie by blokoval. vyprázdňujem\n"
+
+-#: src/libw32dll/w32codec.c:639
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+-msgstr "w32codec: ICDecompressBegin zlyhal: Chyba %ld\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
++msgstr "dxr3_decode_video: zápis na video zariadenie zlyhal (%s)\n"
+
+-#: src/libw32dll/w32codec.c:685
++#: src/dxr3/dxr3_decode_video.c:734
+ #, c-format
+-msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
+-"w32codec: DS_VideoDecoder zlyhal! neznámy kódek %08lx / zlé parametre?\n"
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgstr "dxr3_decode_video: WARNING: neznámy kód rýchlosti snímkov %d\n"
+
+-#: src/libw32dll/w32codec.c:696
+-#, c-format
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+-"w32codec: DMO_VideoDecoder zlyhal! neznámy kódek %08lx / zlé parametre?\n"
++"dxr3_decode_video: VAROVANIE: korigujem snímk. rýchlosť z PAL na NTSC\n"
+
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#: src/audio_out/audio_oss_out.c:191
+ #, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+-msgstr "w32codec: dekóder zlyhal pri štarte. Je '%s' nainštalovaný?\n"
+-
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+-msgstr "w32codec: (ACM_Decoder) Neadekvátny audio formát\n"
++msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgstr "audio_oss_out: Otváram audio zariadenie %s: %s\n"
+
+-#: src/libw32dll/w32codec.c:1216
++#: src/audio_out/audio_oss_out.c:213
+ #, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+-msgstr "w32codec: (ACM_Decoder) acmStreamOpen chyba %d\n"
+-
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
+-msgstr "w32codec: Chyba inicializácie DirectShow zvuku\n"
+-
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
+-msgstr "w32codec: Chyba inicializácie DMO zvuku\n"
+-
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
+-msgstr "bitplane: chyba pri ByteRun1 dekomprimácii\n"
+-
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+-msgstr "bitplane: Anim Opt 1 nie je podporovaný momentálne\n"
+-
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+-msgstr "bitplane: Anim Opt 2 nie je podporovaný momentálne\n"
+-
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+-msgstr "bitplane: Anim ASCIIJ nie je podporovaný momentálne\n"
+-
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
+-msgstr "bitplane: Tento anim-typ nie je podporovaný momentálne\n"
+-
+-#: src/post/audio/stretch.c:264
+-msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
+-msgstr ""
+-
+-#: src/post/audio/upmix.c:137
+ msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
++"audio_oss_out: varovanie: vzork. frekvencia %d Hz nepodporovaná, skúšam "
++"44100 Hz\n"
+
+-#: src/post/deinterlace/xine_plugin.c:200
+-msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
+-"\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
+-"\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
+-"\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
+-"\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
+-"\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
++#: src/audio_out/audio_oss_out.c:225
++#, c-format
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+-"Pokročilý tvtime/odprekladací modul s detekcoiu pulldown\n"
+-"Tento modul má za cieľ poskytnúť mechanizmy korekcie prekladania "
+-"porovnateľné s vysoko kvalitnými progresívnymi DVD prehrávačmi a takzvanými "
+-"zdvojovačmi riadkov, pre použitie s po monitormi, projektormi a inými "
+-"progresívnymi zobrazovacími zariadeniami.\n"
+-"\n"
+-"Parametre\n"
+-"\n"
+-" Method: Vybrať metódu/algoritmus na použitie, pozrite nižšie na "
+-"vysvetlenie metód.\n"
+-"\n"
+-" Enabled: Zapnutý/vypnutý modul.\n"
+-"\n"
+-" Pulldown: Vybrať detekčný 2-3 pulldown algoritmus. 24 snimk./s filmy ktoré "
+-"boli konvertované na NTSC môžu byť konvertované a rekonštruované do "
+-"originálnych (neprekladaných) snímkov.\n"
+-"\n"
+-" Framerate_mode: Vybraním 'full' bude odprekladané každého polsnímku do "
+-"unikátneho snímku pre televíznu a vyššiu kvalitu. Táto možnosť efektívne "
+-"zdvojnásobi rýchl.snímkov a vylepší plynulosť. Dodajme, že, hoci plných "
+-"59.94 snímk./s nie je m,ožné dosiahnuť s neupraveným Linuxovým jadrom 2.4l "
+-"(ktoré používa frekvenciu prerušenia 100Hz). Novér RedHat a 2.6 jadrá "
+-"používajú vyššie nastavenie HZ (512 a 1000, v poradí) a mali by dobre "
+-"fungovať.\n"
+-"\n"
+-" Judder_correction: Ak je povolené 2-3 pulldown a je deketovaný filmový "
+-"materiál, je možné obmedziť rýchlosť snímkov na pôvodne použitú rýchlosť (24 "
+-"snímkov/s). To spôsobí, že snímky budú rovnomerne rozložené v čase. Ich čas "
+-"bude súhlasiť a eliminuje sa trasenie..\n"
+-"\n"
+-" Use_progressive_frame_flag: Dobre zvládnuté prúdy MPEG2 používajú príznak "
+-"k indikáci progresívneho materiálu. Toto nastavenie riadi, či veríme či "
+-"neveríme tomuto príznaku (niektoré ojedinelé chybné prúdy mpeg2 ho nastavujú "
+-"zle)..\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 používa prekladaný formát obrazu, ktorý má veľmi "
+-"zlé zvislé farebné rozlíšenie. Prevzorkovánie farby na vyššie rozlišení prr "
+-"účely korekcie prekladania môže spôsobit vytvořenie artefaktov (napr. "
+-"farebné pruhy). Túto voľbu použite k zvislému rozmazaniu farby po korekcii "
+-"prekladania, čo odstráni tieto artefakty. Varovanie: náročné na CPU.\n"
+-"\n"
+-" Cheap_mode: Toto preskočí nákladnú konverziu obrazu YV12->YUY2 a rutiny "
+-"tvtime/dscaleru budú používané, ako by stále spracovávaly obrazy YUY2. "
+-"Samozrejme to nie je správne, nie všetky body budú vyhodnotené algoritmom "
+-"pre rozhodovanie o oblastiach ku korekcii a farba bude zpracována oddelene. "
+-"Toto dovolí luďom s nie tak rychlými strojmi, vyzkúšať si algoritmus "
+-"korekcie prekladania, v kompromise mezi kvalitou a využitím CPU.\n"
+-"\n"
+-"Metódy odprekladania: (Nie všetky metódy sú dostupné pre všetky plataformy)\n"
+-"\n"
+-"(OPRAV: vysvetlenie všetkých metód, skontr. tvtime/dscaler dokum... už som "
+-"lenivý)\n"
+-"\n"
+-"* Používa niektoré algoritmy z tvtime a dscaler projektu.\n"
++"audio_oss_out: audio frekv. : %d požadovaná, %d poskytnutá zariadením\n"
+
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
+-msgstr "tvtime: Žiadna metóda odprekladania nie je dostupná, končím.\n"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
++msgstr "názov OSS audio zariadenia"
+
+-#: src/post/goom/xine_goom.c:200
++#: src/audio_out/audio_oss_out.c:737
+ #, fuzzy
+-msgid "frames per second to generate"
+-msgstr "Snímkov za sekundu generovaných Goom-om"
+-
+-#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
++"Špecifikujte zákl. čast mena audio zariadenia, potom použite "
++"oss_device_number na nastavenie čísla zariadenia. Vyberte auto ak autom. "
++"hľadať zariadenie."
+
+-#: src/post/goom/xine_goom.c:206
++#: src/audio_out/audio_oss_out.c:744
+ #, fuzzy
+-msgid "goom image width"
+-msgstr "Šírka obrazu Goom v pixeloch"
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
+-msgstr ""
++msgid "OSS audio device number, -1 for none"
++msgstr "názov OSS audio zariadenia"
+
+-#: src/post/goom/xine_goom.c:211
++#: src/audio_out/audio_oss_out.c:745
+ #, fuzzy
+-msgid "goom image height"
+-msgstr "Výška obrazu Goom v pixeloch"
+-
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
++"Názov audio zariadenia je tvorený z oss_device_name a čísla zariadenia "
++"(napr. /dev/sound/dsp2). Ak nepotrebujete číslo, nastavte na -1 (eg /dev/"
++"sound/dsp). Rozsah čísla je -1 alebo 0-15."
+
+-#: src/post/goom/xine_goom.c:218
+-#, fuzzy
+-msgid "colorspace conversion method"
+-msgstr "Metóda konverzie priestoru farieb použitá Goom-om"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++msgstr "audio_oss_out: audio.device.oss_device_name = auto, skúšam devs\n"
+
+-#: src/post/goom/xine_goom.c:219
+-msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
+-msgstr ""
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
++msgstr "audio_oss_out: Automatické hľadanie audio zar. zlyhalo\n"
+
+-#: src/post/mosaico/mosaico.c:273
+-msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
+-msgstr ""
+-"Mosaico robí jednoduché obraz v obraze efekty.\n"
+-"\n"
+-"Parametre\n"
+-" pip_num: počet obrazových slotov, na ktoré sa použije nastavenie\n"
+-" x: x-ová súradnica ľavého horného rohu obrazu\n"
+-" y: y-nová súradnica ľavého horného rohu obrazu\n"
+-" w: šírka obrazu\n"
+-" h: výška obrazu\n"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
++msgstr "audio_oss_out: používam zariadenie >%s<\n"
+
+-#: src/post/mosaico/switch.c:230
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+-"Prepínač môže byť použitý pre rýchle prepínanie medzi viacerými vstupmi.\n"
+-"\n"
+-"Parametre\n"
+-" select: počet vstupov, ktoré prejdú na výstup\n"
++"audio_oss_out: zlyhalo otvorenie audio zariadenia %s:\n"
++"%s\n"
+
+-#: src/post/planar/boxblur.c:103
++#: src/audio_out/audio_oss_out.c:800
++#, fuzzy
++msgid "a/v sync method to use by OSS"
++msgstr "synchronizačná A/V metóda použitá OSS, závisí od ovládača/hardvéru"
++
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"Box blur does a simple blurring of the image.\n"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
+ "\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
++"The meaning of the values is as follows:\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+-msgstr ""
+-"Box blur robí jednoduché rozmazanie obrazu.\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
+ "\n"
+-"Parametre\n"
+-" Radius: veľkosť filtru\n"
+-" Power: ako často má byť filter použitý\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
+ "\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+-
+-#: src/post/planar/denoise3d.c:136
+-msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
+ "\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
+ "\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+-"Tento filter má za cieľ znížiť šum obrazu produkovaním vyhladených snímkov a "
+-"robením nehybného obrazu skutočne nehybným (to by malo zvýšiť "
+-"komprimovateľnosť). Môže byť zadané od 0 do 3 parametrov. Ak vynecháte "
+-"parameter, bude odhadnutá primeraná hodnota.\n"
+-"\n"
+-"Parametre\n"
+-" Luma: priestorová intenzita svetlosti (predvolené = 4)\n"
+-" Chroma: priestorová intenzita sýtosti (predvolené = 3)\n"
+-" Time: dočasná sila (predvolené = 6)\n"
+-"\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+
+-#: src/post/planar/eq.c:186
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"Softvétový ekvalizér s interaktívným ovládaním tak ako pri hardvérovom "
+-"ekvalizéri pre karty, ktoré nepodporujú riadenie jasu a kontrastu "
+-"harvérovo.\n"
+-"\n"
+-"Parametre\n"
+-" jas\n"
+-" kontrast\n"
+-"\n"
+-"Poznámka: K ich nastaveniu je možne použiť ovládacie okno frontendu.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
++"audio_oss_out: ...budú použité systémové hodiny skut.času pre softvérovú\n"
++"audio_oss_out: ...preto môžu byť problémy s audio/video synchronizáciou\n"
+
+-#: src/post/planar/eq2.c:359
++#: src/audio_out/audio_oss_out.c:856
++#, fuzzy
++msgid "OSS audio output latency (adjust a/v sync)"
++msgstr "výstupné oneskorenie esd audia (nastavte odstup a/v)"
++
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
+ msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++"If you experience audio being not in sync with the 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 ""
+-"Alternatívny softvérový ekvalizér, ktorý pre jednoduchú úpravu svetlosti, "
+-"kontrastu a sýtosti používa vyhladávacie tabuľky (veľmi pomalé), dovoluje to "
+-"naviac gamma korekciu k nastaveniu jednoduchého jasu, kontrastu a "
+-"nasýtenia.\n"
+-"Používa ten istý optimalizovaný MMX kód ako 'eq' ak sú všetky gamma hodnoty "
+-"1.0.\n"
+-"\n"
+-"Parametre\n"
+-" gamma\n"
+-" jas\n"
+-" kontrast\n"
+-" sýtosť\n"
+-" rgamma (gamma pre červenú zložku)\n"
+-" ggamma (gamma pre zelenú zložku)\n"
+-" bgamma (gamma pre modrú zložku)\n"
+-"\n"
+-"Rozsahy hodnôt sú 0.1 - 10 pre gammy, -2 - 2 pre kontrast (negatívne hodnoty "
+-"spôsobia negatívny obraz), -1 - 1 pre jas a 0 - 3 pre sýtosť.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+
+-#: src/post/planar/expand.c:223
++#: src/audio_out/audio_oss_out.c:870
+ msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+-"Expand modul je navrhnutý tak, aby prijímal snímky s lubovolnými pomermi "
+-"strán a konvertoval ich na 4:3 pomer pridaním čiernych pruhov navrch a "
+-"naspodok obrazu. To nám dovolí posunúť OSD a titulky tak, aby neprekrývali "
+-"obraz.\n"
+-"\n"
+-"Parametre (FIXME: lepšia nápoveda)\n"
+-" Enable_automatic_shift: Povoliť automatické posunutie\n"
+-" Overlay_y_offset: Manuálne zvislé posunutie\n"
+-"\n"
++"audio_oss_out: RT synchronizácia audio ovládača zakázaná ...\n"
++"audio_oss_out: ...zisťujem veľkosť výst. vyrovn. pamäte: "
+
+-#: src/post/planar/pp.c:108
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+-"FFmpeg libpostprocess modul.\n"
+-"\n"
+-"Parametre\n"
+-"\n"
++"%d bytov\n"
++"audio_oss_out: ...môžu byť problémy s audio/video synchronizáciou\n"
+
+-#: src/post/planar/pp.c:114
+-msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
+
+-#: src/post/planar/unsharp.c:219
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
+ "\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+-"Rozostrovacia maska /gausovské rozmazanie\n"
+-"Jemožné nastaviť šírku a výšku matice nepárnymi veľkosťami v oboch smeroch "
+-"(min = 3x3, max = 13x11 alebo 11x13, obyčajne niečo medzi 3x3 a 7x7) a "
+-"pomerné množstvo ostrosti/rozmazania pridaného k obrazu (rozumný rozsah by "
+-"mal byť -1.5 - 1.5).\n"
+-"\n"
+-"Parametre\n"
+-"\n"
+-" Luma_matrix_width: Šírka matice (mus'byť nepárne)\n"
+-"\n"
+-" Luma_matrix_height: Výška matice (musí byť nepárne)\n"
+-"\n"
+-" Luma_amount: Pomerné množstvo ostrosti/rozmazania "
+-"(=0 vypnuté, <0 rozmazanie, >0 ostrenie)\n"
+-"\n"
+-" Chroma_matrix_width: Šírka matice (mus'byť nepárne)\n"
+-"\n"
+-" Chroma_matrix_height: Výška matice (mus'byť nepárne)\n"
+-"\n"
+-" Chroma_amount: Pomerné množstvo ostrosti/rozmazania "
+-"(=0 vypnuté, <0 rozmazanie, >0 ostrenie)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1768
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
+-msgstr "výstupný modul xine s použitím ascii-art knižnice"
+-
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
+-msgstr "výstupný video modul použitím Color AsCii Art knižnice"
+-
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
+-msgstr "výstupný modul xine s použitím DirectFB knižnice."
++#: src/audio_out/audio_oss_out.c:1074
++#, c-format
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgstr "audio_oss_out: open() mixer %s zlyhal: %s\n"
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
+-msgstr "výstupný video modul pre win32 použitím directx"
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++msgstr ""
++"výstupný xine audio plugin používa oss-compliant audio zariadenia/ovládače"
+
+-#: src/video_out/video_out_fb.c:762
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
+ #, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+-msgstr ""
+-"video_out_fb: sú podporované iba pravé farby truecolor/directcolor (%d).\n"
+-" Zkontrolujte 'fbset -i' alebo skúste 'fbset -depth 16'.\n"
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgstr "audio_sun_out: otvorenie audio zariadenia %s zlyhalo: %s\n"
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
++#: src/audio_out/audio_sun_out.c:889
+ #, fuzzy
+-msgid "framebuffer device name"
+-msgstr "zariadenie framebufferu"
++msgid "Sun audio device name"
++msgstr "názov OSS audio zariadenia"
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"Specifies the file name for the framebuffer device to be used.\n"
++"Specifies the file name for the Sun audio device to be used.\n"
+ "This setting is security critical, because when changed to a different file, "
+ "xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
+-msgstr ""
+-
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+-msgstr "video_out_fb: Váš video mód nebol rozpoznaný, prepáčte.\n"
+-
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
+-msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
++"výstupný xine audio plugin používa sun-compliant audio zariadenia/ovládače"
+
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
+-msgstr "video_out_fb: %d video RAM buffere dostupné.\n"
++#: src/audio_out/audio_irixal_out.c:385
++#, fuzzy
++msgid "irixal audio output maximum gap length"
++msgstr "maximálna dľžka medzery irixal audio výstupu v 1/90000s"
+
+-#: src/video_out/video_out_fb.c:938
+-#, c-format
++#: src/audio_out/audio_irixal_out.c:386
+ msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+-"WARNING: video_out_fb: Buffere s nulami sú ZAKÁZANÉ lebo je iba %d buffrov\n"
+-" k dispozícii, čo je menej neždoporučených %d buffrov. Zníženie\n"
+-" rozlíšenia bufferu snímkov môže pomôcť.\n"
+
+-#: src/video_out/video_out_fb.c:949
+-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 ""
+-"WARNING: video_out_fb: Buffere s nulami sú ZAKÁZANÉ lebo lebo kernel "
+-"ovládač\n"
+-" nepodporuje screen panning (používaný pre prepínanie snímkov).\n"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
++msgstr "výstupný xine audio plugin používa IRIX libaudio"
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
+-"WARNING: video_out_fb: terajšia hĺbka zobrazenia je %d. Pre lepší výkon\n"
+-" hĺbka 16 bit/bod je doporučená!\n"
+-"\n"
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
++msgstr "mĺkvy výstupný xine audio plugin"
+
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
+-msgstr ""
+-"výstupný xine video modul s použitím Linux kernelového frame buffer "
+-"zariadenia"
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
++msgstr "výstupný xine audio plugin používa kde artsd"
+
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
+-msgstr "výstupný xine video modul, ktorý nič nezobrazuje"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
++msgstr "audio_alsa_out:Už otvorené...PREČO!"
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:391
++#, c-format
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgstr "audio_alsa_out: snd_pcm_open() z %s zlyhal: %s\n"
+
+-#: src/video_out/video_out_opengl.c:1353
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++msgstr "audio_alsa_out: >>> skontrolujte či už iný program používa PCM <<<\n"
++
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
+ msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
++"audio_alsa_out: poškodená konfigurácia pre toto PCM: konfigurácia "
++"nedostupná: %s\n"
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1370
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
++#: src/audio_out/audio_alsa_out.c:1327
++#, c-format
++msgid "snd_lib_error_set_handler() failed: %d"
++msgstr "snd_lib_error_set_handler() zlyhal: %d"
++
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1376
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
+-msgstr "výstupný video xine modul použitím rozšírenia zdielanej pamäte MIT X"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
++msgstr "zariadenie pre mono výstup"
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_alsa_out.c:1345
++msgid ""
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, fuzzy, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+-msgstr "video_out_dxr3: Zlyhalo otvorenie video zariadenia %s (%s)\n"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
++msgstr "zariadenie pre stereo výstup"
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_alsa_out.c:1354
++msgid ""
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-#, fuzzy
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
+-msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
+-
+-#: src/video_out/video_out_pgx64.c:300
+-#, fuzzy, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
+-msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
++msgstr "zariadenie pre 4-kanálový výstup"
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
++msgstr "zariadenie pre 5.1-kanálový výstup"
++
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
++#: src/audio_out/audio_alsa_out.c:1383
+ msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-#, fuzzy
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
+-msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++#: src/audio_out/audio_alsa_out.c:1403
++#, c-format
++msgid "snd_pcm_open() failed:%d:%s\n"
++msgstr "snd_pcm_open() zlyhal:%d:%s\n"
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
+-msgstr ""
+-"video_out_pgx64: Varovanie: málo video pamäte, multi-buffering zakázaný\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
++msgstr ">>> Skontrolujte či už iný program používa PCM <<<\n"
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
+-msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
++msgstr "audio_alsa_out : podporované módy sú "
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
+-msgstr ""
+-"video_out_pgx64: Varovanie: málo video pamäte, dvoj-buffering zakázaný\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:1401
++#: src/audio_out/audio_alsa_out.c:1469
+ #, fuzzy
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
+-msgstr "video_out_pgx64: Chyba: nedostatočná veľkosť video pamäte\n"
++msgid "16bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
++#: src/audio_out/audio_alsa_out.c:1473
+ #, fuzzy
+-msgid "video overlay colour key"
+-msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
+-
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
+-msgstr ""
+-
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
+-msgstr ""
+-
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
+-msgstr ""
++msgid "24bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1477
++#, fuzzy
++msgid "32bit "
++msgstr "8bit "
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
++msgstr "mono "
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
++msgstr "stereo "
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
++msgstr "4-kanály "
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
++msgstr "(4-kanály nepovolené v xine konfigu) "
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
++msgstr "4.1-kanálov "
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
+-msgstr ""
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
++msgstr "(4.1-kanálov nepovolené v xine konfigu) "
+
+-#: src/video_out/video_out_sdl.c:480
+-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/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
++msgstr "5-kanálov "
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
+-msgstr "sdl musí emulovať 16 bitové povrchy, to všetko spomalí.\n"
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
++msgstr "(5-kanálov nepovolené v xine konfigu) "
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
+-msgstr "video_out_sdl: plnoobrazovkový mód NIE JE podporovaný\n"
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
++msgstr "5.1-kanálov "
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
+-msgstr "výstupný xine video modul používajúci Simple Direct Media Layer"
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
++msgstr "(5.1-kanálov nepovolené v xine konfigu) "
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
+-msgstr "výstupný video modul použitím Libstk Surface Set-top Toolkit"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
++msgstr "a/52 a DTS pass-through\n"
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
+-msgstr "video_out_syncfb: chyba. (YUY2 nepodporovaný vašou video kartou)\n"
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++msgstr "(a/52 a DTS pass-through not enabled in xine config)\n"
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
+-msgstr "video_out_syncfb: chyba. (YV12 nepodporované vašou graf. kartou)\n"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
++msgstr "alsa mixovacie zaridenie"
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_alsa_out.c:1551
++msgid ""
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+-"video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:0 (3 roviny))\n"
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
+-"video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:0 (2 roviny))\n"
+-
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
+-msgstr "video_out_syncfb: info. (SyncFB modul podporuje YUV 4:2:2)\n"
++"výstupný xine audio plugin používa alsa-compliant audio zariadenia/ovládače"
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
+-msgstr "video_out_syncfb: info. (SyncFB modul podporuje YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
++msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
+-msgstr "video_out_syncfb: info. (SyncFB modul podporuje RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
++msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+-"video_out_syncfb: ruší sa. (SyncFB modul nepodporuje YV12, YUY2 ani RGB565)\n"
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+-"video_out_syncfb: info. (ovládanie jasu/kontrastu nebude dostupné lebo váš "
+-"SyncFB kernel modul vyzerá veľmi zastaraný. Prosím pozrite README.syncfb "
+-"kôli ďalším informáciam ako ho aktualizovať.)\n"
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+-"výstupný video modul xine použitím SyncFB modulu pre Matrox G200/G400 karty"
+
+-#: src/video_out/video_out_syncfb.c:1073
++#: src/audio_out/audio_directx2_out.c:177
+ #, fuzzy
+-msgid "SyncFB device name"
+-msgstr "názov OSS audio zariadenia"
++msgid "requested buffer control is not available"
++msgstr "požadované tlačidlo nedostupné\n"
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
+-msgstr ""
++#: src/audio_out/audio_directx2_out.c:186
++#, fuzzy
++msgid "requested COM interface not available"
++msgstr "požadované tlačidlo nedostupné\n"
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
+-msgstr "video_out_vidix: karta podporuje yuy2 formát\n"
+-
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
+-msgstr "video_out_vidix: karta podporuje yv12 formát\n"
+-
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
+-msgstr "video_out_vidix: Máte zlú verziu knižnice VIDIX\n"
+-
+-#: src/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
+-msgstr "video_out_vidix: Nemôžem nájsť funkčný VIDIX ovládač\n"
+-
+-#: src/video_out/video_out_vidix.c:1082
+-#, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
+-msgstr "video_out_vidix: používam ovládač: %s od %s\n"
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-#, fuzzy
+-msgid "video overlay colour key red component"
+-msgstr "rozsah kľúčovej farby prekrývánia"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
+-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."
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1136
+-#, fuzzy
+-msgid "video overlay colour key green component"
+-msgstr "rozsah kľúčovej farby prekrývánia"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
++msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
++#: src/audio_out/audio_directx2_out.c:192
+ #, fuzzy
+-msgid "video overlay colour key blue component"
+-msgstr "Dx3: hodnota kľúčovej farby prekrývánia"
+-
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
+-msgstr "výstupný video modul xine použitím libvidix pre x11"
+-
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
+-msgstr "výstupný video modul xine použitím libvidix pre linux frame buffer"
++msgid "unknown error"
++msgstr "Udalosť neznámeho typu: "
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+-"video_out_xshm: chyba dielanej pamäte pri alokácii obrazu\n"
+-"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xshm.c:206
+-#, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+-"video_out_xshm: %s: alokácia obrazu\n"
+-"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+-"video_out_xshm: chyba dielanej pamäte (chyba adresy) pri alokácii obrazu\n"
+-"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+-"video_out_xshm: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
+-"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xshm.c:1138
+-#, c-format
+-msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+-"\n"
+-"\n"
+-"VAROVANIE: aktuálna hĺbka zobrazenia je %d. Pre lepší výkon\n"
+-"je doporučená hĺbka 16 bit/bod!\n"
+-"\n"
+
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+-"video_out_xshm: rozšírenie zdielanej pamäte MIT neprítomné na obrazovke.\n"
+-
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+-msgstr "video_out_xshm: váš video mód nebol rozoznaný, prepáčte :-(\n"
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+-"video_out_xv: XvShmCreateImage zlyhala\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+-"video_out_xv: XvShmCreateImage vrátila nulovú veľkosť\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xv.c:305
+-#, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+-"video_out_xv: chyba zdielanej pamäte v shmget: %s\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+
+-#: src/video_out/video_out_xv.c:337
+-msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+-"video_out_xv: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
+-msgstr "video_out_xv: Xv rozšírenie neprítomné.\n"
+
+-#: src/video_out/video_out_xv.c:1304
+-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"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+-"video_out_xv: rozšírenie Xv je prítomné, ale nenašiel som použiteľný yuv12 "
+-"port.\n"
+-" Vyzerá to tak, že vaša grafická karta nepodoruje Xv?!\n"
+
+-#: src/video_out/video_out_xv.c:1313
+-#, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+-"video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
+-"farebného priestoru a škálovania.\n"
+-
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-#, fuzzy
+-msgid "autopaint colour key"
+-msgstr "Donútiť Xv automaticky kresliť svojou kľúčovou farbou"
+-
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-#, fuzzy
+-msgid "Make Xv autopaint its colorkey."
+-msgstr "Donútiť Xv automaticky kresliť svojou kľúčovou farbou"
+-
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-#, fuzzy
+-msgid "bilinear scaling mode"
+-msgstr "bilinearny škálovací mód (permedia 2/3)"
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
+-msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
+-"\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
+-"\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje yv12 formát.\n"
+-
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n"
+-
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
++#: src/audio_out/audio_directx2_out.c:540
++msgid "Unable to create primary direct sound buffer."
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
+-msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
++#: src/audio_out/audio_directx2_out.c:651
++#, c-format
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
+-msgstr "výstupný video xine modul použitím MIT X video rozšírenia"
++#: src/audio_out/audio_directx2_out.c:755
++#, fuzzy, c-format
++msgid ": can't create pthread condition: %s\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
+-msgstr "výstupný video xine modul použitím XvMC X video rozšírenia"
++#: src/audio_out/audio_directx2_out.c:759
++#, fuzzy, c-format
++msgid ": can't create pthread mutex: %s\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
+-msgstr "video_out_xvmc: XvMC rozšírenie neprítomné.\n"
++#: src/audio_out/audio_directx2_out.c:766
++#, fuzzy, c-format
++msgid ": can't create buffer pthread: %s\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
+-msgstr ""
+-"video_out_xvmc: Xv rozšírenie je prítomné, ale nenašiel som použiteľný yuv12 "
+-"port.\n"
++#: src/audio_out/audio_directx2_out.c:873
++#, fuzzy, c-format
++msgid ": can't destroy buffer pthread: %s\n"
++msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/audio_out/audio_directx2_out.c:880
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+-"video_out_xvmc: používam Xv port %ld z adaptéru %s\n"
+-" pre hardvérovú konverziu farebného priestoru a škálovania\n"
+
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
+-msgstr " idct a akcelerácia kompenzácie pohybu \n"
++#: src/audio_out/audio_directx2_out.c:883
++#, c-format
++msgid ": can't destroy pthread mutex: %s\n"
++msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
+-msgstr " iba akcelerácia kompenzácie pohybu\n"
++#: src/audio_out/audio_directx2_out.c:943
++#, fuzzy, c-format
++msgid ": unknown control command %d\n"
++msgstr "iff-ilbm: neznáma kompresia: %d\n"
+
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
+-msgstr " žiadna XvMC podpora \n"
++#: src/audio_out/audio_directx2_out.c:996
++#, fuzzy
++msgid "second xine audio output plugin using directx"
++msgstr "výstupný xine audio plugin pre win32 používa directx"
+
+-#: src/video_out/video_out_xvmc.c:1816
++#: src/audio_out/audio_esd_out.c:167
+ #, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+-msgstr " S Prekrývaním = %d; UnsignedIntra = %d.\n"
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgstr "audio_esd_out: pripájanie na ESD server %s: %s\n"
+
+-#: src/video_out/video_out_xxmc.c:601
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: XvShmCreateImage zlyhala\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
++msgstr "audio_esd_out: pripájanie na esd server ...\n"
+
+-#: src/video_out/video_out_xxmc.c:611
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: XvShmCreateImage vrátila nulovú veľkosť\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgstr "audio_esd_out: nemôžem sa pripojiť na %s ESD server: %s\n"
+
+-#: src/video_out/video_out_xxmc.c:619
+-#, fuzzy, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xv: chyba zdielanej pamäte v shmget: %s\n"
+-"video_out_xv: => nepoužívam rozšírenie MIT Shared Memory.\n"
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
++msgstr "výstupné oneskorenie esd audia (nastavte odstup a/v)"
+
+-#: src/video_out/video_out_xxmc.c:651
+-#, fuzzy
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-"video_out_xshm: x11 chyba pri vytváraní zdielanej pamäte XImage\n"
+-"video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
++msgstr "výstupný xine audio plugin používa esound"
+
+-#: src/video_out/video_out_xxmc.c:2158
++#: src/audio_out/audio_coreaudio_out.c:452
+ #, fuzzy
+-msgid "video_out_xxmc: Xv extension not present.\n"
+-msgstr "video_out_xvmc: XvMC rozšírenie neprítomné.\n"
++msgid "xine output plugin for Coreaudio/Mac OS X"
++msgstr "výstupný xine audio plugin pre win32 používa directx"
+
+-#: src/video_out/video_out_xxmc.c:2195
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
++msgstr "výstupný xine audio plugin pre win32 používa directx"
++
++#: src/audio_out/audio_file_out.c:362
++msgid "xine file audio output plugin"
++msgstr "xine file audio output plugin"
++
++#: src/audio_out/audio_polyp_out.c:489
+ #, fuzzy
+-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 ""
+-"video_out_xv: rozšírenie Xv je prítomné, ale nenašiel som použiteľný yuv12 "
+-"port.\n"
+-" Vyzerá to tak, že vaša grafická karta nepodoruje Xv?!\n"
++msgid "device used for polypaudio"
++msgstr "zariadenie pre cdda mechaniku"
+
+-#: src/video_out/video_out_xxmc.c:2204
+-#, fuzzy, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+-"video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
+-"farebného priestoru a škálovania.\n"
+
+-#: src/video_out/video_out_xxmc.c:2380
++#: src/audio_out/audio_polyp_out.c:535
+ #, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje yv12 formát.\n"
++msgid "xine audio output plugin using polypaudio sound server"
++msgstr "výstupný xine audio plugin používa esound"
+
+-#: src/video_out/video_out_xxmc.c:2385
+-#, fuzzy
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
+-msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n"
++#: src/xine-engine/audio_decoder.c:347
++#, c-format
++msgid "audio_decoder: no plugin available to handle '%s'\n"
++msgstr "audio_decoder: žiaden modul nedostupný na spracovanie '%s'\n"
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/audio_decoder.c:364
++#, c-format
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
++msgstr "audio_decoder: chyba, neznámy typ bufferu: %08x\n"
++
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
++#: src/xine-engine/audio_decoder.c:467
+ 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"
++"The number of audio 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/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
+-msgstr ""
++#: src/xine-engine/video_decoder.c:373
++#, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
++msgstr "video_decoder: nedostupný modul na spracovanie '%s'\n"
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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/xine-engine/video_decoder.c:447
++#, c-format
++msgid "video_decoder: error, unknown buffer type: %08x\n"
++msgstr "video_decoder: chyba, neznámy typ bufferu: %08x\n"
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2429
++#: src/xine-engine/video_decoder.c:484
+ msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
++"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/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: XShape rozšírenie nedostupné. Prekrývanie bez zmien merítka "
+-"zakázané.\n"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
++msgstr "Aktuálny konfiguračný súbor bol modifikovaný novou verziou xine."
+
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: chyba vytvorenia okna. Prekrývanie bez zmien merítka zakázané.\n"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgstr "configfile: VAROVANIE: záloha konf.súboru do %s zlyhala\n"
+
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
+-msgstr ""
+-"x11osd: chyba vytvorenia mapy bodov. Prekrývanie bez zmien merítka "
+-"zakázané.\n"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
++msgstr "configfile: VAROVANIE: vaša konfigurácia nebude uložená\n"
+
+-#: src/video_out/x11osd.c:349
++#: src/xine-engine/configfile.c:1096
+ #, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
+-msgstr ""
++msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgstr "configfile: VAROVANIE: zápis konfigurácie %s zlyhal\n"
+
+-#: src/xine-engine/audio_decoder.c:347
++#: src/xine-engine/configfile.c:1097
+ #, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
+-msgstr "audio_decoder: žiaden modul nedostupný na spracovanie '%s'\n"
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
++msgstr "configfile: VAROVANIE: odstraňujem možno poškodený konf. súbor %s\n"
+
+-#: src/xine-engine/audio_decoder.c:364
++#: src/xine-engine/configfile.c:1098
+ #, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
+-msgstr "audio_decoder: chyba, neznámy typ bufferu: %08x\n"
++msgid "configfile: WARNING: you should check the backup file %s\n"
++msgstr "configfile: VAROVANIE: mali by ste skontrolovať záložný súbor %s\n"
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
+-msgstr ""
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++msgstr "configfile: položka '%s' nesmie byť modifikovaná z MRL\n"
+
+-#: src/xine-engine/audio_decoder.c:467
++#: src/xine-engine/info_helper.c:204
++#, fuzzy
++msgid "info_helper: can't find out current locale character set\n"
++msgstr "osd: nemôžem zistiť aktuálnu kódovú stánku\n"
++
++#: src/xine-engine/info_helper.c:212
++#, fuzzy, c-format
+ msgid ""
+-"The number of audio 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."
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgstr "osd: nepodporovaná konverzia %s -> %s, nebude vykonaná žiadna\n"
++
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
++msgstr ""
++
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
++msgstr ""
++
++#: src/xine-engine/io_helper.c:323
++#, fuzzy
++msgid "io_helper: File not found\n"
++msgstr "Meno tuneru nenájdené\n"
++
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+ #: src/xine-engine/audio_out.c:1045
+@@ -3899,59 +3767,315 @@
+ msgid "audio_out: sorry, this should not happen. please restart xine.\n"
+ msgstr "audio_out: prepáč, toto sa nemalo stať, prosím reštartuj xine.\n"
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
+-msgstr "Aktuálny konfiguračný súbor bol modifikovaný novou verziou xine."
++#: src/xine-engine/video_out.c:568
++#, c-format
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
++msgstr "doručených %d rámcov, preskočených %d rámcov, zahodených %d rámcov\n"
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/video_out.c:739
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
+-msgstr "configfile: VAROVANIE: záloha konf.súboru do %s zlyhala\n"
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
++msgstr ""
++"video_out: zahadzuje sa obraz s pts %<PRId64>, pretože už je príliš starý "
++"(rozdiel: %<PRId64>).\n"
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
+-msgstr "configfile: VAROVANIE: vaša konfigurácia nebude uložená\n"
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
++msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/video_out.c:1740
++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:1745
++msgid "percentage of discarded frames to tolerate"
++msgstr ""
++
++#: src/xine-engine/video_out.c:1746
++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:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
++msgstr "video_out: prepáč, toto sa nemalo stať, reštartuj xine.\n"
++
++#: src/xine-engine/input_cache.c:164
++#, fuzzy
++msgid ": open() function should never be called\n"
++msgstr "input_rip: funkcia open() by nikdy nemala byť volaná\n"
++
++#: src/xine-engine/input_cache.c:323
++#, fuzzy
++msgid ": input plugin not defined!\n"
++msgstr "input_rip: vstupný modul nedefinovaný!\n"
++
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
++msgstr "xine: chyba pri spracovaní mrl\n"
++
++#: src/xine-engine/xine.c:681
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
+-msgstr "configfile: VAROVANIE: zápis konfigurácie %s zlyhal\n"
++msgid "xine: found input plugin : %s\n"
++msgstr "xine: nájdený vstupný modul : %s\n"
+
+-#: src/xine-engine/configfile.c:1107
++#: src/xine-engine/xine.c:689
+ #, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
+-msgstr "configfile: VAROVANIE: odstraňujem možno poškodený konf. súbor %s\n"
++msgid "xine: input plugin cannot open MRL [%s]\n"
++msgstr "xine: vstupný modul nemôže otvoriť MRL [%s]\n"
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/xine.c:707
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
+-msgstr "configfile: VAROVANIE: mali by ste skontrolovať záložný súbor %s\n"
++msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgstr "xine: nemožno nájsť vstupný modul pre MRL [%s]\n"
+
+-#: src/xine-engine/configfile.c:1231
++#: src/xine-engine/xine.c:733
+ #, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+-msgstr "configfile: položka '%s' nesmie byť modifikovaná z MRL\n"
++msgid "xine: specified demuxer %s failed to start\n"
++msgstr "xine: špecifikovaný demultiplexor %s nenaštartoval\n"
+
+-#: src/xine-engine/info_helper.c:204
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
++msgstr "xine: pripojený rip vstupný modul\n"
++
++#: src/xine-engine/xine.c:774
++msgid "xine: error opening rip input plugin instance\n"
++msgstr "xine: chyba otvorenia modulu vstupu rip\n"
++
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
++msgstr "xine: last_probed demultiplexor %s nenaštartoval\n"
++
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
++msgstr "ignorujem video\n"
++
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
++msgstr "ignorujem audio\n"
++
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
++msgstr "ignorujem titulky\n"
++
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
++msgstr ""
++
++#: src/xine-engine/xine.c:944
++#, c-format
++msgid "subtitle mrl opened '%s'\n"
++msgstr "mrl titulkov otvorené '%s'\n"
++
++#: src/xine-engine/xine.c:948
++msgid "xine: error opening subtitle mrl\n"
++msgstr "xine: nemožno otvoriť mrl titulkov\n"
++
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
++msgstr "xine: chyba pri spracovaní MRL\n"
++
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
++#, c-format
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
++msgstr "xine: zmeniť voľbu '%s' z MRL nie je dovolené\n"
++
++#: src/xine-engine/xine.c:1007
++#, c-format
++msgid "xine: couldn't find demux for >%s<\n"
++msgstr "xine: nemožno nájsť demultiplexor pre >%s<\n"
++
++#: src/xine-engine/xine.c:1023
++#, c-format
++msgid "xine: found demuxer plugin: %s\n"
++msgstr "xine: nájdený modul demultiplexora %s\n"
++
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
++msgstr "xine: demultiplexor nenaštartoval\n"
++
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
++msgstr "xine_play: demultiplexor nedostupný\n"
++
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
++msgstr "xine_play: demultiplexor nenaštartoval\n"
++
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++msgstr "xine: Špecifikovaný save_dir \"%s\" môže byť bezpečnostným rizikom.\n"
++
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
++msgstr "Špecifikovaný save_dir môže byť bezpečnostným rizikom."
++
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
++msgstr "xine: locale nepodporované vašou C knižnicou\n"
++
++#: src/xine-engine/xine.c:1484
+ #, fuzzy
+-msgid "info_helper: can't find out current locale character set\n"
+-msgstr "osd: nemôžem zistiť aktuálnu kódovú stánku\n"
++msgid "media format detection strategy"
++msgstr "Stratégia detekcie formátu médii"
+
+-#: src/xine-engine/info_helper.c:212
+-#, fuzzy, c-format
++#: src/xine-engine/xine.c:1485
+ msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+-msgstr "osd: nepodporovaná konverzia %s -> %s, nebude vykonaná žiadna\n"
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
++"\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
++"\n"
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
++msgstr ""
+
+-#: src/xine-engine/input_cache.c:164
++#: src/xine-engine/xine.c:1503
+ #, fuzzy
+-msgid ": open() function should never be called\n"
+-msgstr "input_rip: funkcia open() by nikdy nemala byť volaná\n"
++msgid "directory for saving streams"
++msgstr "Cesta pre ukladanie prúdov"
+
+-#: src/xine-engine/input_cache.c:323
++#: src/xine-engine/xine.c:1504
++msgid ""
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
++msgstr ""
++
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
++msgstr "dovoliť implicitné zmeny v konfigurácii (napr. cez MRL)"
++
++#: src/xine-engine/xine.c:1516
++msgid ""
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
++msgstr ""
++"Ak je povolené, dovolíte xine zmentiť konfiguráciu bez explicitných akcii z "
++"vašej strany. Napríklad konfiguračné zmeny požadované z MRL alebo vložené do "
++"playlistu budú vykonané.\n"
++"Toto nastavenie je kritické z hľadiska bezpečnosti, lebo xine môže dostať "
++"MRL alebo playlisty z nedôverihodných vzdialených zdrojov. Ak im dovolíte "
++"ľubovoľne meniť vašu konfiguráciu, môžete skončiť s úplne rozhodeným xine."
++
++#: src/xine-engine/xine.c:1868
++msgid "messages"
++msgstr "správy"
++
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
++msgstr "modul"
++
++#: src/xine-engine/xine.c:1870
++msgid "trace"
++msgstr "trace"
++
++#: src/xine-engine/osd.c:666
++#, c-format
++msgid "font '%s-%d' already loaded, weird.\n"
++msgstr "font '%s-%d' už načítaný, divné.\n"
++
++#: src/xine-engine/osd.c:678
++#, c-format
++msgid "font '%s' loading failed (%d < %d)\n"
++msgstr "načítanie fontu '%s' zlyhalo (%d < %d)\n"
++
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
++msgstr "zlá verzia fontu '%s'. očakávaná %d nájdená %d.\n"
++
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
++msgstr "osd: nemôžem inicializovať ft2 knižnicu\n"
++
++#: src/xine-engine/osd.c:820
++#, c-format
++msgid "osd: error loading font %s with ft2\n"
++msgstr "osd: chyba načítania fontu %s s ft2\n"
++
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
++msgstr "osd: chyba pri nastavení veľkosti fontu (neškálovateľný font?)\n"
++
++#: src/xine-engine/osd.c:901
++#, c-format
++msgid ""
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
++msgstr ""
++"osd: neznáma sekvencia začínajúca s bytom 0x%02X v kódovaní \"%s\", "
++"preskakujem\n"
++
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
++msgstr "osd: nemôžem zistiť aktuálnu kódovú stánku\n"
++
++#: src/xine-engine/osd.c:967
++#, c-format
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
++msgstr "osd: nepodporovaná konverzia %s -> %s, nebude vykonaná žiadna\n"
++
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
++msgstr "osd: font nie je definovaný\n"
++
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
++msgstr "osd: chyba zavedenia glyph\n"
++
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr "osd: chyba pri vykreslovaní glyph\n"
++
++#: src/xine-engine/osd.c:1227
++#, c-format
++msgid "osd: error loading glyph %i\n"
++msgstr "osd: chyba zavedenia glyph %i\n"
++
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
++msgstr "osd: chyba pri vykreslovaní\n"
++
++#: src/xine-engine/osd.c:1481
+ #, fuzzy
+-msgid ": input plugin not defined!\n"
+-msgstr "input_rip: vstupný modul nedefinovaný!\n"
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr "Paleta (popredie-okraj-pozadie) použitá na titulky"
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
++msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+ #, c-format
+@@ -3965,7 +4089,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, fuzzy, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr "input_rip: chyba pri zápise do súboru %lld bytov: %s\n"
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3983,7 +4107,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, fuzzy, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr "input_rip: %lld bytov zahodených\n"
+
+ #: src/xine-engine/input_rip.c:546
+@@ -4026,23 +4150,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr "input_rip: nemožno otvoriť súbor %s: %s\n"
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-#, fuzzy
+-msgid "io_helper: File not found\n"
+-msgstr "Meno tuneru nenájdené\n"
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -4143,12 +4250,12 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr "load_plugins: nájdený demultiplexor '%s'\n"
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr "load_plugins: zlyhalo načítanie výstupného audio modulu <%s>\n"
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+@@ -4156,144 +4263,6 @@
+ "load_plugins: auto-detekcia audio výstupu nenašla žiadne použiteľné audio "
+ "ovládače.\n"
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr "font '%s-%d' už načítaný, divné.\n"
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr "načítanie fontu '%s' zlyhalo (%d < %d)\n"
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr "zlá verzia fontu '%s'. očakávaná %d nájdená %d.\n"
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr "osd: nemôžem inicializovať ft2 knižnicu\n"
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr "osd: chyba načítania fontu %s s ft2\n"
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr "osd: chyba pri nastavení veľkosti fontu (neškálovateľný font?)\n"
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-"osd: neznáma sekvencia začínajúca s bytom 0x%02X v kódovaní \"%s\", "
+-"preskakujem\n"
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr "osd: nemôžem zistiť aktuálnu kódovú stánku\n"
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr "osd: nepodporovaná konverzia %s -> %s, nebude vykonaná žiadna\n"
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr "osd: font nie je definovaný\n"
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr "osd: chyba zavedenia glyph\n"
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr "osd: chyba pri vykreslovaní glyph\n"
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr "osd: chyba zavedenia glyph %i\n"
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr "osd: chyba pri vykreslovaní\n"
+-
+-#: src/xine-engine/osd.c:1421
+-#, fuzzy
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr "Paleta (popredie-okraj-pozadie) použitá na titulky"
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr "video_decoder: nedostupný modul na spracovanie '%s'\n"
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr "video_decoder: chyba, neznámy typ bufferu: %08x\n"
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr "doručených %d rámcov, preskočených %d rámcov, zahodených %d rámcov\n"
+-
+-#: src/xine-engine/video_out.c:739
+-#, c-format
+-msgid ""
+-"video_out: throwing away image with pts %<PRId64> because it's too old "
+-"(diff : %<PRId64>).\n"
+-msgstr ""
+-"video_out: zahadzuje sa obraz s pts %<PRId64>, pretože už je príliš starý "
+-"(rozdiel: %<PRId64>).\n"
+-
+-#: src/xine-engine/video_out.c:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr "video_out: prepáč, toto sa nemalo stať, reštartuj xine.\n"
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr "horizontálna pozícia obrazu vo výstupnom okne"
+@@ -4334,203 +4303,465 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
+-msgstr "xine: chyba pri spracovaní mrl\n"
+-
+-#: src/xine-engine/xine.c:667
+-#, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr "xine: nájdený vstupný modul : %s\n"
+-
+-#: src/xine-engine/xine.c:675
+-#, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr "xine: vstupný modul nemôže otvoriť MRL [%s]\n"
+-
+-#: src/xine-engine/xine.c:693
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
+-msgstr "xine: nemožno nájsť vstupný modul pre MRL [%s]\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++msgstr "libareal: (audio) Nedajú sa zistiť symboly - nekompatibilná dll: %s\n"
+
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr "xine: špecifikovaný demultiplexor %s nenaštartoval\n"
+-
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
+-msgstr "xine: pripojený rip vstupný modul\n"
+-
+-#: src/xine-engine/xine.c:760
+-msgid "xine: error opening rip input plugin instance\n"
+-msgstr "xine: chyba otvorenia modulu vstupu rip\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
++msgstr "libareal: decoder init zlyhal, kód chyby: 0x%x\n"
+
+-#: src/xine-engine/xine.c:791
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr "xine: last_probed demultiplexor %s nenaštartoval\n"
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
+-msgstr "ignorujem video\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
++msgstr "libareal: chutné nastavenie dekódera zlyhalo, kód chyby: 0x%x\n"
+
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
+-msgstr "ignorujem audio\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgstr "libareal: ach, real môže mať viac ako 2 kanály ?\n"
+
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
+-msgstr "ignorujem titulky\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++#, fuzzy
++msgid "path to RealPlayer codecs"
++msgstr "cesta k real player kódekom, ak sú nainštalované"
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
+-msgstr "mrl titulkov otvorené '%s'\n"
+-
+-#: src/xine-engine/xine.c:934
+-msgid "xine: error opening subtitle mrl\n"
+-msgstr "xine: nemožno otvoriť mrl titulkov\n"
+-
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
+-msgstr "xine: chyba pri spracovaní MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++msgstr "libreal: Chyba hľadania symbolov! (nekompatibilita verzii?)\n"
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
+-msgstr "xine: zmeniť voľbu '%s' z MRL nie je dovolené\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
++msgstr ""
++"Mosaico robí jednoduché obraz v obraze efekty.\n"
++"\n"
++"Parametre\n"
++" pip_num: počet obrazových slotov, na ktoré sa použije nastavenie\n"
++" x: x-ová súradnica ľavého horného rohu obrazu\n"
++" y: y-nová súradnica ľavého horného rohu obrazu\n"
++" w: šírka obrazu\n"
++" h: výška obrazu\n"
+
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
+-msgstr "xine: nemožno nájsť demultiplexor pre >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
++msgstr ""
++"Prepínač môže byť použitý pre rýchle prepínanie medzi viacerými vstupmi.\n"
++"\n"
++"Parametre\n"
++" select: počet vstupov, ktoré prejdú na výstup\n"
+
+-#: src/xine-engine/xine.c:1009
+-#, c-format
+-msgid "xine: found demuxer plugin: %s\n"
+-msgstr "xine: nájdený modul demultiplexora %s\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
++msgstr ""
++"FFmpeg libpostprocess modul.\n"
++"\n"
++"Parametre\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
+-msgstr "xine: demultiplexor nenaštartoval\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
++msgstr ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
+-msgstr "xine_play: demultiplexor nedostupný\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
++msgstr ""
++"Softvétový ekvalizér s interaktívným ovládaním tak ako pri hardvérovom "
++"ekvalizéri pre karty, ktoré nepodporujú riadenie jasu a kontrastu "
++"harvérovo.\n"
++"\n"
++"Parametre\n"
++" jas\n"
++" kontrast\n"
++"\n"
++"Poznámka: K ich nastaveniu je možne použiť ovládacie okno frontendu.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
+-msgstr "xine_play: demultiplexor nenaštartoval\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
++msgstr ""
++"Expand modul je navrhnutý tak, aby prijímal snímky s lubovolnými pomermi "
++"strán a konvertoval ich na 4:3 pomer pridaním čiernych pruhov navrch a "
++"naspodok obrazu. To nám dovolí posunúť OSD a titulky tak, aby neprekrývali "
++"obraz.\n"
++"\n"
++"Parametre (FIXME: lepšia nápoveda)\n"
++" Enable_automatic_shift: Povoliť automatické posunutie\n"
++" Overlay_y_offset: Manuálne zvislé posunutie\n"
++"\n"
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+-msgstr "xine: Špecifikovaný save_dir \"%s\" môže byť bezpečnostným rizikom.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++msgstr ""
++"Tento filter má za cieľ znížiť šum obrazu produkovaním vyhladených snímkov a "
++"robením nehybného obrazu skutočne nehybným (to by malo zvýšiť "
++"komprimovateľnosť). Môže byť zadané od 0 do 3 parametrov. Ak vynecháte "
++"parameter, bude odhadnutá primeraná hodnota.\n"
++"\n"
++"Parametre\n"
++" Luma: priestorová intenzita svetlosti (predvolené = 4)\n"
++" Chroma: priestorová intenzita sýtosti (predvolené = 3)\n"
++" Time: dočasná sila (predvolené = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
+-msgstr "Špecifikovaný save_dir môže byť bezpečnostným rizikom."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++msgstr ""
++"Box blur robí jednoduché rozmazanie obrazu.\n"
++"\n"
++"Parametre\n"
++" Radius: veľkosť filtru\n"
++" Power: ako často má byť filter použitý\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
+-msgstr "xine: locale nepodporované vašou C knižnicou\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++msgstr ""
++"Alternatívny softvérový ekvalizér, ktorý pre jednoduchú úpravu svetlosti, "
++"kontrastu a sýtosti používa vyhladávacie tabuľky (veľmi pomalé), dovoluje to "
++"naviac gamma korekciu k nastaveniu jednoduchého jasu, kontrastu a "
++"nasýtenia.\n"
++"Používa ten istý optimalizovaný MMX kód ako 'eq' ak sú všetky gamma hodnoty "
++"1.0.\n"
++"\n"
++"Parametre\n"
++" gamma\n"
++" jas\n"
++" kontrast\n"
++" sýtosť\n"
++" rgamma (gamma pre červenú zložku)\n"
++" ggamma (gamma pre zelenú zložku)\n"
++" bgamma (gamma pre modrú zložku)\n"
++"\n"
++"Rozsahy hodnôt sú 0.1 - 10 pre gammy, -2 - 2 pre kontrast (negatívne hodnoty "
++"spôsobia negatívny obraz), -1 - 1 pre jas a 0 - 3 pre sýtosť.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+
+-#: src/xine-engine/xine.c:1468
++#: src/post/planar/unsharp.c:219
+ #, fuzzy
+-msgid "media format detection strategy"
+-msgstr "Stratégia detekcie formátu médii"
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
++msgstr ""
++"Rozostrovacia maska /gausovské rozmazanie\n"
++"Jemožné nastaviť šírku a výšku matice nepárnymi veľkosťami v oboch smeroch "
++"(min = 3x3, max = 13x11 alebo 11x13, obyčajne niečo medzi 3x3 a 7x7) a "
++"pomerné množstvo ostrosti/rozmazania pridaného k obrazu (rozumný rozsah by "
++"mal byť -1.5 - 1.5).\n"
++"\n"
++"Parametre\n"
++"\n"
++" Luma_matrix_width: Šírka matice (mus'byť nepárne)\n"
++"\n"
++" Luma_matrix_height: Výška matice (musí byť nepárne)\n"
++"\n"
++" Luma_amount: Pomerné množstvo ostrosti/rozmazania "
++"(=0 vypnuté, <0 rozmazanie, >0 ostrenie)\n"
++"\n"
++" Chroma_matrix_width: Šírka matice (mus'byť nepárne)\n"
++"\n"
++" Chroma_matrix_height: Výška matice (mus'byť nepárne)\n"
++"\n"
++" Chroma_amount: Pomerné množstvo ostrosti/rozmazania "
++"(=0 vypnuté, <0 rozmazanie, >0 ostrenie)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
++"Pokročilý tvtime/odprekladací modul s detekcoiu pulldown\n"
++"Tento modul má za cieľ poskytnúť mechanizmy korekcie prekladania "
++"porovnateľné s vysoko kvalitnými progresívnymi DVD prehrávačmi a takzvanými "
++"zdvojovačmi riadkov, pre použitie s po monitormi, projektormi a inými "
++"progresívnymi zobrazovacími zariadeniami.\n"
++"\n"
++"Parametre\n"
++"\n"
++" Method: Vybrať metódu/algoritmus na použitie, pozrite nižšie na "
++"vysvetlenie metód.\n"
++"\n"
++" Enabled: Zapnutý/vypnutý modul.\n"
++"\n"
++" Pulldown: Vybrať detekčný 2-3 pulldown algoritmus. 24 snimk./s filmy ktoré "
++"boli konvertované na NTSC môžu byť konvertované a rekonštruované do "
++"originálnych (neprekladaných) snímkov.\n"
++"\n"
++" Framerate_mode: Vybraním 'full' bude odprekladané každého polsnímku do "
++"unikátneho snímku pre televíznu a vyššiu kvalitu. Táto možnosť efektívne "
++"zdvojnásobi rýchl.snímkov a vylepší plynulosť. Dodajme, že, hoci plných "
++"59.94 snímk./s nie je m,ožné dosiahnuť s neupraveným Linuxovým jadrom 2.4l "
++"(ktoré používa frekvenciu prerušenia 100Hz). Novér RedHat a 2.6 jadrá "
++"používajú vyššie nastavenie HZ (512 a 1000, v poradí) a mali by dobre "
++"fungovať.\n"
++"\n"
++" Judder_correction: Ak je povolené 2-3 pulldown a je deketovaný filmový "
++"materiál, je možné obmedziť rýchlosť snímkov na pôvodne použitú rýchlosť (24 "
++"snímkov/s). To spôsobí, že snímky budú rovnomerne rozložené v čase. Ich čas "
++"bude súhlasiť a eliminuje sa trasenie..\n"
++"\n"
++" Use_progressive_frame_flag: Dobre zvládnuté prúdy MPEG2 používajú príznak "
++"k indikáci progresívneho materiálu. Toto nastavenie riadi, či veríme či "
++"neveríme tomuto príznaku (niektoré ojedinelé chybné prúdy mpeg2 ho nastavujú "
++"zle)..\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 používa prekladaný formát obrazu, ktorý má veľmi "
++"zlé zvislé farebné rozlíšenie. Prevzorkovánie farby na vyššie rozlišení prr "
++"účely korekcie prekladania môže spôsobit vytvořenie artefaktov (napr. "
++"farebné pruhy). Túto voľbu použite k zvislému rozmazaniu farby po korekcii "
++"prekladania, čo odstráni tieto artefakty. Varovanie: náročné na CPU.\n"
++"\n"
++" Cheap_mode: Toto preskočí nákladnú konverziu obrazu YV12->YUY2 a rutiny "
++"tvtime/dscaleru budú používané, ako by stále spracovávaly obrazy YUY2. "
++"Samozrejme to nie je správne, nie všetky body budú vyhodnotené algoritmom "
++"pre rozhodovanie o oblastiach ku korekcii a farba bude zpracována oddelene. "
++"Toto dovolí luďom s nie tak rychlými strojmi, vyzkúšať si algoritmus "
++"korekcie prekladania, v kompromise mezi kvalitou a využitím CPU.\n"
++"\n"
++"Metódy odprekladania: (Nie všetky metódy sú dostupné pre všetky plataformy)\n"
++"\n"
++"(OPRAV: vysvetlenie všetkých metód, skontr. tvtime/dscaler dokum... už som "
++"lenivý)\n"
++"\n"
++"* Používa niektoré algoritmy z tvtime a dscaler projektu.\n"
+
+-#: src/xine-engine/xine.c:1487
+-#, fuzzy
+-msgid "directory for saving streams"
+-msgstr "Cesta pre ukladanie prúdov"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
++msgstr "tvtime: Žiadna metóda odprekladania nie je dostupná, končím.\n"
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
+-msgstr "dovoliť implicitné zmeny v konfigurácii (napr. cez MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++#, fuzzy
++msgid "frames per second to generate"
++msgstr "Snímkov za sekundu generovaných Goom-om"
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+-"Ak je povolené, dovolíte xine zmentiť konfiguráciu bez explicitných akcii z "
+-"vašej strany. Napríklad konfiguračné zmeny požadované z MRL alebo vložené do "
+-"playlistu budú vykonané.\n"
+-"Toto nastavenie je kritické z hľadiska bezpečnosti, lebo xine môže dostať "
+-"MRL alebo playlisty z nedôverihodných vzdialených zdrojov. Ak im dovolíte "
+-"ľubovoľne meniť vašu konfiguráciu, môžete skončiť s úplne rozhodeným xine."
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
+-msgstr "správy"
++#: src/post/goom/xine_goom.c:206
++#, fuzzy
++msgid "goom image width"
++msgstr "Šírka obrazu Goom v pixeloch"
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
+-msgstr "modul"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
++msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
+-msgstr "trace"
++#: src/post/goom/xine_goom.c:211
++#, fuzzy
++msgid "goom image height"
++msgstr "Výška obrazu Goom v pixeloch"
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
++#: src/post/goom/xine_goom.c:218
++#, fuzzy
++msgid "colorspace conversion method"
++msgstr "Metóda konverzie priestoru farieb použitá Goom-om"
++
++#: src/post/goom/xine_goom.c:219
+ msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
+-msgstr "Testovanie výkonnosti memcpy metód (menej je lepšie):\n"
++#~ msgid "audio_oss_out: open() %s failed: %s\n"
++#~ msgstr "audio_oss_out: open() %s zlyhal: %s\n"
++
++#, fuzzy
++#~ msgid "selection has no DEFAULT entry"
++#~ msgstr "výber nemá ďaľšiu položku"
++
++#~ msgid "xine video output plugin using OpenGL - TNG"
++#~ msgstr "výstupný xine video modul, ktorý používa OpenGL - TNG"
+
+ #~ msgid "device used for 5+ channel output"
+ #~ msgstr "zariadenie pre 5+ kanálový výstup"
+@@ -4538,9 +4769,6 @@
+ #~ msgid "used to inform xine about what the sound card can do"
+ #~ msgstr "použité pre informovanie xine o schopnostiach zvukovej karty"
+
+-#~ msgid "audio_oss_out: open() %s failed: %s\n"
+-#~ msgstr "audio_oss_out: open() %s zlyhal: %s\n"
+-
+ #~ msgid "OSS number N to append to audio device name /dev/dsp[N], -1 for none"
+ #~ msgstr ""
+ #~ "OSS číslo N na pridanie k názvu audio zariadenia /dev/dsp[N], -1 pre nič"
+@@ -4685,9 +4913,6 @@
+ #~ msgid "gamma correction for OpenGL driver"
+ #~ msgstr "gamma korekcia pre OpenGL ovládač"
+
+-#~ msgid "xine video output plugin using OpenGL - TNG"
+-#~ msgstr "výstupný xine video modul, ktorý používa OpenGL - TNG"
+-
+ #~ msgid "syncfb (teletux) device node"
+ #~ msgstr "uzol zariadenia syncfb (teletux)"
+
+--- ./po/xine-lib.pot 2005-02-12 22:28:44.000000000 +0000
++++ ./po/xine-lib.pot 2005-02-12 22:28:46.000000000 +0000
+@@ -7,507 +7,1090 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2004-12-25 23:52+0100\n"
++"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
++"atid=109655&group_id=9655\n"
++"POT-Creation-Date: 2005-02-06 20:39+0100\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"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Type: text/plain; charset=CHARSET\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: src/audio_out/audio_alsa_out.c:375
+-msgid "audio_alsa_out:Already open...WHY!"
++#: src/libsputext/demux_sputext.c:1506
++msgid "default duration of subtitle display in seconds"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:390
++#: src/libsputext/demux_sputext.c:1507
++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_decoder.c:900
++msgid "subtitle size"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:901
++msgid ""
++"You can adjust the subtitle size here. The setting will be evaluated "
++"relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:907
++msgid "subtitle vertical offset"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:908
++msgid ""
++"You can adjust the vertical position of the subtitle. The setting will be "
++"evaluated relative to the window size."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:914
++msgid "font for subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:915
++msgid "A font from the xine font directory to be used for the subtitle text."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:922
++msgid "encoding of the subtitles"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:923
++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 "
++"displayed as you expect, ask the creator of the subtitles what encoding was "
++"used."
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:931
++msgid "use unscaled OSD if possible"
++msgstr ""
++
++#: src/libsputext/xine_decoder.c:932
++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 "
++"does not work with all graphics hardware. The alternative is the scaled OSD, "
++"which will become blurry, if you enlarge a low resolution video to "
++"fullscreen, but it works with all graphics cards."
++msgstr ""
++
++#: src/libffmpeg/audio_decoder.c:109
+ #, c-format
+-msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
++msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:392
+-msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
++#: src/libffmpeg/audio_decoder.c:149
++#, c-format
++msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:405
++#: src/libffmpeg/audio_decoder.c:226
++msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:140
++msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:153
++msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:228
++msgid "ffmpeg_video_dec: couldn't open decoder\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:261
++msgid "ffmpeg_video_dec: direct rendering enabled\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:345
++msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:714
+ #, c-format
+-msgid ""
+-"audio_alsa_out: broken configuration for this PCM: no configurations "
+-"available: %s\n"
++msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1260
+-msgid "notify changes to the hardware mixer"
++#: src/libffmpeg/video_decoder.c:758
++#, c-format
++msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1261
++#: src/libffmpeg/video_decoder.c:1274
++msgid "MPEG-4 postprocessing quality"
++msgstr ""
++
++#: src/libffmpeg/video_decoder.c:1275
+ msgid ""
+-"When the hardware mixer changes, your application will receive a "
+-"notification so that it can update its graphical representation of the mixer "
+-"settings on the fly."
++"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 "
++"result in image defects like block artifacts. For high quality content, too "
++"heavy post processing can actually make the image worse by blurring it too "
++"much."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1322
++#: src/libffmpeg/dvaudio_decoder.c:303
+ #, c-format
+-msgid "snd_lib_error_set_handler() failed: %d"
++msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1329
+-msgid "sound card can do mmap"
++#: src/libffmpeg/xine_encoder.c:164
++msgid "libavcodec mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1330
++#: src/libffmpeg/xine_encoder.c:165
+ msgid ""
+-"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
+-"You can try enabling it and check, if everything works. If it does, this "
+-"will increase performance."
++"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
++"Higher values will increase quality and CPU usage.\n"
++"This setting is only considered, when constant quality mode is disabled."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1339
+-msgid "device used for mono output"
++#: src/libffmpeg/xine_encoder.c:172
++msgid "constant quality mode"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1340
++#: src/libffmpeg/xine_encoder.c:173
+ msgid ""
+-"xine will use this alsa device to output mono sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When enabled, libavcodec will use a constant quality mode by dynamically "
++"compressing the images based on their complexity. When disabled, libavcodec "
++"will use constant bitrate mode."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1348
+-msgid "device used for stereo output"
++#: src/libffmpeg/xine_encoder.c:180
++msgid "minimum compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1349
++#: src/libffmpeg/xine_encoder.c:181
++msgid "The minimum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:186
++msgid "maximum quantizer"
++msgstr ""
++
++#: src/libffmpeg/xine_encoder.c:187
++msgid "The maximum compression to apply to an image in constant quality mode."
++msgstr ""
++
++#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
++msgid "HELP! a mono-only audio driver?!\n"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:780
++msgid "A/52 volume"
++msgstr ""
++
++#: src/liba52/xine_decoder.c:781
+ msgid ""
+-"xine will use this alsa device to output stereo sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"With A/52 audio, you can modify the volume at the decoder level. This has "
++"the advantage of the audio being already decoded for the specified volume, "
++"so later operations like channel downmixing will work on an audio stream of "
++"the given volume."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1357
+-msgid "device used for 4-channel output"
++#: src/liba52/xine_decoder.c:789
++msgid "use A/52 dynamic range compression"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1358
++#: src/liba52/xine_decoder.c:790
+ msgid ""
+-"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"Dynamic range compression limits the dynamic range of the audio. This means "
++"making the loud sounds softer, and the soft sounds louder, so you can more "
++"easily listen to the audio in a noisy environment without disturbing anyone."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1367 src/audio_out/audio_alsa_out.c:1377
+-msgid "device used for 5.1-channel output"
++#: src/liba52/xine_decoder.c:797
++msgid "downmix audio to 2 channel surround stereo"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1368
++#: src/liba52/xine_decoder.c:798
+ msgid ""
+-"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
+-"sound.\n"
+-"See the alsa documentation for information on alsa devices."
++"When you want to listen to multichannel surround sound, but you have only "
++"two speakers or a surround decoder or amplifier which does some sort of "
++"matrix surround decoding like prologic, you should enable this option so "
++"that the additional channels are mixed into the stereo signal."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1378
++#: src/xine-utils/memcpy.c:481
++msgid "memcopy method used by xine"
++msgstr ""
++
++#: src/xine-utils/memcpy.c:482
+ msgid ""
+-"xine will use this alsa device to output undecoded digital surround sound. "
+-"This can be used be external surround decoders.\n"
+-"See the alsa documentation for information on alsa devices."
++"The copying of large memory blocks is one of the most expensive operations "
++"on todays computers. Therefore xine provides various tuned methods to do "
++"this copying. Usually, the best method is detected automatically."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1398
++#: src/xine-utils/memcpy.c:509
++msgid "Benchmarking memcpy methods (smaller is better):\n"
++msgstr ""
++
++#: src/libfaad/xine_decoder.c:90
++msgid "libfaad: libfaad faacDecOpen() failed.\n"
++msgstr ""
++
++#: src/libfaad/xine_decoder.c:99
++msgid "libfaad: libfaad faacDecInit2 failed.\n"
++msgstr ""
++
++#: src/libfaad/xine_decoder.c:123
++msgid "libfaad: libfaad faacDecInit failed.\n"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:478
++msgid "font for external subtitles"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:484
++msgid "subtitle vertical offset (relative window size)"
++msgstr ""
++
++#: src/libspucmml/xine_decoder.c:530
++msgid "encoding of subtitles"
++msgstr ""
++
++#: src/libspudvb/xine_decoder.c:622
++msgid "dvbsub: cannot create timer thread\n"
++msgstr ""
++
++#: src/libmusepack/xine_decoder.c:237
+ #, c-format
+-msgid "snd_pcm_open() failed:%d:%s\n"
++msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1400
+-msgid ">>> Check if another program already uses PCM <<<\n"
++#: src/libmusepack/xine_decoder.c:311
++msgid "libmusepack: data after last frame ignored\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1426 src/audio_out/audio_oss_out.c:919
+-msgid "speaker arrangement"
++#: src/libmusepack/xine_decoder.c:322
++msgid "libmusepack: mpc_decoder_initialise failed\n"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1427 src/audio_out/audio_oss_out.c:920
++#: src/libmusepack/xine_decoder.c:342 src/libmusepack/xine_decoder.c:357
++#, c-format
++msgid "libmusepack: mpc_decoder_decode failed: %d\n"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:192
++msgid "display closed captions in MPEG-2 streams"
++msgstr ""
++
++#: src/libspucc/xine_decoder.c:193
+ msgid ""
+-"Select how your speakers are arranged, this determines which speakers xine "
+-"uses for sound output. The individual values are:\n"
+-"\n"
+-"Mono 1.0: You have only one speaker.\n"
+-"Stereo 2.0: You have two speakers for left and right channel.\n"
+-"Headphones 2.0: You use headphones.\n"
+-"Stereo 2.1: You have two speakers for left and right channel, and one "
+-"subwoofer for the low frequencies.\n"
+-"Surround 3.0: You have three speakers for left, right and rear channel.\n"
+-"Surround 4.0: You have four speakers for front left and right and rear left "
+-"and right channels.\n"
+-"Surround 4.1: You have four speakers for front left and right and rear left "
+-"and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 5.0: You have five speakers for front left, center and right and "
+-"rear left and right channels.\n"
+-"Surround 5.1: You have five speakers for front left, center and right and "
+-"rear left and right channels, and one subwoofer for the low frequencies.\n"
+-"Surround 6.0: You have six speakers for front left, center and right and "
+-"rear left, center and right channels.\n"
+-"Surround 6.1: You have six speakers for front left, center and right and "
+-"rear left, center and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Surround 7.1: You have seven speakers for front left, center and right, left "
+-"and right and rear left and right channels, and one subwoofer for the low "
+-"frequencies.\n"
+-"Pass Through: Your sound system will receive undecoded digital sound from "
+-"xine. You need to connect a digital surround decoder capable of decoding the "
+-"formats you want to play to your sound card's digital output."
++"Closed Captions are subtitles mostly meant to help the hearing impaired."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1456
+-msgid "audio_alsa_out : supported modes are "
++#: src/libspucc/xine_decoder.c:200
++msgid "closed-captioning foreground/background scheme"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1459
+-msgid "8bit "
++#: src/libspucc/xine_decoder.c:201
++msgid "Choose your favourite rendering of the closed captions."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1464
+-msgid "16bit "
++#: src/libspucc/xine_decoder.c:207
++msgid "standard closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1468
+-msgid "24bit "
++#: src/libspucc/xine_decoder.c:208
++msgid "Choose the font for standard closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1472
+-msgid "32bit "
++#: src/libspucc/xine_decoder.c:214
++msgid "italic closed captioning font"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1476
+-msgid "mono "
++#: src/libspucc/xine_decoder.c:215
++msgid "Choose the font for italic closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1480
+-msgid "stereo "
++#: src/libspucc/xine_decoder.c:221
++msgid "closed captioning font size"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1485
+-msgid "4-channel "
++#: src/libspucc/xine_decoder.c:222
++msgid "Choose the font size for closed captions text."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1488
+-msgid "(4-channel not enabled in xine config) "
++#: src/libspucc/xine_decoder.c:226
++msgid "center-adjust closed captions"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1493
+-msgid "4.1-channel "
++#: src/libspucc/xine_decoder.c:227
++msgid ""
++"When enabled, closed captions will be positioned by the center of the "
++"individual lines."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1496
+-msgid "(4.1-channel not enabled in xine config) "
++#: src/video_out/video_out_directfb.c:576
++msgid "xine video output plugin using the DirectFB library."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1501
+-msgid "5-channel "
++#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_pgx64.c:1468
++#: src/video_out/video_out_xxmc.c:2306 src/video_out/video_out_xv.c:1421
++msgid "video overlay colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1504
+-msgid "(5-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_vidix.c:1155
++#: src/video_out/video_out_vidix.c:1162 src/video_out/video_out_vidix.c:1169
++#: src/video_out/video_out_xxmc.c:2307 src/video_out/video_out_xv.c:1422
++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."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1509
+-msgid "5.1-channel "
++#: src/video_out/video_out_xvmc.c:1514 src/video_out/video_out_xxmc.c:2315
++#: src/video_out/video_out_xv.c:1430
++msgid "autopaint colour key"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1512
+-msgid "(5.1-channel not enabled in xine config) "
++#: src/video_out/video_out_xvmc.c:1515 src/video_out/video_out_xxmc.c:2316
++#: src/video_out/video_out_xv.c:1431
++msgid "Make Xv autopaint its colorkey."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1534
+-msgid "a/52 and DTS pass-through\n"
++#: src/video_out/video_out_xvmc.c:1520 src/video_out/video_out_vidix.c:1011
++#: src/video_out/video_out_xxmc.c:2339 src/video_out/video_out_xv.c:1454
++#: src/video_out/video_out_opengl.c:1375
++msgid "enable double buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1537
+-msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
++#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_vidix.c:1012
++#: src/video_out/video_out_xxmc.c:2340 src/video_out/video_out_xv.c:1455
++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/audio_out/audio_alsa_out.c:1544
+-msgid "alsa mixer device"
++#: src/video_out/video_out_xvmc.c:1583 src/video_out/video_out_xv.c:1522
++msgid "deinterlace method (deprecated)"
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1545
++#: src/video_out/video_out_xvmc.c:1584 src/video_out/video_out_xv.c:1523
+ msgid ""
+-"xine will use this alsa mixer device to change the volume.\n"
+-"See the alsa documentation for information on alsa devices."
++"This config setting is deprecated. You should use the new deinterlacing post "
++"processing settings instead.\n"
++"\n"
++"From the old days of analog television, where the even and odd numbered "
++"lines of a video frame would be displayed at different times comes the idea "
++"to increase motion smoothness by also recording the lines at different "
++"times. This is called \"interlacing\". But unfortunately, todays displays "
++"show the even and odd numbered lines as one complete frame all at the same "
++"time (called \"progressive display\"), which results in ugly frame errors "
++"known as comb artifacts. Software deinterlacing is an approach to reduce "
++"these artifacts. The individual values are:\n"
++"\n"
++"none\n"
++"Disables software deinterlacing.\n"
++"\n"
++"bob\n"
++"Interpolates between the lines for moving parts of the image.\n"
++"\n"
++"weave\n"
++"Similar to bob, but with a tendency to preserve the full resolution, better "
++"for high detail in low movement scenes.\n"
++"\n"
++"greedy\n"
++"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
++"\n"
++"onefield\n"
++"Always interpolates and reduces vertical resolution.\n"
++"\n"
++"onefieldxv\n"
++"Same as onefield, but does the interpolation in hardware.\n"
++"\n"
++"linearblend\n"
++"Applies a slight vertical blur to remove the comb artifacts. Good results "
++"with medium CPU usage."
+ msgstr ""
+
+-#: src/audio_out/audio_alsa_out.c:1613
+-msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
++#: src/video_out/video_out_xvmc.c:1652
++msgid "xine video output plugin using the XvMC X video extension"
+ msgstr ""
+
+-#: src/audio_out/audio_arts_out.c:369
+-msgid "xine audio output plugin using kde artsd"
++#: src/video_out/video_out_xvmc.c:1698
++msgid "video_out_xvmc: XvMC extension not present.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_coreaudio_out.c:452
+-msgid "xine output plugin for Coreaudio/Mac OS X"
++#: src/video_out/video_out_xvmc.c:1797
++msgid ""
++"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
++"port.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_directx_out.c:827
+-msgid "xine audio output plugin for win32 using directx"
++#: src/video_out/video_out_xvmc.c:1806
++#, c-format
++msgid ""
++"video_out_xvmc: using Xv port %ld from adaptor %s\n"
++" for hardware colorspace conversion and scaling\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:167
++#: src/video_out/video_out_xvmc.c:1811
++msgid " idct and motion compensation acceleration \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1813
++msgid " motion compensation acceleration only\n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1815
++msgid " no XvMC support \n"
++msgstr ""
++
++#: src/video_out/video_out_xvmc.c:1816
+ #, c-format
+-msgid "audio_esd_out: connecting to ESD server %s: %s\n"
++msgid " With Overlay = %d; UnsignedIntra = %d.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:499
+-msgid "audio_esd_out: connecting to esd server...\n"
++#: src/video_out/video_out_vidix.c:989
++msgid "red intensity"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:511
++#: src/video_out/video_out_vidix.c:989
++msgid "The intensity of the red colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "green intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:994
++msgid "The intensity of the green colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "blue intensity"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:999
++msgid "The intensity of the blue colour components."
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1059
++msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1070
++msgid "video_out_vidix: adaptor supports the yv12 format\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1086
++msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1094
++msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++msgstr ""
++
++#: src/video_out/video_out_vidix.c:1107
+ #, c-format
+-msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
++msgid "video_out_vidix: using driver: %s by %s\n"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:536
+-msgid "esd audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_vidix.c:1154
++msgid "video overlay colour key red component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:537 src/audio_out/audio_oss_out.c:857
+-msgid ""
+-"If you experience audio being not in sync with the 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."
++#: src/video_out/video_out_vidix.c:1161
++msgid "video overlay colour key green component"
+ msgstr ""
+
+-#: src/audio_out/audio_esd_out.c:569
+-msgid "xine audio output plugin using esound"
++#: src/video_out/video_out_vidix.c:1168
++msgid "video overlay colour key blue component"
+ msgstr ""
+
+-#: src/audio_out/audio_file_out.c:362
+-msgid "xine file audio output plugin"
++#: src/video_out/video_out_vidix.c:1200
++msgid "xine video output plugin using libvidix for x11"
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:385
+-msgid "irixal audio output maximum gap length"
++#: src/video_out/video_out_vidix.c:1235 src/video_out/video_out_fb.c:796
++msgid "framebuffer device name"
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:386
++#: src/video_out/video_out_vidix.c:1236 src/video_out/video_out_fb.c:797
+ msgid ""
+-"You can specify the maximum offset between audio and video xine will "
+-"tolerate before trying to resync them.\n"
+-"The unit of this value is one PTS tick, which is the 90000th part of a "
+-"second."
++"Specifies the file name for the framebuffer device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
+ msgstr ""
+
+-#: src/audio_out/audio_irixal_out.c:415
+-msgid "xine audio output plugin using IRIX libaudio"
++#: src/video_out/video_out_vidix.c:1282
++msgid "xine video output plugin using libvidix for linux frame buffer"
+ msgstr ""
+
+-#: src/audio_out/audio_none_out.c:223
+-msgid "xine dummy audio output plugin"
++#: src/video_out/x11osd.c:277
++msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:191
++#: src/video_out/x11osd.c:290
++msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
++msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++msgstr ""
++
++#: src/video_out/x11osd.c:349
+ #, c-format
+-msgid "audio_oss_out: Opening audio device %s: %s\n"
++msgid "x11osd: unscaled overlay created (%s mode).\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:213
++#: src/video_out/video_out_aa.c:309
++msgid "xine video output plugin using the ascii-art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:282
++msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:300
++#, c-format
++msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:307
+ #, c-format
+ msgid ""
+-"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
++"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:225
++#: src/video_out/video_out_pgx64.c:320
+ #, c-format
+-msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
++msgid ""
++"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:736
+-msgid "OSS audio device name"
++#: src/video_out/video_out_pgx64.c:341
++msgid ""
++"video_out_pgx64: Error: video overlay on this screen is already in use\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:737
++#: src/video_out/video_out_pgx64.c:356
++msgid "video_out_pgx64: Error: unable to set window properties\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:812
++msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:844
++msgid "video_out_pgx64: Error: insuffucient video memory\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:860
++msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1401
++msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1469
+ msgid ""
+-"Specifies the base part of the audio device name, to which the OSS device "
+-"number is appended to get the full device name.\n"
+-"Select \"auto\" if you want xine to auto detect the corret setting."
++"The colour key is used to tell the graphics card where it can overlay the "
++"video image. Try using different values if you see the video showing through "
++"other windows."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:744
+-msgid "OSS audio device number, -1 for none"
++#: src/video_out/video_out_pgx64.c:1474
++msgid "video brightness"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:745
++#: src/video_out/video_out_pgx64.c:1475
++msgid "The brightness of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1478
++msgid "video saturation"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1479
++msgid "The saturation of the video image."
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1482
++msgid "enable chroma keying"
++msgstr ""
++
++#: src/video_out/video_out_pgx64.c:1483
+ msgid ""
+-"The full audio device name is created by concatenating the OSS device name "
+-"and the audio device number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"audio device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"Draw OSD graphics on top of the overlay colour key rather than blend them "
++"into each frame."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:754
+-msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
++#: src/video_out/video_out_pgx64.c:1486
++msgid "enable multi-buffering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:757
+-msgid "audio_oss_out: Auto probe for audio device failed\n"
++#: src/video_out/video_out_pgx64.c:1487
++msgid ""
++"Multi buffering increases performance at the expense of using more graphics "
++"memory."
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:773
++#. printf("video_out_stk: get_description()\n");
++#: src/video_out/video_out_stk.c:452
++msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:601
++msgid ""
++"video_out_xxmc: XvShmCreateImage failed\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:611
++msgid ""
++"video_out_xxmc: XvShmCreateImage returned a zero size\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:619
+ #, c-format
+-msgid "audio_oss_out: using device >%s<\n"
++msgid ""
++"video_out_xxmc: shared memory error in shmget: %s\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#: src/video_out/video_out_xxmc.c:651
++msgid ""
++"video_out_xxmc: x11 error during shared memory XImage creation\n"
++"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2158
++msgid "video_out_xxmc: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2195
++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:2204
+ #, c-format
+ msgid ""
+-"audio_oss_out: opening audio device %s failed:\n"
+-"%s\n"
++"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:800
+-msgid "a/v sync method to use by OSS"
++#: src/video_out/video_out_xxmc.c:2323 src/video_out/video_out_xv.c:1438
++msgid "bilinear scaling mode"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:801
++#: src/video_out/video_out_xxmc.c:2324 src/video_out/video_out_xv.c:1439
+ msgid ""
+-"xine can use different methods to keep audio and video synchronized. Which "
+-"setting works best depends on the OSS driver and sound hardware you are "
+-"using. Try the various methods, if you experience sync problems.\n"
+-"\n"
+-"The meaning of the values is as follows:\n"
+-"\n"
+-"auto\n"
+-"xine attempts to automatically detect the optimal setting\n"
+-"\n"
+-"getodelay\n"
+-"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
+-"driver claims not to support realtime playback\n"
+-"\n"
+-"getoptr\n"
+-"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
+-"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"Selects the bilinear scaling mode for Permedia cards. The individual values "
++"are:\n"
+ "\n"
+-"softsync\n"
+-"uses software synchronization with the system clock; audio and video can get "
+-"severely out of sync if the system clock speed does not precisely match your "
+-"sound card's playback speed\n"
++"Permedia 2\n"
++"0 - disable bilinear filtering\n"
++"1 - enable bilinear filtering\n"
+ "\n"
+-"probebuffer\n"
+-"probes the sound card buffer size on initialization to calculate the latency "
+-"for a/v sync; try this if your system does not support any of the realtime "
+-"ioctls and you experience sync errors after long playback"
++"Permedia 3\n"
++"0 - disable bilinear filtering\n"
++"1 - horizontal linear filtering\n"
++"2 - enable full bilinear filtering"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:849
++#: src/video_out/video_out_xxmc.c:2380
++msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2385
++msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2408 src/video_out/video_out_xv.c:1515
++msgid "pitch alignment workaround"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2409 src/video_out/video_out_xv.c:1516
++msgid "Some buggy video drivers need a workaround to function properly."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2414
++msgid "Make XvMC allocate more frames for better buffering."
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2415
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"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/audio_out/audio_oss_out.c:856
+-msgid "OSS audio output latency (adjust a/v sync)"
++#: src/video_out/video_out_xxmc.c:2421
++msgid "Unichrome cpu save"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:870
++#: src/video_out/video_out_xxmc.c:2422
+ msgid ""
+-"audio_oss_out: Audio driver realtime sync disabled...\n"
+-"audio_oss_out: ...probing output buffer size: "
++"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/audio_out/audio_oss_out.c:887
++#: src/video_out/video_out_xxmc.c:2428
++msgid "Fix buggy NVIDIA XvMC subpicture colors"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2429
++msgid ""
++"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
++"look blue and vice versa. This option provides a workaround.\n"
++msgstr ""
++
++#: src/video_out/video_out_xxmc.c:2481 src/video_out/video_out_xv.c:1579
++msgid "xine video output plugin using the MIT X video extension"
++msgstr ""
++
++#: src/video_out/video_out_xshm.c:190
++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:206
+ #, c-format
+ msgid ""
+-"%d bytes\n"
+-"audio_oss_out: ...there may be audio/video synchronization issues\n"
++"video_out_xshm: %s: allocating image\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1016
+-msgid "OSS audio mixer number, -1 for none"
++#: src/video_out/video_out_xshm.c:216
++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/audio_out/audio_oss_out.c:1017
++#: src/video_out/video_out_xshm.c:233
+ msgid ""
+-"The full mixer device name is created by taking the OSS device name, "
+-"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
+-"If you do not need a number because you are happy with your system's default "
+-"mixer device, set this to -1.\n"
+-"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
+-"audio device name is set to \"auto\"."
++"video_out_xshm: x11 error during shared memory XImage creation\n"
++"video_out_xshm: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1074
++#: src/video_out/video_out_xshm.c:1138
+ #, c-format
+-msgid "audio_oss_out: open() mixer %s failed: %s\n"
++msgid ""
++"\n"
++"\n"
++"WARNING: current display depth is %d. For better performance\n"
++"a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+
+-#: src/audio_out/audio_oss_out.c:1147
+-msgid "xine audio output plugin using oss-compliant audio devices/drivers"
++#: src/video_out/video_out_xshm.c:1151
++msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:489
+-msgid "device used for polypaudio"
++#: src/video_out/video_out_xshm.c:1233
++msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:490
+-msgid "use 'server[:sink]' for setting the polypaudio sink device."
++#: src/video_out/video_out_xshm.c:1241 src/video_out/video_out_fb.c:887
++#: src/video_out/video_out_opengl.c:1329
++msgid "brightness correction"
+ msgstr ""
+
+-#: src/audio_out/audio_polyp_out.c:535
+-msgid "xine audio output plugin using polypaudio sound server"
++#: src/video_out/video_out_xshm.c:1242 src/video_out/video_out_fb.c:888
++#: src/video_out/video_out_opengl.c:1330
++msgid ""
++"The brightness correction can be used to lighten or darken the image. It "
++"changes the blacklevel without modifying the contrast, but it limits the "
++"tonal range."
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
++#: src/video_out/video_out_xshm.c:1274 src/video_out/video_out_opengl.c:1423
++msgid "xine video output plugin using the MIT X shared memory extension"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:762
+ #, c-format
+-msgid "audio_sun_out: opening audio device %s failed: %s\n"
++msgid ""
++"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
++" Check 'fbset -i' or try 'fbset -depth 16'.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:889
+-msgid "Sun audio device name"
++#: src/video_out/video_out_fb.c:871
++msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:890
++#: src/video_out/video_out_fb.c:932
++#, c-format
++msgid "video_out_fb: %d video RAM buffers are available.\n"
++msgstr ""
++
++#: src/video_out/video_out_fb.c:938
++#, c-format
+ msgid ""
+-"Specifies the file name for the Sun audio device to be used.\n"
+-"This setting is security critical, because when changed to a different file, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper Sun audio device."
++"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
++"buffers\n"
++" are available which is less than the recommended %d buffers. Lowering\n"
++" the frame buffer resolution might help.\n"
+ msgstr ""
+
+-#: src/audio_out/audio_sun_out.c:970
+-msgid "xine audio output plugin using sun-compliant audio devices/drivers"
++#: src/video_out/video_out_fb.c:949
++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/demuxers/demux_asf.c:468
++#: src/video_out/video_out_fb.c:1016
+ #, c-format
+-msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgid ""
++"WARNING: video_out_fb: current display depth is %d. For better performance\n"
++" a depth of 16 bpp is recommended!\n"
++"\n"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:470
+-msgid "Media stream scrambled/encrypted"
++#: src/video_out/video_out_fb.c:1047
++msgid "Xine video output plugin using the Linux frame buffer device"
+ msgstr ""
+
+-#: src/demuxers/demux_asf.c:1716
++#: src/video_out/video_out_sdl.c:479
++msgid "use hardware acceleration if available"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:480
++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:522
++msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:559
++msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++msgstr ""
++
++#: src/video_out/video_out_sdl.c:570
++msgid "xine video output plugin using the Simple Direct Media Layer"
++msgstr ""
++
++#: src/video_out/video_out_directx.c:1223
++msgid "xine video output plugin for win32 using directx"
++msgstr ""
++
++#: src/video_out/video_out_none.c:277
++msgid "xine video output plugin which displays nothing"
++msgstr ""
++
++#: src/video_out/video_out_caca.c:311
++msgid "xine video output plugin using the Color AsCii Art library"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:191
++msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++msgstr ""
++
++#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+ #, c-format
+-msgid "demux_asf: Wrong ASX version: %s\n"
++msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
+-msgid "Restoring index..."
++#: src/video_out/video_out_pgx32.c:217
++#, c-format
++msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1699
++#: src/video_out/alphablend.c:1767
++msgid "disable exact alpha blending of overlays"
++msgstr ""
++
++#: src/video_out/alphablend.c:1768
++msgid ""
++"If you experience a performance impact when an On Screen Display or other "
++"overlays like DVD subtitles are active, then you might want to enable this "
++"option.\n"
++"The result is that alpha blending of overlays is less accurate than before, "
++"but the CPU usage will be decreased as well."
++msgstr ""
++
++#: src/video_out/video_out_xv.c:287
++msgid ""
++"video_out_xv: XvShmCreateImage failed\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:297
++msgid ""
++"video_out_xv: XvShmCreateImage returned a zero size\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:305
+ #, c-format
+-msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIiMAX>\n"
++msgid ""
++"video_out_xv: shared memory error in shmget: %s\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:841
+-msgid "demux_avi: avi index is broken\n"
++#: src/video_out/video_out_xv.c:337
++msgid ""
++"video_out_xv: x11 error during shared memory XImage creation\n"
++"video_out_xv: => not using MIT Shared Memory extension.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_avi.c:849
++#: src/video_out/video_out_xv.c:1267
++msgid "video_out_xv: Xv extension not present.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:1304
++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:1313
+ #, c-format
+-msgid "demux_avi: failed to seek to the next chunk (pos %<PRIiMAX>)\n"
++msgid ""
++"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
++"conversion and scaling.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:1488
++msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_xv.c:1493
++msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:282
++msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:298
++msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:936
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:941
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:946
++msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:952
++msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:959
++msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:964
++msgid ""
++"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
++"RGB565)\n"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:983
++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:1007
++msgid "default number of frame repetitions"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1008
++msgid ""
++"This specifies how many times a single video frame will be displayed "
++"consecutively."
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1056
++msgid ""
++"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1073
++msgid "SyncFB device name"
++msgstr ""
++
++#: src/video_out/video_out_syncfb.c:1074
++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, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper framebuffer device."
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1352
++msgid "OpenGL renderer"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1353
++msgid ""
++"The OpenGL plugin provides several render modules:\n"
++"\n"
++"2D_Textures\n"
++"This module downloads the images as 2D textures and renders a textured "
++"slice.\n"
++"This is typically the fastest method.\n"
++"\n"
++"Image_Pipeline\n"
++"This module uses glDraw() to render the images.\n"
++"Only accelerated on few drivers.\n"
++"Does not interpolate on scaling.\n"
++"\n"
++"Cylinder\n"
++"Shows images on a rotating cylinder. Nice effect :)\n"
++"\n"
++"Environment_Mapped_Torus\n"
++"Show images reflected in a spinning torus. Way cool =)"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1369
++msgid "OpenGL minimum framerate"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1370
++msgid ""
++"Minimum framerate for animated render routines.\n"
++"Ignored for static render routines.\n"
++msgstr ""
++
++#: src/video_out/video_out_opengl.c:1376
++msgid ""
++"For OpenGL double buffering does not only remove tearing artifacts,\n"
++"it also reduces flickering a lot.\n"
++"It should not have any performance impact."
++msgstr ""
++
++#: src/demuxers/demux_mpc.c:185
++msgid "demux_mpc: frame too big for buffer"
++msgstr ""
++
++#: src/demuxers/demux_ogg.c:802
++msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+ msgstr ""
+
+ #: src/demuxers/demux_film.c:188
+@@ -518,19 +1101,15 @@
+ msgid "unrecognized FILM chunk\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:235
+-#, c-format
+-msgid "iff-8svx/16sv: unknown compression: %d\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_iff.c:369
++#: src/demuxers/demux_voc.c:105
+ #, c-format
+-msgid "iff-ilbm: unknown compression: %d\n"
++msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+-#: src/demuxers/demux_iff.c:570
++#: src/demuxers/demux_voc.c:120
+ #, c-format
+-msgid "iff: unknown Chunk: %s\n"
++msgid ""
++"unknown VOC compression type (0x%02X); please report to xine developers\n"
+ msgstr ""
+
+ #: src/demuxers/demux_mpeg_block.c:296
+@@ -556,6 +1135,29 @@
+ "encrypted (encryption mode %d)\n"
+ msgstr ""
+
++#: src/demuxers/demux_asf.c:470
++#, c-format
++msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:472
++msgid "Media stream scrambled/encrypted"
++msgstr ""
++
++#: src/demuxers/demux_asf.c:1738
++#, c-format
++msgid "demux_asf: Wrong ASX version: %s\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:104
++msgid "demux_snd: bad header parameters\n"
++msgstr ""
++
++#: src/demuxers/demux_snd.c:149
++#, c-format
++msgid "demux_snd: unsupported audio type: %d\n"
++msgstr ""
++
+ #: src/demuxers/demux_mpeg_pes.c:324
+ #, c-format
+ msgid ""
+@@ -586,28 +1188,22 @@
+ "xine developers.\n"
+ msgstr ""
+
+-#: src/demuxers/demux_ogg.c:802
+-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+-msgstr ""
+-
+-#: src/demuxers/demux_snd.c:104
+-msgid "demux_snd: bad header parameters\n"
++#: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:656
++msgid "Restoring index..."
+ msgstr ""
+
+-#: src/demuxers/demux_snd.c:149
++#: src/demuxers/demux_avi.c:642 src/demuxers/demux_avi.c:1695
+ #, c-format
+-msgid "demux_snd: unsupported audio type: %d\n"
++msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n"
+ msgstr ""
+
+-#: src/demuxers/demux_voc.c:105
+-#, c-format
+-msgid "unknown VOC block type (0x%02X); please report to xine developers\n"
++#: src/demuxers/demux_avi.c:842
++msgid "demux_avi: avi index is broken\n"
+ msgstr ""
+
+-#: src/demuxers/demux_voc.c:120
++#: src/demuxers/demux_avi.c:850
+ #, c-format
+-msgid ""
+-"unknown VOC compression type (0x%02X); please report to xine developers\n"
++msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n"
+ msgstr ""
+
+ #: src/demuxers/demux_wc3movie.c:190
+@@ -619,593 +1215,522 @@
+ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:32
+-msgid "DXR3 device number"
++#: src/demuxers/demux_iff.c:235
++#, c-format
++msgid "iff-8svx/16sv: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3.h:33
+-msgid ""
+-"If you have more than one DXR3 in your computer, you can specify which one "
+-"to use here."
++#: src/demuxers/demux_iff.c:369
++#, c-format
++msgid "iff-ilbm: unknown compression: %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:253
++#: src/demuxers/demux_iff.c:570
+ #, c-format
+-msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
++msgid "iff: unknown Chunk: %s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_spu.c:663
+-msgid "requested button not available\n"
++#: src/libxinevdec/bitplane.c:1271
++msgid "bitplane: error doing ByteRun1 decompression\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:250
+-#, c-format
+-msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
++#: src/libxinevdec/bitplane.c:1330
++msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:256
+-msgid "use Pan & Scan info"
++#: src/libxinevdec/bitplane.c:1337
++msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:257
+-msgid ""
+-"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
+-"encoded material. You can specify here, how to handle such content.\n"
+-"\n"
+-"only when forced\n"
+-"Use Pan & Scan only, when the content you are playing enforces it.\n"
+-"\n"
+-"use MPEG hint\n"
+-"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
+-"\n"
+-"use DVB hint\n"
+-"Enable Pan & Scan based on information embedded in DVB streams. This makes "
+-"use of the Active Format Descriptor (AFD) used in some European DVB channels."
++#: src/libxinevdec/bitplane.c:1387
++msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:276
+-msgid "try to sync video every frame"
++#: src/libxinevdec/bitplane.c:1393
++msgid "bitplane: This anim-type is not supported at the moment\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:277
+-msgid ""
+-"Tries to set a synchronization timestamp for every frame. Normally this is "
+-"not necessary, because sync is sufficent even when the timestamp is set only "
+-"every now and then.\n"
+-"This is relevant for progressive video only (most PAL films)."
++#: src/libw32dll/w32codec.c:586
++#, c-format
++msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:283
+-msgid "use smooth play mode"
++#: src/libw32dll/w32codec.c:595
++#, c-format
++msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:284
+-msgid "Enabling this option will utilise a smoother play mode."
++#: src/libw32dll/w32codec.c:628
++#, c-format
++msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:287
+-msgid "correct frame durations in broken streams"
++#: src/libw32dll/w32codec.c:639
++#, c-format
++msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:288
++#: src/libw32dll/w32codec.c:685
++#, c-format
+ msgid ""
+-"Enables a small logic that corrects the frame durations of some mpeg streams "
+-"with wrong framerate codes. Currently a correction for NTSC streams "
+-"erroneously labeled as PAL streams is implemented. Enable only, when you "
+-"encounter such streams."
++"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:547
++#: src/libw32dll/w32codec.c:696
+ #, c-format
+-msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
++msgid ""
++"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:615
+-msgid "dxr3_decode_video: write to device would block. flushing\n"
++#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
++#, c-format
++msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:619
+-#, c-format
+-msgid "dxr3_decode_video: video device write failed (%s)\n"
++#: src/libw32dll/w32codec.c:1213
++msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:734
++#: src/libw32dll/w32codec.c:1216
+ #, c-format
+-msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
++msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_decode_video.c:762
+-msgid ""
+-"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
++#: src/libw32dll/w32codec.c:1235
++msgid "w32codec: Error initializing DirectShow Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:125
+-msgid "dxr3_mpeg_encoder: failed to init librte\n"
++#: src/libw32dll/w32codec.c:1253
++msgid "w32codec: Error initializing DMO Audio\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:160
++#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
++#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
++msgid "path to Win32 codecs"
++msgstr ""
++
++#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+ msgid ""
+-"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
+-"16\n"
++"If you have the Windows or Apple Quicktime codec packs installed, specify "
++"the path the codec directory here. If xine can find the Windows or Apple "
++"Quicktime codecs, it will use them to decode various Windows Media and "
++"Quicktime streams for you. Consult the xine FAQ for more information on how "
++"to install the codecs."
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:170
+-msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
++#: src/input/input_rtp.c:182
++#, c-format
++msgid "socket(): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:181
+-msgid "dxr3_mpeg_encoder: could not create codec.\n"
++#: src/input/input_rtp.c:192
++msgid "IP address specified is multicast\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:189
+-msgid "rte mpeg output bitrate (kbit/s)"
++#: src/input/input_rtp.c:201
++#, c-format
++msgid "setsockopt(SO_RCVBUF): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:190
+-msgid ""
+-"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
+-"mode. Higher values will increase quality and CPU usage."
++#: src/input/input_rtp.c:209
++#, c-format
++msgid "setsockopt(SO_REUSEADDR): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:234
++#: src/input/input_rtp.c:216
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
++msgid "bind(): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:242
++#: src/input/input_rtp.c:236
+ #, c-format
+-msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
++msgid "Can't find address for iface %s:%s\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:372
+-msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
++#: src/input/input_rtp.c:254
++#, c-format
++msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:387
+-msgid "fame mpeg encoding quality"
++#: src/input/input_rtp.c:276
++#, c-format
++msgid "unable to resolve '%s'.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_mpeg_encoders.c:388
+-msgid ""
+-"The encoding quality of the libfame mpeg encoder library. Lower is faster "
+-"but gives noticeable artifacts. Higher is better but slower."
++#: src/input/input_rtp.c:286
++#, c-format
++msgid "unable to bind to '%s'.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_scr.c:98
+-msgid "SCR plugin priority"
++#: src/input/input_rtp.c:314
++#, c-format
++msgid "recv(): %s.\n"
+ msgstr ""
+
+-#: src/dxr3/dxr3_scr.c:99
+-msgid ""
+-"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
+-"system timer will be used. Values greater 5 force to use DXR3's internal "
+-"clock as sync source."
++#: src/input/input_rtp.c:602
++msgid "RTP: stopping reading thread...\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:260
+-msgid "swap odd and even lines"
++#: src/input/input_rtp.c:605
++msgid "RTP: reading thread terminated\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:261
+-msgid ""
+-"Swaps the even and odd field of the image.\n"
+-"Enable this option for non-MPEG material which produces a vertical jitter on "
+-"screen."
++#: src/input/input_rtp.c:620
++#, c-format
++msgid "Opening >filename:%s port:%d interface:%s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:265
+-msgid "add black bars to correct aspect ratio"
++#: src/input/input_rtp.c:637
++#, c-format
++msgid "input_rtp: can't create new thread (%s)\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:266
+-msgid ""
+-"Adds black bars when the image has an aspect ratio the card cannot handle "
+-"natively. This is needed to maintain proper image proportions."
++#: src/input/input_rtp.c:742
++msgid "RTP and UDP input plugin as shipped with xine"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:271
+-msgid "use smooth play mode for mpeg encoder playback"
++#: src/input/mmsh.c:232
++msgid "libmmsh: send error\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:272
+-msgid ""
+-"Enabling this option will utilise a smoother play mode for non-MPEG content."
++#: src/input/mmsh.c:277
++msgid "libmmsh: bad response format\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:280
++#: src/input/mmsh.c:283
+ #, c-format
+-msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
++msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:288
++#: src/input/mmsh.c:290
+ #, c-format
+-msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
++msgid "libmmsh: http status not 2xx: >%d %s<\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:330
+-msgid "encoder for non mpeg content"
++#: src/input/mmsh.c:298
++msgid "libmmsh: Location redirection not implemented\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:331
+-msgid ""
+-"Content other than MPEG has to pass an additional reencoding stage, because "
+-"the dxr3 handles only MPEG.\n"
+-"Depending on what is supported by your xine, this setting can be \"fame\", "
+-"\"rte\", \"libavcodec\" or \"none\".\n"
+-"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
+-"with xine, so you do not need to install any additional library for that. "
+-"Even better is that libdavcodec also provides high quality with low CPU "
+-"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
+-"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
+-"so these might fail to work."
++#: src/input/mmsh.c:602
++msgid "Connecting MMS server (over http)..."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:342
+-msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
++#: src/input/mmsh.c:847
++msgid "invalid url\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:348
+-msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
++#: src/input/mmsh.c:852
++msgid "unsupported protocol\n"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:355
+-msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:180
++msgid "failed to find a device with a VCD"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:361
+-msgid ""
+-"video_out_dxr3: Mpeg encoding disabled.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:307
++msgid "was passed a null class parameter"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:367
++#. Bad type.
++#: src/input/vcd/xineplug_inp_vcd.c:947
++msgid "Invalid current entry type"
++msgstr ""
++
++#: src/input/vcd/xineplug_inp_vcd.c:971
+ msgid ""
+-"video_out_dxr3: No mpeg encoder compiled in.\n"
+-"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
+-"video_out_dxr3: you will not be able to play non-mpeg content using this "
+-"video out\n"
+-"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
+-"encoder.\n"
++"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:382
+-msgid "video output mode (TV or overlay)"
++#: src/input/vcd/xineplug_inp_vcd.c:1074
++msgid "selection has no RETURN entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:383
+-msgid ""
+-"The way the DXR3 outputs the final video can be set here. The individual "
+-"values are:\n"
+-"\n"
+-"letterboxed tv\n"
+-"Send video to the TV out connector only. This is the mode used for the "
+-"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
+-"letterboxed, pan&scan material will have the image cropped at the left and "
+-"right side. This is the common setting for TV viewing and acts like a "
+-"standalone DVD player.\n"
+-"\n"
+-"widescreen tv\n"
+-"Send video to the tv out connector only. This mode is intended for 16:9 "
+-"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
+-"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
+-"your.\n"
+-"\n"
+-"letterboxed overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. The overlay will be "
+-"displayed with black borders if it is anamorphic (16:9).\n"
+-"This setting is only useful in the rare case of a DVD subtitle channel that "
+-"would only display properly in letterbox mode. A good example for that are "
+-"the animated commentator's silhouettes on \"Ghostbusters\".\n"
+-"\n"
+-"widescreen overlay\n"
+-"Overlay Video output on the computer screen with the option of on-the-fly "
+-"switching to TV out by hiding the video window. This is the common variant "
+-"of DXR3 overlay."
++#. PBC is not on. "default" selection beginning of current
++#. selection . Alternative:
++#: src/input/vcd/xineplug_inp_vcd.c:1102
++msgid "DEFAULT selected, but PBC is not on."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid "overlay colorkey value"
++#: src/input/vcd/xineplug_inp_vcd.c:1107
++msgid "selection has no NEXT entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:430
+-msgid ""
+-"Hexadecimal RGB value of the key color.\n"
+-"You can try different values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode."
++#: src/input/vcd/xineplug_inp_vcd.c:1115
++msgid "selection has no PREVIOUS entry"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid "overlay colorkey tolerance"
++#: src/input/vcd/xineplug_inp_vcd.c:1122
++msgid "Unknown event type: "
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:435
+-msgid ""
+-"A greater value widens the tolerance for the overlay keycolor.\n"
+-"You can try lower values, if you experience windows becoming transparent "
+-"when using DXR3 overlay mode, but parts of the image borders may disappear "
+-"when using a too low setting."
++#: src/input/vcd/xineplug_inp_vcd.c:1356 src/input/vcd/xineplug_inp_vcd.c:1403
++msgid "The above message had unknown vcdimager log level"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:441
+-msgid "crop the overlay area at top and bottom"
++#: src/input/vcd/xineplug_inp_vcd.c:1701
++msgid "default type to use on VCD autoplay"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:442
++#: src/input/vcd/xineplug_inp_vcd.c:1702
+ msgid ""
+-"Removes one pixel line from the top and bottom of the overlay. Enable this, "
+-"if you see green lines at the top or bottom of the overlay."
++"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
++"dev/dvd:"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:446
+-msgid "video_out_dxr3: please run autocal, overlay disabled\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1712
++msgid "default CD drive used for VCD when none given"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid "preferred tv mode"
++#: src/input/vcd/xineplug_inp_vcd.c:1713
++msgid ""
++"What to use if no drive specified. If the setting is empty, xine will scan "
++"for CD drives."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:456
+-msgid ""
+-"Selects the TV mode to be used by the DXR3. The values mean:\n"
+-"\n"
+-"ntsc: NTSC at 60Hz\n"
+-"pal: PAL at 50Hz\n"
+-"pal60: PAL at 60Hz\n"
+-"default: keep the card's setting"
++#: src/input/vcd/xineplug_inp_vcd.c:1723
++msgid "position slider range"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:478
+-msgid "video_out_dxr3: setting video mode failed.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1724
++msgid "The range the stream playback position slider represents when playing."
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:708
+-msgid ""
+-"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
+-"video_out_dxr3: Read the README.dxr3 for details.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1732
++msgid "Do we use read-ahead caching?"
+ msgstr ""
+
+-#: src/dxr3/video_out_dxr3.c:1364
+-msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1733
++msgid "Class may lead to jerky playback on low-end machines."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1494
+-#, c-format
+-msgid "%s: can't connect to %s:%d\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1743
++msgid "automatically advance track/entry"
+ msgstr ""
+
+-#: src/input/input_cdda.c:1540
+-#, c-format
+-msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1744
++msgid ""
++"If enabled, we should automatically advance to the next entry or track. Used "
++"only when playback control (PBC) is disabled."
+ msgstr ""
+
+-#: src/input/input_cdda.c:1545
+-#, c-format
+-msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
++#: src/input/vcd/xineplug_inp_vcd.c:1753
++msgid "show 'rejected' LIDs"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2543
+-msgid "CD Digital Audio (aka. CDDA)"
++#: src/input/vcd/xineplug_inp_vcd.c:1754
++msgid ""
++"Some playback list IDs (LIDs) are marked not showable, but you can see them "
++"in the MRL list if this is set. Rejected entries are marked with an asterisk "
++"(*) appended to the MRL."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2586
+-msgid "device used for CD audio"
++#: src/input/vcd/xineplug_inp_vcd.c:1765
++msgid "format string for display banner"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2587
++#: src/input/vcd/xineplug_inp_vcd.c:1766 src/input/vcd/xineplug_inp_vcd.c:1778
+ msgid ""
+-"The path to the device, usually a CD or DVD drive, which you intend to use "
+-"for playing audio CDs."
++"Format used in the GUI Title. Similar to the Unix date command. Format "
++"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
++"%N, %P, %p, %S, %T, %V, %v, and %%."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid "query CDDB"
++#: src/input/vcd/xineplug_inp_vcd.c:1777
++msgid "format string for stream comment field"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2593
+-msgid ""
+-"Enables CDDB queries, which will give you convenient title and track names "
+-"for your audio CDs.\n"
+-"Keep in mind that, unless you use your own private CDDB, this information is "
+-"retrieved from an internet server which might collect a profile of your "
+-"listening habits."
++#: src/input/vcd/xineplug_inp_vcd.c:1789
++msgid "debug flag mask"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid "CDDB server name"
++#: src/input/vcd/xineplug_inp_vcd.c:1790
++msgid "This integer is a debugging mask when interpreted in binary."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2601
+-msgid ""
+-"The CDDB server used to retrieve the title and track information from.\n"
+-"This setting is security critical, because the sever will receive "
+-"information about your listening habits and could answer the queries with "
+-"malicious replies. Be sure to enter a server you can trust."
++#: src/input/vcd/vcdio.c:217
++msgid "SEEK_CUR not implemented for non-zero offset"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "CDDB server port"
++#: src/input/vcd/vcdio.c:245
++msgid "SEEK_END not implemented yet."
+ msgstr ""
+
+-#: src/input/input_cdda.c:2609
+-msgid "The server port used to retrieve the title and track information from."
++#: src/input/vcd/vcdio.c:248
++msgid "seek not implemented yet for"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid "CDDB cache directory"
++#: src/input/vcd/vcdplayer.c:88
++msgid "bad item type"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2615
+-msgid ""
+-"The replies from the CDDB server will be cached in this directory.\n"
+-"This setting is security critical, because files with uncontrollable names "
+-"will be created in this directory. Be sure to use a dedicated directory not "
+-"used for anything but CDDB caching."
++#: src/input/vcd/vcdplayer.c:452
++msgid "bad entry number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2623
+-msgid "slow down disc drive to this speed factor"
++#: src/input/vcd/vcdplayer.c:485
++msgid "bad segment number"
+ msgstr ""
+
+-#: src/input/input_cdda.c:2624
+-msgid ""
+-"Since some CD or DVD drives make some really loud noises because of the fast "
+-"disc rotation, xine will try to slow them down. With standard CD or DVD "
+-"playback, the high datarates that require the fast rotation are not needed, "
+-"so the slowdown should not affect playback performance.\n"
+-"A value of zero here will disable the slowdown."
++#: src/input/vcd/vcdplayer.c:495
++msgid "Error in getting current segment number"
+ msgstr ""
+
+-#: src/input/input_dvb.c:834
++#: src/input/vcd/vcdplayer.c:569
++msgid "Should have converted this above"
++msgstr ""
++
++#: src/input/media_helper.c:147
++#, c-format
++msgid "input_dvd: Device %s failed to open during eject calls\n"
++msgstr ""
++
++#: src/input/input_dvb.c:838
+ #, c-format
+ msgid "input_dvb: failed to open dvb channel file '%s'\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:1991 src/input/input_dvb.c:2758
++#: src/input/input_dvb.c:1995 src/input/input_dvb.c:2762
+ msgid "input_dvb: tuner_set_channel failed\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2585
++#: src/input/input_dvb.c:2589
+ msgid "input_dvb: cannot open dvb device\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2609
++#: src/input/input_dvb.c:2613
+ #, c-format
+ msgid "input_dvb: channel %d out of range, defaulting to 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2620
++#: src/input/input_dvb.c:2624
+ #, c-format
+ msgid "input_dvb: searching for channel %s\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2643
++#: src/input/input_dvb.c:2647
+ #, c-format
+ msgid "input_dvb: exact match for %s not found: trying partial matches\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2650
++#: src/input/input_dvb.c:2654
+ #, c-format
+ msgid "input_dvb: found matching channel %s\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2663
++#: src/input/input_dvb.c:2667
+ #, c-format
+ msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
+ msgstr ""
+
+ #. just default to channel 0
+-#: src/input/input_dvb.c:2669
++#: src/input/input_dvb.c:2673
+ msgid ""
+ "input_dvb: invalid channel specification, defaulting to last viewed "
+ "channel.\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2675
++#: src/input/input_dvb.c:2679
+ msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2687
++#: src/input/input_dvb.c:2691
+ msgid ""
+ "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
+ "S)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2707
++#: src/input/input_dvb.c:2711
+ msgid ""
+ "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
+ "T)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2730
++#: src/input/input_dvb.c:2734
+ msgid ""
+ "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
+ "C)\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2764
++#: src/input/input_dvb.c:2768
+ #, c-format
+ msgid "input_dvb: cannot open dvr device '%s'\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2784
++#: src/input/input_dvb.c:2788
+ msgid "input_dvb: cannot create EPG updater thread\n"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2845
++#: src/input/input_dvb.c:2849
+ msgid "use DVB 'center cutout' (zoom)"
+ msgstr ""
+
+-#: src/input/input_dvb.c:2846
++#: src/input/input_dvb.c:2850
+ msgid ""
+ "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
+ "frame."
+ msgstr ""
+
+-#: src/input/input_dvb.c:2935
++#: src/input/input_dvb.c:2939
+ msgid "DVB (Digital TV) input plugin"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3081
++#: src/input/input_dvb.c:3085
+ msgid "Remember last DVB channel watched"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3082
++#: src/input/input_dvb.c:3086
+ msgid ""
+ "On autoplay, xine will remember and switch to the channel indicated in media."
+ "dvb.last_channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3089
++#: src/input/input_dvb.c:3093
+ msgid "Last DVB channel viewed"
+ msgstr ""
+
+-#: src/input/input_dvb.c:3090
++#: src/input/input_dvb.c:3094
+ msgid "If enabled xine will remember and switch to this channel. "
+ msgstr ""
+
+-#: src/input/input_dvb.c:3096
++#: src/input/input_dvb.c:3100
+ msgid "Number of dvb card to use."
+ msgstr ""
+
+-#: src/input/input_dvb.c:3097
++#: src/input/input_dvb.c:3101
+ msgid ""
+ "Leave this at zero unless you really have more than 1 card in your system."
+ msgstr ""
+
+-#: src/input/input_dvd.c:546
++#: src/input/input_dvd.c:547
+ msgid "input_dvd: values of \\beta will give rise to dom!\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:565
++#: src/input/input_dvd.c:566
+ #, c-format
+ msgid "input_dvd: Error getting next block from DVD (%s)\n"
+ msgstr ""
+
+ #. opening failed and we have nothing left to try
+-#: src/input/input_dvd.c:1434
++#: src/input/input_dvd.c:1435
+ msgid "input_dvd: Error opening DVD device\n"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1697
++#: src/input/input_dvd.c:1698
+ msgid "device used for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1698
++#: src/input/input_dvd.c:1699
+ msgid ""
+ "The path to the device, usually a DVD drive, which you intend to use for "
+ "playing DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1710
++#: src/input/input_dvd.c:1711
+ msgid "raw device set up for DVD access"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1711
++#: src/input/input_dvd.c:1712
+ msgid ""
+ "If this points to a raw device connected to your DVD device, xine will use "
+ "the raw device for playback. This has the advantage of being slightly faster "
+@@ -1216,22 +1741,22 @@
+ "See the documentation on raw device setup (man raw) for further information."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1724
++#: src/input/input_dvd.c:1725
+ msgid "CSS decryption method"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1725
++#: src/input/input_dvd.c:1726
+ msgid ""
+ "Selects the decryption method libdvdcss will use to descramble copy "
+ "protected DVDs. Try the various methods, if you have problems playing "
+ "scrambled DVDs."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1733
++#: src/input/input_dvd.c:1734
+ msgid "path to the title key cache"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1734
++#: src/input/input_dvd.c:1735
+ msgid ""
+ "Since cracking the copy protection of scrambled DVDs can be quite time "
+ "consuming, libdvdcss will cache the cracked keys in this directory.\n"
+@@ -1240,44 +1765,44 @@
+ "used for anything but DVD key caching."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1756
++#: src/input/input_dvd.c:1757
+ msgid "region the DVD player claims to be in (1 to 8)"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1757
++#: src/input/input_dvd.c:1758
+ msgid ""
+ "This only needs to be changed if your DVD jumps to a screen complaining "
+ "about a wrong region code. It has nothing to do with the region code set in "
+ "DVD drives, this is purely software."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1763
++#: src/input/input_dvd.c:1764
+ msgid "default language for DVD playback"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1764
++#: src/input/input_dvd.c:1765
+ msgid ""
+ "xine tries to use this language as a default for DVD playback. As far as the "
+ "DVD supports it, menus and audio tracks will be presented in this language.\n"
+ "The value must be a two character ISO639 language code."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1770
++#: src/input/input_dvd.c:1771
+ msgid "read-ahead caching"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1771
++#: src/input/input_dvd.c:1772
+ msgid ""
+ "xine can use a read ahead cache for DVD drive access.\n"
+ "This may lead to jerky playback on slow drives, but it improves the impact "
+ "of the DVD layer change on faster drives."
+ msgstr ""
+
+-#: src/input/input_dvd.c:1777
++#: src/input/input_dvd.c:1778
+ msgid "unit for the skip action"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1778
++#: src/input/input_dvd.c:1779
+ msgid ""
+ "You can configure the behaviour when issuing a skip command (using the skip "
+ "buttons for example). The individual values mean:\n"
+@@ -1296,11 +1821,11 @@
+ "features on the DVD"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1793
++#: src/input/input_dvd.c:1794
+ msgid "unit for seeking"
+ msgstr ""
+
+-#: src/input/input_dvd.c:1794
++#: src/input/input_dvd.c:1795
+ msgid ""
+ "You can configure the domain spanned by the seek slider. The individual "
+ "values mean:\n"
+@@ -1314,149 +1839,161 @@
+ "chapter of the current feature"
+ msgstr ""
+
+-#: src/input/input_file.c:127
++#: src/input/input_stdin_fifo.c:161
+ #, c-format
+-msgid "input_file: read error (%s)\n"
++msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n"
+ msgstr ""
+
+-#: src/input/input_file.c:282
++#: src/input/input_stdin_fifo.c:249
+ #, c-format
+-msgid "input_file: Permission denied: >%s<\n"
++msgid "stdin: failed to open '%s'\n"
+ msgstr ""
+
+-#: src/input/input_file.c:286
+-#, c-format
+-msgid "input_file: File not found: >%s<\n"
++#: src/input/input_stdin_fifo.c:342
++msgid "stdin streaming input plugin"
+ msgstr ""
+
+-#: src/input/input_file.c:510
+-msgid "file input plugin"
++#: src/input/input_mms.c:424
++msgid "mms streaming input plugin"
+ msgstr ""
+
+-#: src/input/input_file.c:872
+-msgid "file browsing start location"
++#: src/input/input_mms.c:456
++msgid "network bandwidth"
+ msgstr ""
+
+-#: src/input/input_file.c:873
+-msgid "The browser to select the file to play will start at this location."
++#: src/input/input_mms.c:457
++msgid ""
++"Specify the bandwidth of your internet connection here. This will be used "
++"when streaming servers offer different versions with different bandwidth "
++"requirements of the same stream."
+ msgstr ""
+
+-#: src/input/input_file.c:880
+-msgid "list hidden files"
++#: src/input/input_mms.c:466
++msgid "MMS protocol"
+ msgstr ""
+
+-#: src/input/input_file.c:881
++#: src/input/input_mms.c:467
+ msgid ""
+-"If enabled, the browser to select the file to play will also show hidden "
+-"files."
++"Select the protocol to encapsulate MMS.\n"
++"TCP is better but you may need HTTP behind a firewall."
+ msgstr ""
+
+-#: src/input/input_gnome_vfs.c:218
+-msgid "gnome-vfs input plugin as shipped with xine"
++#: src/input/net_buf_ctrl.c:89
++msgid "Buffering..."
+ msgstr ""
+
+-#: src/input/input_http.c:170
++#: src/input/input_pnm.c:266
++msgid "pnm streaming input plugin"
++msgstr ""
++
++#: src/input/input_http.c:174
+ #, c-format
+ msgid "input_http: gethostbyname(%s) failed: %s\n"
+ msgstr ""
+
+-#: src/input/input_http.c:363 src/input/input_http.c:939
++#: src/input/input_http.c:388 src/input/input_http.c:912
+ #, c-format
+ msgid "input_http: read error %d\n"
+ msgstr ""
+
+-#: src/input/input_http.c:664
++#: src/input/input_http.c:615
+ msgid "Connecting HTTP server..."
+ msgstr ""
+
+-#: src/input/input_http.c:846
++#: src/input/input_http.c:797
+ msgid "input_http: invalid http answer\n"
+ msgstr ""
+
+-#: src/input/input_http.c:856
++#: src/input/input_http.c:804
+ #, c-format
+ msgid "input_http: 3xx redirection: >%d %s<\n"
+ msgstr ""
+
+-#: src/input/input_http.c:861 src/input/input_http.c:867
+-#: src/input/input_http.c:874
++#: src/input/input_http.c:809 src/input/input_http.c:815
++#: src/input/input_http.c:822
+ #, c-format
+ msgid "input_http: http status not 2xx: >%d %s<\n"
+ msgstr ""
+
+-#: src/input/input_http.c:884
++#: src/input/input_http.c:832
+ #, c-format
+-msgid "input_http: content length = %<PRIiMAX> bytes\n"
++msgid "input_http: content length = %<PRIdMAX> bytes\n"
+ msgstr ""
+
+-#: src/input/input_http.c:984
++#: src/input/input_http.c:957
+ msgid "http input plugin"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "HTTP proxy host"
+ msgstr ""
+
+-#: src/input/input_http.c:1050
++#: src/input/input_http.c:1023
+ msgid "The hostname of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "HTTP proxy port"
+ msgstr ""
+
+-#: src/input/input_http.c:1054
++#: src/input/input_http.c:1027
+ msgid "The port number of the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1064
++#: src/input/input_http.c:1037
+ msgid "HTTP proxy username"
+ msgstr ""
+
+-#: src/input/input_http.c:1065
++#: src/input/input_http.c:1038
+ msgid "The user name for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1068
++#: src/input/input_http.c:1041
+ msgid "HTTP proxy password"
+ msgstr ""
+
+-#: src/input/input_http.c:1069
++#: src/input/input_http.c:1042
+ msgid "The password for the HTTP proxy."
+ msgstr ""
+
+-#: src/input/input_http.c:1072
+-msgid "Domains, where to ignore the HTTP proxy"
++#: src/input/input_http.c:1045
++msgid "Domains for which to ignore the HTTP proxy"
+ msgstr ""
+
+-#: src/input/input_http.c:1073
++#: src/input/input_http.c:1046
+ msgid ""
+-"A Comma separated list of domain names, where the proxy is to be ignored."
++"A comma-separated list of domain names for which the proxy is to be "
++"ignored.\n"
++"If a domain name is prefixed with '=' then it is treated as a host name only "
++"(full match required)."
+ msgstr ""
+
+-#: src/input/input_mms.c:424
+-msgid "mms streaming input plugin"
++#: src/input/librtsp/rtsp.c:447
++#, c-format
++msgid "rtsp: bad mrl: %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:456
+-msgid "network bandwidth"
++#: src/input/librtsp/rtsp.c:507
++#, c-format
++msgid "rtsp: failed to connect to '%s'\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:457
+-msgid ""
+-"Specify the bandwidth of your internet connection here. This will be used "
+-"when streaming servers offer different versions with different bandwidth "
+-"requirements of the same stream."
++#: src/input/librtsp/rtsp_session.c:84
++#, c-format
++msgid "rtsp_session: failed to connect to server %s\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:466
+-msgid "MMS protocol"
++#: src/input/librtsp/rtsp_session.c:118
++msgid "rtsp_session: session can not be established.\n"
+ msgstr ""
+
+-#: src/input/input_mms.c:467
+-msgid ""
+-"Select the protocol to encapsulate MMS.\n"
+-"TCP is better but you may need HTTP behind a firewall."
++#: src/input/librtsp/rtsp_session.c:135
++#, c-format
++msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
++msgstr ""
++
++#: src/input/input_gnome_vfs.c:218
++msgid "gnome-vfs input plugin as shipped with xine"
+ msgstr ""
+
+ #: src/input/input_net.c:123 src/input/input_net.c:153
+@@ -1469,195 +2006,169 @@
+ msgid "input_net: connect(): %s\n"
+ msgstr ""
+
+-#: src/input/input_net.c:182 src/input/input_net.c:225
++#: src/input/input_net.c:182 src/input/input_net.c:224
+ #, c-format
+ msgid "input_net: unable to resolve '%s'.\n"
+ msgstr ""
+
+-#: src/input/input_net.c:195 src/input/input_net.c:242
++#: src/input/input_net.c:195 src/input/input_net.c:241
+ #, c-format
+ msgid "input_net: unable to connect to '%s'.\n"
+ msgstr ""
+
+-#: src/input/input_net.c:511
++#: src/input/input_net.c:510
+ msgid "net input plugin as shipped with xine"
+ msgstr ""
+
+-#: src/input/input_pnm.c:266
+-msgid "pnm streaming input plugin"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:604
+-#, c-format
+-msgid "input_pvr: error creating pvr file (%s)\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:761
+-#, c-format
+-msgid "input_pvr: error opening pvr file (%s)\n"
++#: src/input/input_smb.c:145
++msgid "CIFS/SMB input plugin based on libsmbclient"
+ msgstr ""
+
+-#: src/input/input_pvr.c:837
++#: src/input/pnm.c:617
+ #, c-format
+-msgid "input_pvr: read error (%s)\n"
++msgid ""
++"input_pnm: got message from server while reading stream:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#: src/input/pnm.c:755
+ #, c-format
+-msgid "input_pvr: error opening device %s\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
+-msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+-msgstr ""
+-
+-#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
+-msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
++msgid "input_pnm: failed to connect '%s'\n"
+ msgstr ""
+
+-#: src/input/input_pvr.c:1525
+-msgid "WinTV-PVR 250/350 input plugin"
++#: src/input/pnm.c:766
++msgid "input_pnm: failed to set up stream\n"
+ msgstr ""
+
+-#: src/input/input_pvr.c:1551
+-msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
++#: src/input/input_v4l.c:378
++msgid "Buffer underrun..."
+ msgstr ""
+
+-#: src/input/input_pvr.c:1552
+-msgid "The path to the device of your WinTV card."
++#: src/input/input_v4l.c:382
++msgid "Buffer overrun..."
+ msgstr ""
+
+-#: src/input/input_rtp.c:182
+-#, c-format
+-msgid "socket(): %s.\n"
++#: src/input/input_v4l.c:385
++msgid "Adjusting..."
+ msgstr ""
+
+-#: src/input/input_rtp.c:192
+-msgid "IP address specified is multicast\n"
++#: src/input/input_v4l.c:659
++msgid "Tuner name not found\n"
+ msgstr ""
+
+-#: src/input/input_rtp.c:201
+-#, c-format
+-msgid "setsockopt(SO_RCVBUF): %s.\n"
++#: src/input/input_v4l.c:1874
++msgid "v4l tv input plugin"
+ msgstr ""
+
+-#: src/input/input_rtp.c:209
+-#, c-format
+-msgid "setsockopt(SO_REUSEADDR): %s.\n"
++#: src/input/input_v4l.c:1878
++msgid "v4l radio input plugin"
+ msgstr ""
+
+-#: src/input/input_rtp.c:216
+-#, c-format
+-msgid "bind(): %s.\n"
++#: src/input/input_v4l.c:1910
++msgid "v4l video device"
+ msgstr ""
+
+-#: src/input/input_rtp.c:236
+-#, c-format
+-msgid "Can't find address for iface %s:%s\n"
++#: src/input/input_v4l.c:1911
++msgid "The path to your Video4Linux video device."
+ msgstr ""
+
+-#: src/input/input_rtp.c:254
+-#, c-format
+-msgid "setsockopt(IP_ADD_MEMBERSHIP) failed (multicast kernel?): %s.\n"
++#: src/input/input_v4l.c:1936
++msgid "v4l radio device"
+ msgstr ""
+
+-#: src/input/input_rtp.c:276
+-#, c-format
+-msgid "unable to resolve '%s'.\n"
++#: src/input/input_v4l.c:1937
++msgid "The path to your Video4Linux radio device."
+ msgstr ""
+
+-#: src/input/input_rtp.c:286
+-#, c-format
+-msgid "unable to bind to '%s'.\n"
++#: src/input/mms.c:650
++msgid "Connecting MMS server (over tcp)..."
+ msgstr ""
+
+-#: src/input/input_rtp.c:314
++#: src/input/input_cdda.c:1494
+ #, c-format
+-msgid "recv(): %s.\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:602
+-msgid "RTP: stopping reading thread...\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:605
+-msgid "RTP: reading thread terminated\n"
++msgid "%s: can't connect to %s:%d\n"
+ msgstr ""
+
+-#: src/input/input_rtp.c:620
++#: src/input/input_cdda.c:1540
+ #, c-format
+-msgid "Opening >filename:%s port:%d interface:%s<\n"
++msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
+ msgstr ""
+
+-#: src/input/input_rtp.c:637
++#: src/input/input_cdda.c:1545
+ #, c-format
+-msgid "input_rtp: can't create new thread (%s)\n"
+-msgstr ""
+-
+-#: src/input/input_rtp.c:742
+-msgid "RTP and UDP input plugin as shipped with xine"
+-msgstr ""
+-
+-#: src/input/input_rtsp.c:278
+-msgid "rtsp streaming input plugin"
+-msgstr ""
+-
+-#: src/input/input_smb.c:145
+-msgid "CIFS/SMB input plugin based on libsmbclient"
++msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:161
+-#, c-format
+-msgid "stdin: cannot seek back! (%<PRIiMAX> > %<PRIiMAX>)\n"
++#: src/input/input_cdda.c:2543
++msgid "CD Digital Audio (aka. CDDA)"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:249
+-#, c-format
+-msgid "stdin: failed to open '%s'\n"
++#: src/input/input_cdda.c:2586
++msgid "device used for CD audio"
+ msgstr ""
+
+-#: src/input/input_stdin_fifo.c:342
+-msgid "stdin streaming input plugin"
++#: src/input/input_cdda.c:2587
++msgid ""
++"The path to the device, usually a CD or DVD drive, which you intend to use "
++"for playing audio CDs."
+ msgstr ""
+
+-#: src/input/input_v4l.c:378
+-msgid "Buffer underrun..."
++#: src/input/input_cdda.c:2593
++msgid "query CDDB"
+ msgstr ""
+
+-#: src/input/input_v4l.c:382
+-msgid "Buffer overrun..."
++#: src/input/input_cdda.c:2593
++msgid ""
++"Enables CDDB queries, which will give you convenient title and track names "
++"for your audio CDs.\n"
++"Keep in mind that, unless you use your own private CDDB, this information is "
++"retrieved from an internet server which might collect a profile of your "
++"listening habits."
+ msgstr ""
+
+-#: src/input/input_v4l.c:385
+-msgid "Adjusting..."
++#: src/input/input_cdda.c:2601
++msgid "CDDB server name"
+ msgstr ""
+
+-#: src/input/input_v4l.c:659
+-msgid "Tuner name not found\n"
++#: src/input/input_cdda.c:2601
++msgid ""
++"The CDDB server used to retrieve the title and track information from.\n"
++"This setting is security critical, because the sever will receive "
++"information about your listening habits and could answer the queries with "
++"malicious replies. Be sure to enter a server you can trust."
+ msgstr ""
+
+-#: src/input/input_v4l.c:1874
+-msgid "v4l tv input plugin"
++#: src/input/input_cdda.c:2609
++msgid "CDDB server port"
+ msgstr ""
+
+-#: src/input/input_v4l.c:1878
+-msgid "v4l radio input plugin"
++#: src/input/input_cdda.c:2609
++msgid "The server port used to retrieve the title and track information from."
+ msgstr ""
+
+-#: src/input/input_v4l.c:1910
+-msgid "v4l video device"
++#: src/input/input_cdda.c:2615
++msgid "CDDB cache directory"
+ msgstr ""
+
+-#: src/input/input_v4l.c:1911
+-msgid "The path to your Video4Linux video device."
++#: src/input/input_cdda.c:2615
++msgid ""
++"The replies from the CDDB server will be cached in this directory.\n"
++"This setting is security critical, because files with uncontrollable names "
++"will be created in this directory. Be sure to use a dedicated directory not "
++"used for anything but CDDB caching."
+ msgstr ""
+
+-#: src/input/input_v4l.c:1936
+-msgid "v4l radio device"
++#: src/input/input_cdda.c:2623
++msgid "slow down disc drive to this speed factor"
+ msgstr ""
+
+-#: src/input/input_v4l.c:1937
+-msgid "The path to your Video4Linux radio device."
++#: src/input/input_cdda.c:2624
++msgid ""
++"Since some CD or DVD drives make some really loud noises because of the fast "
++"disc rotation, xine will try to slow them down. With standard CD or DVD "
++"playback, the high datarates that require the fast rotation are not needed, "
++"so the slowdown should not affect playback performance.\n"
++"A value of zero here will disable the slowdown."
+ msgstr ""
+
+ #: src/input/input_vcd.c:849
+@@ -1693,1845 +2204,1597 @@
+ "VideoCDs with."
+ msgstr ""
+
+-#: src/input/media_helper.c:147
+-#, c-format
+-msgid "input_dvd: Device %s failed to open during eject calls\n"
+-msgstr ""
+-
+-#: src/input/mms.c:646
+-msgid "Connecting MMS server (over tcp)..."
+-msgstr ""
+-
+-#: src/input/mmsh.c:232
+-msgid "libmmsh: send error\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:277
+-msgid "libmmsh: bad response format\n"
++#: src/input/input_rtsp.c:278
++msgid "rtsp streaming input plugin"
+ msgstr ""
+
+-#: src/input/mmsh.c:283
++#: src/input/input_pvr.c:604
+ #, c-format
+-msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n"
++msgid "input_pvr: error creating pvr file (%s)\n"
+ msgstr ""
+
+-#: src/input/mmsh.c:290
++#: src/input/input_pvr.c:761
+ #, c-format
+-msgid "libmmsh: http status not 2xx: >%d %s<\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:298
+-msgid "libmmsh: Location redirection not implemented\n"
+-msgstr ""
+-
+-#: src/input/mmsh.c:601
+-msgid "Connecting MMS server (over http)..."
++msgid "input_pvr: error opening pvr file (%s)\n"
+ msgstr ""
+
+-#: src/input/mmsh.c:845
+-msgid "invalid url\n"
++#: src/input/input_pvr.c:837
++#, c-format
++msgid "input_pvr: read error (%s)\n"
+ msgstr ""
+
+-#: src/input/mmsh.c:850
+-msgid "unsupported protocol\n"
++#: src/input/input_pvr.c:1151 src/input/input_pvr.c:1402
++#, c-format
++msgid "input_pvr: error opening device %s\n"
+ msgstr ""
+
+-#: src/input/net_buf_ctrl.c:89
+-msgid "Buffering..."
++#: src/input/input_pvr.c:1157 src/input/input_pvr.c:1408
++msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/pnm.c:617
+-#, c-format
+-msgid ""
+-"input_pnm: got message from server while reading stream:\n"
+-"%s\n"
++#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1417
++msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n"
+ msgstr ""
+
+-#: src/input/pnm.c:755
+-#, c-format
+-msgid "input_pnm: failed to connect '%s'\n"
++#: src/input/input_pvr.c:1525
++msgid "WinTV-PVR 250/350 input plugin"
+ msgstr ""
+
+-#: src/input/pnm.c:766
+-msgid "input_pnm: failed to set up stream\n"
++#: src/input/input_pvr.c:1551
++msgid "device used for WinTV-PVR 250/350 (pvr plugin)"
+ msgstr ""
+
+-#: src/input/librtsp/rtsp.c:447
+-#, c-format
+-msgid "rtsp: bad mrl: %s\n"
++#: src/input/input_pvr.c:1552
++msgid "The path to the device of your WinTV card."
+ msgstr ""
+
+-#: src/input/librtsp/rtsp.c:507
++#: src/input/input_file.c:127
+ #, c-format
+-msgid "rtsp: failed to connect to '%s'\n"
++msgid "input_file: read error (%s)\n"
+ msgstr ""
+
+-#: src/input/librtsp/rtsp_session.c:84
++#: src/input/input_file.c:282
+ #, c-format
+-msgid "rtsp_session: failed to connect to server %s\n"
+-msgstr ""
+-
+-#: src/input/librtsp/rtsp_session.c:118
+-msgid "rtsp_session: session can not be established.\n"
++msgid "input_file: Permission denied: >%s<\n"
+ msgstr ""
+
+-#: src/input/librtsp/rtsp_session.c:135
++#: src/input/input_file.c:286
+ #, c-format
+-msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"
+-msgstr ""
+-
+-#: src/input/vcd/vcdio.c:210
+-msgid "SEEK_CUR not implemented for nozero offset"
++msgid "input_file: File not found: >%s<\n"
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:238
+-msgid "SEEK_END not implemented yet."
++#: src/input/input_file.c:510
++msgid "file input plugin"
+ msgstr ""
+
+-#: src/input/vcd/vcdio.c:241
+-msgid "seek not implemented yet for"
++#: src/input/input_file.c:872
++msgid "file browsing start location"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:88
+-msgid "bad item type"
++#: src/input/input_file.c:873
++msgid "The browser to select the file to play will start at this location."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:439
+-msgid "bad entry number"
++#: src/input/input_file.c:880
++msgid "list hidden files"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:471
+-msgid "bad segment number"
++#: src/input/input_file.c:881
++msgid ""
++"If enabled, the browser to select the file to play will also show hidden "
++"files."
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:481
+-msgid "Error in getting current segment number"
++#: src/dxr3/video_out_dxr3.c:260
++msgid "swap odd and even lines"
+ msgstr ""
+
+-#: src/input/vcd/vcdplayer.c:552
+-msgid "Should have converted this above"
++#: src/dxr3/video_out_dxr3.c:261
++msgid ""
++"Swaps the even and odd field of the image.\n"
++"Enable this option for non-MPEG material which produces a vertical jitter on "
++"screen."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:173
+-msgid "failed to find a device with a VCD"
++#: src/dxr3/video_out_dxr3.c:265
++msgid "add black bars to correct aspect ratio"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:300
+-msgid "was passed a null class parameter"
++#: src/dxr3/video_out_dxr3.c:266
++msgid ""
++"Adds black bars when the image has an aspect ratio the card cannot handle "
++"natively. This is needed to maintain proper image proportions."
+ msgstr ""
+
+-#. Bad type.
+-#: src/input/vcd/xineplug_inp_vcd.c:889
+-msgid "Invalid current entry type"
++#: src/dxr3/video_out_dxr3.c:271
++msgid "use smooth play mode for mpeg encoder playback"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:913
++#: src/dxr3/video_out_dxr3.c:272
+ msgid ""
+-"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1016
+-msgid "selection has no RETURN entry"
++"Enabling this option will utilise a smoother play mode for non-MPEG content."
+ msgstr ""
+
+-#. PBC is not on. "default" selection beginning of current
+-#. selection . Alternative:
+-#: src/input/vcd/xineplug_inp_vcd.c:1045
+-msgid "DEFAULT selected but PBC is not on."
++#: src/dxr3/video_out_dxr3.c:280
++#, c-format
++msgid "video_out_dxr3: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1050
+-msgid "selection has no DEFAULT entry"
++#: src/dxr3/video_out_dxr3.c:288
++#, c-format
++msgid "video_out_dxr3: Failed to open video device %s (%s)\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1062
+-msgid "selection has no NEXT entry"
++#: src/dxr3/video_out_dxr3.c:330
++msgid "encoder for non mpeg content"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1070
+-msgid "selection has no PREVIOUS entry"
++#: src/dxr3/video_out_dxr3.c:331
++msgid ""
++"Content other than MPEG has to pass an additional reencoding stage, because "
++"the dxr3 handles only MPEG.\n"
++"Depending on what is supported by your xine, this setting can be \"fame\", "
++"\"rte\", \"libavcodec\" or \"none\".\n"
++"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships "
++"with xine, so you do not need to install any additional library for that. "
++"Even better is that libavcodec also provides high quality with low CPU "
++"usage. Using \"libavcodec\" is therefore strongly suggested.\n"
++"\"fame\" and \"rte\" are still there, but xine support for them is outdated, "
++"so these might fail to work."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1077
+-msgid "Unknown event type: "
++#: src/dxr3/video_out_dxr3.c:342
++msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1316 src/input/vcd/xineplug_inp_vcd.c:1363
+-msgid "The above message had unknown vcdimager log level"
++#: src/dxr3/video_out_dxr3.c:348
++msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1661
+-msgid "default type to use on VCD autoplay"
++#: src/dxr3/video_out_dxr3.c:355
++msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1662
++#: src/dxr3/video_out_dxr3.c:361
+ msgid ""
+-"The play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///"
+-"dev/dvd:"
+-msgstr ""
+-
+-#: src/input/vcd/xineplug_inp_vcd.c:1672
+-msgid "default CD drive used for VCD when none given"
++"video_out_dxr3: Mpeg encoding disabled.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1673
++#: src/dxr3/video_out_dxr3.c:367
+ msgid ""
+-"What to use if no drive specified. If the setting is empty, xine will scan "
+-"for CD drives."
++"video_out_dxr3: No mpeg encoder compiled in.\n"
++"video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
++"video_out_dxr3: you will not be able to play non-mpeg content using this "
++"video out\n"
++"video_out_dxr3: driver. See the README.dxr3 for details on configuring an "
++"encoder.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1683
+-msgid "position slider range"
++#: src/dxr3/video_out_dxr3.c:382
++msgid "video output mode (TV or overlay)"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1684
+-msgid "The range the stream playback position slider represents when playing."
++#: src/dxr3/video_out_dxr3.c:383
++msgid ""
++"The way the DXR3 outputs the final video can be set here. The individual "
++"values are:\n"
++"\n"
++"letterboxed tv\n"
++"Send video to the TV out connector only. This is the mode used for the "
++"standard 4:3 television set. Anamorphic (16:9) video will be displayed "
++"letterboxed, pan&scan material will have the image cropped at the left and "
++"right side. This is the common setting for TV viewing and acts like a "
++"standalone DVD player.\n"
++"\n"
++"widescreen tv\n"
++"Send video to the tv out connector only. This mode is intended for 16:9 "
++"widescreen TV sets. Anamorphic and pan&scan content will fill the entire "
++"screen, but you have to set the TV's aspect ratio manually to 16:9 using "
++"your.\n"
++"\n"
++"letterboxed overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. The overlay will be "
++"displayed with black borders if it is anamorphic (16:9).\n"
++"This setting is only useful in the rare case of a DVD subtitle channel that "
++"would only display properly in letterbox mode. A good example for that are "
++"the animated commentator's silhouettes on \"Ghostbusters\".\n"
++"\n"
++"widescreen overlay\n"
++"Overlay Video output on the computer screen with the option of on-the-fly "
++"switching to TV out by hiding the video window. This is the common variant "
++"of DXR3 overlay."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1692
+-msgid "Do we use read-ahead caching?"
++#: src/dxr3/video_out_dxr3.c:430
++msgid "overlay colorkey value"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1693
+-msgid "Class may lead to jerky playback on low-end machines."
++#: src/dxr3/video_out_dxr3.c:430
++msgid ""
++"Hexadecimal RGB value of the key color.\n"
++"You can try different values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1703
+-msgid "automatically advance track/entry"
++#: src/dxr3/video_out_dxr3.c:435
++msgid "overlay colorkey tolerance"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1704
++#: src/dxr3/video_out_dxr3.c:435
+ msgid ""
+-"If enabled, we should automatically advance to the next entry or track. Used "
+-"only when playback control (PBC) is disabled."
++"A greater value widens the tolerance for the overlay keycolor.\n"
++"You can try lower values, if you experience windows becoming transparent "
++"when using DXR3 overlay mode, but parts of the image borders may disappear "
++"when using a too low setting."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1713
+-msgid "show 'rejected' LIDs"
++#: src/dxr3/video_out_dxr3.c:441
++msgid "crop the overlay area at top and bottom"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1714
++#: src/dxr3/video_out_dxr3.c:442
+ msgid ""
+-"Some playback list IDs (LIDs) are marked not showable, but you can see them "
+-"in the MRL list if this is set. Rejected entries are marked with an asterisk "
+-"(*) appended to the MRL."
++"Removes one pixel line from the top and bottom of the overlay. Enable this, "
++"if you see green lines at the top or bottom of the overlay."
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1725
+-msgid "format string for display banner"
++#: src/dxr3/video_out_dxr3.c:446
++msgid "video_out_dxr3: please run autocal, overlay disabled\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1726 src/input/vcd/xineplug_inp_vcd.c:1738
+-msgid ""
+-"Format used in the GUI Title. Similar to the Unix date command. Format "
+-"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
+-"%N, %P, %p, %S, %T, %V, %v, and %%."
++#: src/dxr3/video_out_dxr3.c:456
++msgid "preferred tv mode"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1737
+-msgid "format string for stream comment field"
++#: src/dxr3/video_out_dxr3.c:456
++msgid ""
++"Selects the TV mode to be used by the DXR3. The values mean:\n"
++"\n"
++"ntsc: NTSC at 60Hz\n"
++"pal: PAL at 50Hz\n"
++"pal60: PAL at 60Hz\n"
++"default: keep the card's setting"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1749
+-msgid "debug flag mask"
++#: src/dxr3/video_out_dxr3.c:478
++msgid "video_out_dxr3: setting video mode failed.\n"
+ msgstr ""
+
+-#: src/input/vcd/xineplug_inp_vcd.c:1750
+-msgid "This integer is a debugging mask when interpreted in binary."
++#: src/dxr3/video_out_dxr3.c:708
++msgid ""
++"video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n"
++"video_out_dxr3: Read the README.dxr3 for details.\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:717 src/libdts/xine_decoder.c:543
+-msgid "HELP! a mono-only audio driver?!\n"
++#: src/dxr3/video_out_dxr3.c:1364
++msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:780
+-msgid "A/52 volume"
++#: src/dxr3/dxr3_decode_spu.c:253
++#, c-format
++msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:781
+-msgid ""
+-"With A/52 audio, you can modify the volume at the decoder level. This has "
+-"the advantage of the audio being already decoded for the specified volume, "
+-"so later operations like channel downmixing will work on an audio stream of "
+-"the given volume."
++#: src/dxr3/dxr3_decode_spu.c:663
++msgid "requested button not available\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:789
+-msgid "use A/52 dynamic range compression"
++#: src/dxr3/dxr3.h:32
++msgid "DXR3 device number"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:790
++#: src/dxr3/dxr3.h:33
+ msgid ""
+-"Dynamic range compression limits the dynamic range of the audio. This means "
+-"making the loud sounds softer, and the soft sounds louder, so you can more "
+-"easily listen to the audio in a noisy environment without disturbing anyone."
++"If you have more than one DXR3 in your computer, you can specify which one "
++"to use here."
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:797
+-msgid "downmix audio to 2 channel surround stereo"
++#: src/dxr3/dxr3_mpeg_encoders.c:125
++msgid "dxr3_mpeg_encoder: failed to init librte\n"
+ msgstr ""
+
+-#: src/liba52/xine_decoder.c:798
++#: src/dxr3/dxr3_mpeg_encoders.c:160
+ msgid ""
+-"When you want to listen to multichannel surround sound, but you have only "
+-"two speakers or a surround decoder or amplifier which does some sort of "
+-"matrix surround decoding like prologic, you should enable this option so "
+-"that the additional channels are mixed into the stereo signal."
++"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of "
++"16\n"
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:90
+-msgid "libfaad: libfaad faacDecOpen() failed.\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:170
++msgid "dxr3_mpeg_encoder: failed to get rte context.\n"
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:99
+-msgid "libfaad: libfaad faacDecInit2 failed.\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:181
++msgid "dxr3_mpeg_encoder: could not create codec.\n"
+ msgstr ""
+
+-#: src/libfaad/xine_decoder.c:123
+-msgid "libfaad: libfaad faacDecInit failed.\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:189
++msgid "rte mpeg output bitrate (kbit/s)"
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:109
+-#, c-format
+-msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:190
++msgid ""
++"The bitrate the mpeg encoder library librte should use for DXR3's encoding "
++"mode. Higher values will increase quality and CPU usage."
+ msgstr ""
+
+-#: src/libffmpeg/audio_decoder.c:149
++#: src/dxr3/dxr3_mpeg_encoders.c:234
+ #, c-format
+-msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
+-
+-#: src/libffmpeg/audio_decoder.c:226
+-msgid "ffmpeg_audio_dec: couldn't open decoder\n"
++msgid "dxr3_mpeg_encoder: cannot init the context: %s\n"
+ msgstr ""
+
+-#: src/libffmpeg/dvaudio_decoder.c:303
++#: src/dxr3/dxr3_mpeg_encoders.c:242
+ #, c-format
+-msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:140
+-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
++msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:153
+-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:372
++msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:228
+-msgid "ffmpeg_video_dec: couldn't open decoder\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:387
++msgid "fame mpeg encoding quality"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:261
+-msgid "ffmpeg_video_dec: direct rendering enabled\n"
++#: src/dxr3/dxr3_mpeg_encoders.c:388
++msgid ""
++"The encoding quality of the libfame mpeg encoder library. Lower is faster "
++"but gives noticeable artifacts. Higher is better but slower."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:345
+-msgid "avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"
++#: src/dxr3/dxr3_scr.c:98
++msgid "SCR plugin priority"
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:714
+-#, c-format
+-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
++#: src/dxr3/dxr3_scr.c:99
++msgid ""
++"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix "
++"system timer will be used. Values greater 5 force to use DXR3's internal "
++"clock as sync source."
+ msgstr ""
+
+-#: src/libffmpeg/video_decoder.c:758
++#: src/dxr3/dxr3_decode_video.c:250
+ #, c-format
+-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:1274
+-msgid "MPEG-4 postprocessing quality"
+-msgstr ""
+-
+-#: src/libffmpeg/video_decoder.c:1275
+-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 "
+-"result in image defects like block artifacts. For high quality content, too "
+-"heavy post processing can actually make the image worse by blurring it too "
+-"much."
++msgid "dxr3_decode_video: Failed to open control device %s (%s)\n"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:164
+-msgid "libavcodec mpeg output bitrate (kbit/s)"
++#: src/dxr3/dxr3_decode_video.c:256
++msgid "use Pan & Scan info"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:165
++#: src/dxr3/dxr3_decode_video.c:257
+ msgid ""
+-"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. "
+-"Higher values will increase quality and CPU usage.\n"
+-"This setting is only considered, when constant quality mode is disabled."
++"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
++"encoded material. You can specify here, how to handle such content.\n"
++"\n"
++"only when forced\n"
++"Use Pan & Scan only, when the content you are playing enforces it.\n"
++"\n"
++"use MPEG hint\n"
++"Enable Pan & Scan based on information embedded in the MPEG video stream.\n"
++"\n"
++"use DVB hint\n"
++"Enable Pan & Scan based on information embedded in DVB streams. This makes "
++"use of the Active Format Descriptor (AFD) used in some European DVB channels."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:172
+-msgid "constant quality mode"
++#: src/dxr3/dxr3_decode_video.c:276
++msgid "try to sync video every frame"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:173
++#: src/dxr3/dxr3_decode_video.c:277
+ msgid ""
+-"When enabled, libavcodec will use a constant quality mode by dynamically "
+-"compressing the images based on their complexity. When disabled, libavcodec "
+-"will use constant bitrate mode."
++"Tries to set a synchronization timestamp for every frame. Normally this is "
++"not necessary, because sync is sufficent even when the timestamp is set only "
++"every now and then.\n"
++"This is relevant for progressive video only (most PAL films)."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:180
+-msgid "minimum compression"
++#: src/dxr3/dxr3_decode_video.c:283
++msgid "use smooth play mode"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:181
+-msgid "The minimum compression to apply to an image in constant quality mode."
++#: src/dxr3/dxr3_decode_video.c:284
++msgid "Enabling this option will utilise a smoother play mode."
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:186
+-msgid "maximum quantizer"
++#: src/dxr3/dxr3_decode_video.c:287
++msgid "correct frame durations in broken streams"
+ msgstr ""
+
+-#: src/libffmpeg/xine_encoder.c:187
+-msgid "The maximum compression to apply to an image in constant quality mode."
++#: src/dxr3/dxr3_decode_video.c:288
++msgid ""
++"Enables a small logic that corrects the frame durations of some mpeg streams "
++"with wrong framerate codes. Currently a correction for NTSC streams "
++"erroneously labeled as PAL streams is implemented. Enable only, when you "
++"encounter such streams."
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:207
++#: src/dxr3/dxr3_decode_video.c:547
+ #, c-format
+-msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
++msgid "dxr3_decode_video: Failed to open video device %s (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:364
+-#, c-format
+-msgid "libareal: decoder init failed, error code: 0x%x\n"
++#: src/dxr3/dxr3_decode_video.c:615
++msgid "dxr3_decode_video: write to device would block. flushing\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:378
++#: src/dxr3/dxr3_decode_video.c:619
+ #, c-format
+-msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+-msgstr ""
+-
+-#: src/libreal/audio_decoder.c:415
+-msgid "libareal: oups, real can do more than 2 channels ?\n"
++msgid "dxr3_decode_video: video device write failed (%s)\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
+-msgid "path to RealPlayer codecs"
++#: src/dxr3/dxr3_decode_video.c:734
++#, c-format
++msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n"
+ msgstr ""
+
+-#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++#: src/dxr3/dxr3_decode_video.c:762
+ msgid ""
+-"If you have RealPlayer installed, specify the path to its codec directory "
+-"here. You can easily find the codec directory by looking for a file named "
+-"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
+-"them to decode RealPlayer content for you. Consult the xine FAQ for more "
+-"information on how to install the codecs."
+-msgstr ""
+-
+-#: src/libreal/xine_decoder.c:195
+-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
++"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:192
+-msgid "display closed captions in MPEG-2 streams"
++#: src/audio_out/audio_oss_out.c:191
++#, c-format
++msgid "audio_oss_out: Opening audio device %s: %s\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:193
++#: src/audio_out/audio_oss_out.c:213
++#, c-format
+ msgid ""
+-"Closed Captions are subtitles mostly meant to help the hearing impaired."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:200
+-msgid "closed-captioning foreground/background scheme"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:201
+-msgid "Choose your favourite rendering of the closed captions."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:207
+-msgid "standard closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:208
+-msgid "Choose the font for standard closed captions text."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:214
+-msgid "italic closed captioning font"
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:215
+-msgid "Choose the font for italic closed captions text."
+-msgstr ""
+-
+-#: src/libspucc/xine_decoder.c:221
+-msgid "closed captioning font size"
++"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:222
+-msgid "Choose the font size for closed captions text."
++#: src/audio_out/audio_oss_out.c:225
++#, c-format
++msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:226
+-msgid "center-adjust closed captions"
++#: src/audio_out/audio_oss_out.c:736
++msgid "OSS audio device name"
+ msgstr ""
+
+-#: src/libspucc/xine_decoder.c:227
++#: src/audio_out/audio_oss_out.c:737
+ msgid ""
+-"When enabled, closed captions will be positioned by the center of the "
+-"individual lines."
++"Specifies the base part of the audio device name, to which the OSS device "
++"number is appended to get the full device name.\n"
++"Select \"auto\" if you want xine to auto detect the corret setting."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:478
+-msgid "font for external subtitles"
++#: src/audio_out/audio_oss_out.c:744
++msgid "OSS audio device number, -1 for none"
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:484
+-msgid "subtitle vertical offset (relative window size)"
++#: src/audio_out/audio_oss_out.c:745
++msgid ""
++"The full audio device name is created by concatenating the OSS device name "
++"and the audio device number.\n"
++"If you do not need a number because you are happy with your system's default "
++"audio device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libspucmml/xine_decoder.c:530
+-msgid "encoding of subtitles"
++#: src/audio_out/audio_oss_out.c:754
++msgid "audio_oss_out: audio.device.oss_device_name = auto, probing devs\n"
+ msgstr ""
+
+-#: src/libspudvb/xine_decoder.c:622
+-msgid "dvbsub: cannot create timer thread\n"
++#: src/audio_out/audio_oss_out.c:757
++msgid "audio_oss_out: Auto probe for audio device failed\n"
+ msgstr ""
+
+-#: src/libsputext/demux_sputext.c:1506
+-msgid "default duration of subtitle display in seconds"
++#: src/audio_out/audio_oss_out.c:773
++#, c-format
++msgid "audio_oss_out: using device >%s<\n"
+ msgstr ""
+
+-#: src/libsputext/demux_sputext.c:1507
++#: src/audio_out/audio_oss_out.c:779 src/audio_out/audio_oss_out.c:894
++#, c-format
+ 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."
++"audio_oss_out: opening audio device %s failed:\n"
++"%s\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:900
+-msgid "subtitle size"
++#: src/audio_out/audio_oss_out.c:800
++msgid "a/v sync method to use by OSS"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:901
++#: src/audio_out/audio_oss_out.c:801
+ msgid ""
+-"You can adjust the subtitle size here. The setting will be evaluated "
+-"relative to the window size."
+-msgstr ""
+-
+-#: src/libsputext/xine_decoder.c:907
+-msgid "subtitle vertical offset"
++"xine can use different methods to keep audio and video synchronized. Which "
++"setting works best depends on the OSS driver and sound hardware you are "
++"using. Try the various methods, if you experience sync problems.\n"
++"\n"
++"The meaning of the values is as follows:\n"
++"\n"
++"auto\n"
++"xine attempts to automatically detect the optimal setting\n"
++"\n"
++"getodelay\n"
++"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the "
++"driver claims not to support realtime playback\n"
++"\n"
++"getoptr\n"
++"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the "
++"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n"
++"\n"
++"softsync\n"
++"uses software synchronization with the system clock; audio and video can get "
++"severely out of sync if the system clock speed does not precisely match your "
++"sound card's playback speed\n"
++"\n"
++"probebuffer\n"
++"probes the sound card buffer size on initialization to calculate the latency "
++"for a/v sync; try this if your system does not support any of the realtime "
++"ioctls and you experience sync errors after long playback"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:908
++#: src/audio_out/audio_oss_out.c:849
+ msgid ""
+-"You can adjust the vertical position of the subtitle. The setting will be "
+-"evaluated relative to the window size."
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...will use system real-time clock for soft-sync instead\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:914
+-msgid "font for subtitles"
++#: src/audio_out/audio_oss_out.c:856
++msgid "OSS audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:915
+-msgid "A font from the xine font directory to be used for the subtitle text."
++#: src/audio_out/audio_oss_out.c:857 src/audio_out/audio_esd_out.c:537
++msgid ""
++"If you experience audio being not in sync with the 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/libsputext/xine_decoder.c:922
+-msgid "encoding of the subtitles"
++#: src/audio_out/audio_oss_out.c:870
++msgid ""
++"audio_oss_out: Audio driver realtime sync disabled...\n"
++"audio_oss_out: ...probing output buffer size: "
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:923
++#: src/audio_out/audio_oss_out.c:887
++#, c-format
+ 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 "
+-"displayed as you expect, ask the creator of the subtitles what encoding was "
+-"used."
++"%d bytes\n"
++"audio_oss_out: ...there may be audio/video synchronization issues\n"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:931
+-msgid "use unscaled OSD if possible"
++#: src/audio_out/audio_oss_out.c:919 src/audio_out/audio_alsa_out.c:1431
++msgid "speaker arrangement"
+ msgstr ""
+
+-#: src/libsputext/xine_decoder.c:932
++#: src/audio_out/audio_oss_out.c:920 src/audio_out/audio_alsa_out.c:1432
+ 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 "
+-"does not work with all graphics hardware. The alternative is the scaled OSD, "
+-"which will become blurry, if you enlarge a low resolution video to "
+-"fullscreen, but it works with all graphics cards."
++"Select how your speakers are arranged, this determines which speakers xine "
++"uses for sound output. The individual values are:\n"
++"\n"
++"Mono 1.0: You have only one speaker.\n"
++"Stereo 2.0: You have two speakers for left and right channel.\n"
++"Headphones 2.0: You use headphones.\n"
++"Stereo 2.1: You have two speakers for left and right channel, and one "
++"subwoofer for the low frequencies.\n"
++"Surround 3.0: You have three speakers for left, right and rear channel.\n"
++"Surround 4.0: You have four speakers for front left and right and rear left "
++"and right channels.\n"
++"Surround 4.1: You have four speakers for front left and right and rear left "
++"and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 5.0: You have five speakers for front left, center and right and "
++"rear left and right channels.\n"
++"Surround 5.1: You have five speakers for front left, center and right and "
++"rear left and right channels, and one subwoofer for the low frequencies.\n"
++"Surround 6.0: You have six speakers for front left, center and right and "
++"rear left, center and right channels.\n"
++"Surround 6.1: You have six speakers for front left, center and right and "
++"rear left, center and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Surround 7.1: You have seven speakers for front left, center and right, left "
++"and right and rear left and right channels, and one subwoofer for the low "
++"frequencies.\n"
++"Pass Through: Your sound system will receive undecoded digital sound from "
++"xine. You need to connect a digital surround decoder capable of decoding the "
++"formats you want to play to your sound card's digital output."
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:621 src/libw32dll/qt_decoder.c:1141
+-#: src/libw32dll/w32codec.c:1590 src/libw32dll/w32codec.c:1667
+-msgid "path to Win32 codecs"
++#: src/audio_out/audio_oss_out.c:1016
++msgid "OSS audio mixer number, -1 for none"
+ msgstr ""
+
+-#: src/libw32dll/qt_decoder.c:622 src/libw32dll/qt_decoder.c:1142
+-#: src/libw32dll/w32codec.c:1591 src/libw32dll/w32codec.c:1668
++#: src/audio_out/audio_oss_out.c:1017
+ msgid ""
+-"If you have the Windows or Apple Quicktime codec packs installed, specify "
+-"the path the codec directory here. If xine can find the Windows or Apple "
+-"Quicktime codecs, it will use them to decode various Windows Media and "
+-"Quicktime streams for you. Consult the xine FAQ for more information on how "
+-"to install the codecs."
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:586
+-#, c-format
+-msgid "w32codec: ICOpen failed! unknown codec %08lx / wrong parameters?\n"
++"The full mixer device name is created by taking the OSS device name, "
++"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n"
++"If you do not need a number because you are happy with your system's default "
++"mixer device, set this to -1.\n"
++"The range of this value is -1 or 0-15. This setting is ignored, when the OSS "
++"audio device name is set to \"auto\"."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:595
++#: src/audio_out/audio_oss_out.c:1074
+ #, c-format
+-msgid "w32codec: ICDecompressGetFormat (%.4s %08lx/%d) failed: Error %ld\n"
++msgid "audio_oss_out: open() mixer %s failed: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:628
+-#, c-format
+-msgid "w32codec: ICDecompressQuery failed: Error %ld\n"
++#: src/audio_out/audio_oss_out.c:1147
++msgid "xine audio output plugin using oss-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:639
++#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:914
+ #, c-format
+-msgid "w32codec: ICDecompressBegin failed: Error %ld\n"
++msgid "audio_sun_out: opening audio device %s failed: %s\n"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:685
+-#, c-format
+-msgid ""
+-"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
++#: src/audio_out/audio_sun_out.c:889
++msgid "Sun audio device name"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:696
+-#, c-format
++#: src/audio_out/audio_sun_out.c:890
+ msgid ""
+-"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n"
+-msgstr ""
+-
+-#: src/libw32dll/w32codec.c:816 src/libw32dll/w32codec.c:1479
+-#, c-format
+-msgid "w32codec: decoder failed to start. Is '%s' installed?\n"
++"Specifies the file name for the Sun audio device to be used.\n"
++"This setting is security critical, because when changed to a different file, "
++"xine can be used to fill this file with arbitrary content. So you should be "
++"careful that the value you enter really is a proper Sun audio device."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1213
+-msgid "w32codec: (ACM_Decoder) Unappropriate audio format\n"
++#: src/audio_out/audio_sun_out.c:970
++msgid "xine audio output plugin using sun-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1216
+-#, c-format
+-msgid "w32codec: (ACM_Decoder) acmStreamOpen error %d\n"
++#: src/audio_out/audio_irixal_out.c:385
++msgid "irixal audio output maximum gap length"
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1235
+-msgid "w32codec: Error initializing DirectShow Audio\n"
++#: src/audio_out/audio_irixal_out.c:386
++msgid ""
++"You can specify the maximum offset between audio and video xine will "
++"tolerate before trying to resync them.\n"
++"The unit of this value is one PTS tick, which is the 90000th part of a "
++"second."
+ msgstr ""
+
+-#: src/libw32dll/w32codec.c:1253
+-msgid "w32codec: Error initializing DMO Audio\n"
++#: src/audio_out/audio_irixal_out.c:415
++msgid "xine audio output plugin using IRIX libaudio"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1271
+-msgid "bitplane: error doing ByteRun1 decompression\n"
++#: src/audio_out/audio_none_out.c:223
++msgid "xine dummy audio output plugin"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1330
+-msgid "bitplane: Anim Opt 1 is not supported at the moment\n"
++#: src/audio_out/audio_arts_out.c:369
++msgid "xine audio output plugin using kde artsd"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1337
+-msgid "bitplane: Anim Opt 2 is not supported at the moment\n"
++#: src/audio_out/audio_alsa_out.c:376
++msgid "audio_alsa_out:Already open...WHY!"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1387
+-msgid "bitplane: Anim ASCIIJ is not supported at the moment\n"
++#: src/audio_out/audio_alsa_out.c:391
++#, c-format
++msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
+ msgstr ""
+
+-#: src/libxinevdec/bitplane.c:1393
+-msgid "bitplane: This anim-type is not supported at the moment\n"
++#: src/audio_out/audio_alsa_out.c:393
++msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/post/audio/stretch.c:264
++#: src/audio_out/audio_alsa_out.c:406
++#, c-format
+ msgid ""
+-"This filter will perform a time stretch, playing the stream faster or slower "
+-"by a factor. Pitch is optionally preserved, so it is possible, for example, "
+-"to use it to watch a movie in less time than it was originaly shot.\n"
++"audio_alsa_out: broken configuration for this PCM: no configurations "
++"available: %s\n"
+ msgstr ""
+
+-#: src/post/audio/upmix.c:137
+-msgid ""
+-"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
+-"Parameters\n"
+-" cut_off_freq\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
++#: src/audio_out/audio_alsa_out.c:1265
++msgid "notify changes to the hardware mixer"
+ msgstr ""
+
+-#: src/post/deinterlace/xine_plugin.c:200
++#: src/audio_out/audio_alsa_out.c:1266
+ msgid ""
+-"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
+-"This plugin aims to provide deinterlacing mechanisms comparable to high "
+-"quality progressive DVD players and so called line-doublers, for use with "
+-"computer monitors, projectors and other progressive display devices.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Method: Select deinterlacing method/algorithm to use, see below for "
+-"explanation of each method.\n"
+-"\n"
+-" Enabled: Enable/disable the plugin.\n"
+-"\n"
+-" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
+-"have being converted to NTSC can be detected and intelligently reconstructed "
+-"to their original (non-interlaced) frames.\n"
+-"\n"
+-" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
+-"frame for television quality and beyond. This feature will effetively double "
+-"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
+-"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
+-"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
+-"(512 and 1000, respectively) and should work fine.\n"
+-"\n"
+-" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
+-"detected, it is possible to reduce the frame rate to original rate used (24 "
+-"FPS). This will make the frames evenly spaced in time, matching the speed "
+-"they were shot and eliminating the judder effect.\n"
+-"\n"
+-" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
+-"indicate progressive material. This setting control whether we trust this "
+-"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
+-"\n"
+-" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
+-"poor vertical chroma resolution. Upsampling the chroma for purposes of "
+-"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+-"this option to blur the chroma vertically after deinterlacing to remove the "
+-"artifacts. Warning: cpu intensive.\n"
+-"\n"
+-" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
+-"tricking tvtime/dscaler routines like if they were still handling YUY2 "
+-"images. Of course, this is not correct, not all pixels will be evaluated by "
+-"the algorithms to decide the regions to deinterlace and chroma will be "
+-"processed separately. Nevertheless, it allows people with not so fast "
+-"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
+-"usage.\n"
+-"\n"
+-"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
+-"\n"
+-"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
+-"\n"
+-"* Uses several algorithms from tvtime and dscaler projects.\n"
++"When the hardware mixer changes, your application will receive a "
++"notification so that it can update its graphical representation of the mixer "
++"settings on the fly."
+ msgstr ""
+
+-#: src/post/deinterlace/xine_plugin.c:326
+-msgid "tvtime: No deinterlacing methods available, exiting.\n"
++#: src/audio_out/audio_alsa_out.c:1327
++#, c-format
++msgid "snd_lib_error_set_handler() failed: %d"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:200
+-msgid "frames per second to generate"
++#: src/audio_out/audio_alsa_out.c:1334
++msgid "sound card can do mmap"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:201
++#: src/audio_out/audio_alsa_out.c:1335
+ msgid ""
+-"With more frames per second, the animation will get smoother and faster, but "
+-"will also require more CPU power."
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:206
+-msgid "goom image width"
+-msgstr ""
+-
+-#: src/post/goom/xine_goom.c:207
+-msgid "The width in pixels of the image to be generated."
++"Enable this, if your sound card and alsa driver support memory mapped IO.\n"
++"You can try enabling it and check, if everything works. If it does, this "
++"will increase performance."
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:211
+-msgid "goom image height"
++#: src/audio_out/audio_alsa_out.c:1344
++msgid "device used for mono output"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:212
+-msgid "The height in pixels of the image to be generated."
++#: src/audio_out/audio_alsa_out.c:1345
++msgid ""
++"xine will use this alsa device to output mono sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:218
+-msgid "colorspace conversion method"
++#: src/audio_out/audio_alsa_out.c:1353
++msgid "device used for stereo output"
+ msgstr ""
+
+-#: src/post/goom/xine_goom.c:219
++#: src/audio_out/audio_alsa_out.c:1354
+ msgid ""
+-"You can choose the colorspace conversion method used by goom.\n"
+-"The available selections should be self-explaining."
++"xine will use this alsa device to output stereo sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/post/mosaico/mosaico.c:273
+-msgid ""
+-"Mosaico does simple picture in picture effects.\n"
+-"\n"
+-"Parameters\n"
+-" pip_num: the number of the picture slot the following settings apply to\n"
+-" x: the x coordinate of the left upper corner of the picture\n"
+-" y: the y coordinate of the left upper corner of the picture\n"
+-" w: the width of the picture\n"
+-" h: the height of the picture\n"
++#: src/audio_out/audio_alsa_out.c:1362
++msgid "device used for 4-channel output"
+ msgstr ""
+
+-#: src/post/mosaico/switch.c:230
++#: src/audio_out/audio_alsa_out.c:1363
+ msgid ""
+-"Switch can be used for fast switching between multiple inputs.\n"
+-"\n"
+-"Parameters\n"
+-" select: the number of the input which will be passed to the output\n"
++"xine will use this alsa device to output 4 channel (4.0) surround sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/post/planar/boxblur.c:103
+-msgid ""
+-"Box blur does a simple blurring of the image.\n"
+-"\n"
+-"Parameters\n"
+-" Radius: size of the filter\n"
+-" Power: how often the filter should be applied\n"
+-"\n"
+-"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
++#: src/audio_out/audio_alsa_out.c:1372 src/audio_out/audio_alsa_out.c:1382
++msgid "device used for 5.1-channel output"
+ msgstr ""
+
+-#: src/post/planar/denoise3d.c:136
++#: src/audio_out/audio_alsa_out.c:1373
+ msgid ""
+-"This filter aims to reduce image noise producing smooth images and making "
+-"still images really still (This should enhance compressibility.). It can be "
+-"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
+-"will be inferred.\n"
+-"\n"
+-"Parameters\n"
+-" Luma: Spatial luma strength (default = 4)\n"
+-" Chroma: Spatial chroma strength (default = 3)\n"
+-" Time: Temporal strength (default = 6)\n"
+-"\n"
+-"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
++"xine will use this alsa device to output 5 channel plus LFE (5.1) surround "
++"sound.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/post/planar/eq.c:186
++#: src/audio_out/audio_alsa_out.c:1383
+ msgid ""
+-"Software equalizer with interactive controls just like the hardware "
+-"equalizer, for cards/drivers that do not support brightness and contrast "
+-"controls in hardware.\n"
+-"\n"
+-"Parameters\n"
+-" brightness\n"
+-" contrast\n"
+-"\n"
+-"Note: It is possible to use frontend's control window to set these "
+-"parameters.\n"
+-"\n"
+-"* mplayer's eq (C) Richard Felker\n"
++"xine will use this alsa device to output undecoded digital surround sound. "
++"This can be used be external surround decoders.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/post/planar/eq2.c:359
+-msgid ""
+-"Alternative software equalizer that uses lookup tables (very slow), allowing "
+-"gamma correction in addition to simple brightness, contrast and saturation "
+-"adjustment.\n"
+-"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
+-"are 1.0.\n"
+-"\n"
+-"Parameters\n"
+-" gamma\n"
+-" brightness\n"
+-" contrast\n"
+-" saturation\n"
+-" rgamma (gamma for the red component)\n"
+-" ggamma (gamma for the green component)\n"
+-" bgamma (gamma for the blue component)\n"
+-"\n"
+-"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
+-"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
+-"saturation.\n"
+-"\n"
+-"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
++#: src/audio_out/audio_alsa_out.c:1403
++#, c-format
++msgid "snd_pcm_open() failed:%d:%s\n"
+ msgstr ""
+
+-#: src/post/planar/expand.c:223
+-msgid ""
+-"The expand plugin is meant to take frames of arbitrary aspect ratio and "
+-"converts them to 4:3 aspect by adding black bars on the top and bottom of "
+-"the frame. This allows us to shift overlays down into the black area so they "
+-"don't cover the image.\n"
+-"\n"
+-"Parameters (FIXME: better help)\n"
+-" Enable_automatic_shift: Enable automatic overlay shifting\n"
+-" Overlay_y_offset: Manually shift the overlay vertically\n"
+-"\n"
++#: src/audio_out/audio_alsa_out.c:1405
++msgid ">>> Check if another program already uses PCM <<<\n"
+ msgstr ""
+
+-#: src/post/planar/pp.c:108
+-msgid ""
+-"FFmpeg libpostprocess plugin.\n"
+-"\n"
+-"Parameters\n"
+-"\n"
++#: src/audio_out/audio_alsa_out.c:1461
++msgid "audio_alsa_out : supported modes are "
+ msgstr ""
+
+-#: src/post/planar/pp.c:114
+-msgid ""
+-"\n"
+-"* libpostprocess (C) Michael Niedermayer\n"
++#: src/audio_out/audio_alsa_out.c:1464
++msgid "8bit "
+ msgstr ""
+
+-#: src/post/planar/unsharp.c:219
+-msgid ""
+-"Unsharp mask / gaussian blur\n"
+-"It is possible to set the width and height of the matrix, odd sized in both "
+-"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
+-"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
+-"sane range should be -1.5 - 1.5).\n"
+-"\n"
+-"Parameters\n"
+-"\n"
+-" Luma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Luma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-" Chroma_matrix_width: Width of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_matrix_height: Height of the matrix (must be odd)\n"
+-"\n"
+-" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
+-"sharpen)\n"
+-"\n"
+-"\n"
+-"* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
++#: src/audio_out/audio_alsa_out.c:1469
++msgid "16bit "
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1767
+-msgid "disable exact alpha blending of overlays"
++#: src/audio_out/audio_alsa_out.c:1473
++msgid "24bit "
+ msgstr ""
+
+-#: src/video_out/alphablend.c:1768
+-msgid ""
+-"If you experience a performance impact when an On Screen Display or other "
+-"overlays like DVD subtitles are active, then you might want to enable this "
+-"option.\n"
+-"The result is that alpha blending of overlays is less accurate than before, "
+-"but the CPU usage will be decreased as well."
++#: src/audio_out/audio_alsa_out.c:1477
++msgid "32bit "
+ msgstr ""
+
+-#: src/video_out/video_out_aa.c:309
+-msgid "xine video output plugin using the ascii-art library"
++#: src/audio_out/audio_alsa_out.c:1481
++msgid "mono "
+ msgstr ""
+
+-#: src/video_out/video_out_caca.c:311
+-msgid "xine video output plugin using the Color AsCii Art library"
++#: src/audio_out/audio_alsa_out.c:1485
++msgid "stereo "
+ msgstr ""
+
+-#: src/video_out/video_out_directfb.c:576
+-msgid "xine video output plugin using the DirectFB library."
++#: src/audio_out/audio_alsa_out.c:1490
++msgid "4-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_directx.c:1223
+-msgid "xine video output plugin for win32 using directx"
++#: src/audio_out/audio_alsa_out.c:1493
++msgid "(4-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:762
+-#, c-format
+-msgid ""
+-"video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+-" Check 'fbset -i' or try 'fbset -depth 16'.\n"
++#: src/audio_out/audio_alsa_out.c:1498
++msgid "4.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:796 src/video_out/video_out_vidix.c:1210
+-msgid "framebuffer device name"
++#: src/audio_out/audio_alsa_out.c:1501
++msgid "(4.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:797 src/video_out/video_out_vidix.c:1211
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_alsa_out.c:1506
++msgid "5-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:871
+-msgid "video_out_fb: Your video mode was not recognized, sorry.\n"
++#: src/audio_out/audio_alsa_out.c:1509
++msgid "(5-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:887 src/video_out/video_out_opengl.c:1329
+-#: src/video_out/video_out_xshm.c:1241
+-msgid "brightness correction"
++#: src/audio_out/audio_alsa_out.c:1514
++msgid "5.1-channel "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:888 src/video_out/video_out_opengl.c:1330
+-#: src/video_out/video_out_xshm.c:1242
+-msgid ""
+-"The brightness correction can be used to lighten or darken the image. It "
+-"changes the blacklevel without modifying the contrast, but it limits the "
+-"tonal range."
++#: src/audio_out/audio_alsa_out.c:1517
++msgid "(5.1-channel not enabled in xine config) "
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:932
+-#, c-format
+-msgid "video_out_fb: %d video RAM buffers are available.\n"
++#: src/audio_out/audio_alsa_out.c:1540
++msgid "a/52 and DTS pass-through\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:938
+-#, c-format
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d "
+-"buffers\n"
+-" are available which is less than the recommended %d buffers. Lowering\n"
+-" the frame buffer resolution might help.\n"
++#: src/audio_out/audio_alsa_out.c:1543
++msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:949
+-msgid ""
+-"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n"
+-" do not support screen panning (used for frame flips).\n"
++#: src/audio_out/audio_alsa_out.c:1550
++msgid "alsa mixer device"
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1016
+-#, c-format
++#: src/audio_out/audio_alsa_out.c:1551
+ msgid ""
+-"WARNING: video_out_fb: current display depth is %d. For better performance\n"
+-" a depth of 16 bpp is recommended!\n"
+-"\n"
++"xine will use this alsa mixer device to change the volume.\n"
++"See the alsa documentation for information on alsa devices."
+ msgstr ""
+
+-#: src/video_out/video_out_fb.c:1047
+-msgid "Xine video output plugin using the Linux frame buffer device"
++#: src/audio_out/audio_alsa_out.c:1619
++msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
+ msgstr ""
+
+-#: src/video_out/video_out_none.c:277
+-msgid "xine video output plugin which displays nothing"
++#: src/audio_out/audio_directx2_out.c:162
++msgid "Error"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1352
+-msgid "OpenGL renderer"
++#: src/audio_out/audio_directx2_out.c:169
++msgid "success"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1353
+-msgid ""
+-"The OpenGL plugin provides several render modules:\n"
+-"\n"
+-"2D_Textures\n"
+-"This module downloads the images as 2D textures and renders a textured "
+-"slice.\n"
+-"This is typically the fastest method.\n"
+-"\n"
+-"Image_Pipeline\n"
+-"This module uses glDraw() to render the images.\n"
+-"Only accelerated on few drivers.\n"
+-"Does not interpolate on scaling.\n"
+-"\n"
+-"Cylinder\n"
+-"Shows images on a rotating cylinder. Nice effect :)\n"
+-"\n"
+-"Environment_Mapped_Torus\n"
+-"Show images reflected in a spinning torus. Way cool =)"
++#: src/audio_out/audio_directx2_out.c:171
++msgid "access denied"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1369
+-msgid "OpenGL minimum framerate"
++#: src/audio_out/audio_directx2_out.c:173
++msgid "resource is already in use"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1370
+-msgid ""
+-"Minimum framerate for animated render routines.\n"
+-"Ignored for static render routines.\n"
++#: src/audio_out/audio_directx2_out.c:174
++msgid "object was already initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1375 src/video_out/video_out_vidix.c:986
+-#: src/video_out/video_out_xv.c:1454 src/video_out/video_out_xvmc.c:1520
+-#: src/video_out/video_out_xxmc.c:2339
+-msgid "enable double buffering"
++#: src/audio_out/audio_directx2_out.c:175
++msgid "specified wave format is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1376
+-msgid ""
+-"For OpenGL double buffering does not only remove tearing artifacts,\n"
+-"it also reduces flickering a lot.\n"
+-"It should not have any performance impact."
++#: src/audio_out/audio_directx2_out.c:176
++msgid "memory buffer has been lost and must be restored"
+ msgstr ""
+
+-#: src/video_out/video_out_opengl.c:1423 src/video_out/video_out_xshm.c:1274
+-msgid "xine video output plugin using the MIT X shared memory extension"
++#: src/audio_out/audio_directx2_out.c:177
++msgid "requested buffer control is not available"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:191
+-msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_directx2_out.c:178
++msgid "undetermined error inside DirectSound subsystem"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:210 src/video_out/video_out_pgx32.c:224
+-#, c-format
+-msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n"
++#: src/audio_out/audio_directx2_out.c:180
++msgid "DirectSound hardware device is unavailable"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx32.c:217
+-#, c-format
+-msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n"
++#: src/audio_out/audio_directx2_out.c:182
++msgid "function is not valid for the current state of the object"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:282
+-msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n"
++#: src/audio_out/audio_directx2_out.c:183
++msgid "invalid parameter was passed"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:300
+-#, c-format
+-msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n"
++#: src/audio_out/audio_directx2_out.c:184
++msgid "object doesn't support aggregation"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:307
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n"
++#: src/audio_out/audio_directx2_out.c:185
++msgid "no sound driver available for use"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:320
+-#, c-format
+-msgid ""
+-"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n"
++#: src/audio_out/audio_directx2_out.c:186
++msgid "requested COM interface not available"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:341
+-msgid ""
+-"video_out_pgx64: Error: video overlay on this screen is already in use\n"
++#: src/audio_out/audio_directx2_out.c:187
++msgid "another application has a higher priority level"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:356
+-msgid "video_out_pgx64: Error: unable to set window properties\n"
++#: src/audio_out/audio_directx2_out.c:188
++msgid "insufficient memory"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:812
+-msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n"
++#: src/audio_out/audio_directx2_out.c:189
++msgid "low priority level for this function"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:844
+-msgid "video_out_pgx64: Error: insuffucient video memory\n"
++#: src/audio_out/audio_directx2_out.c:190
++msgid "DirectSound wasn't initialized"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:860
+-msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n"
++#: src/audio_out/audio_directx2_out.c:191
++msgid "function is not supported"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1401
+-msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
++#: src/audio_out/audio_directx2_out.c:192
++msgid "unknown error"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1468 src/video_out/video_out_xv.c:1421
+-#: src/video_out/video_out_xvmc.c:1505 src/video_out/video_out_xxmc.c:2306
+-msgid "video overlay colour key"
++#: src/audio_out/audio_directx2_out.c:202
++msgid "Unable to create direct sound object."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1469
+-msgid ""
+-"The colour key is used to tell the graphics card where it can overlay the "
+-"video image. Try using different values if you see the video showing through "
+-"other windows."
++#: src/audio_out/audio_directx2_out.c:208
++msgid "Could not set direct sound cooperative level."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1474
+-msgid "video brightness"
++#: src/audio_out/audio_directx2_out.c:282
++msgid "Unable to create secondary direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1475
+-msgid "The brightness of the video image."
++#: src/audio_out/audio_directx2_out.c:306
++msgid "Unable to create buffer position events."
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1478
+-msgid "video saturation"
++#: src/audio_out/audio_directx2_out.c:314
++msgid "Unable to get notification interface"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1479
+-msgid "The saturation of the video image."
++#: src/audio_out/audio_directx2_out.c:319
++msgid "Unable to set notification positions"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1482
+-msgid "enable chroma keying"
++#: src/audio_out/audio_directx2_out.c:339
++msgid "Couldn't play sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1483
+-msgid ""
+-"Draw OSD graphics on top of the overlay colour key rather than blend them "
+-"into each frame."
++#: src/audio_out/audio_directx2_out.c:351
++msgid "Couldn't stop sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1486
+-msgid "enable multi-buffering"
++#: src/audio_out/audio_directx2_out.c:364
++msgid "Can't get buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_pgx64.c:1487
+-msgid ""
+-"Multi buffering increases performance at the expense of using more graphics "
+-"memory."
++#: src/audio_out/audio_directx2_out.c:378
++msgid "Can't set buffer position"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:479
+-msgid "use hardware acceleration if available"
++#: src/audio_out/audio_directx2_out.c:410
++msgid "Can't set sound volume"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:480
+-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."
++#: src/audio_out/audio_directx2_out.c:428
++msgid ": buffer lost, tryig to restore\n"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:522
+-msgid "sdl has to emulate a 16 bit surfaces, that will slow things down.\n"
++#: src/audio_out/audio_directx2_out.c:432
++msgid "Couldn't lock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:559
+-msgid "video_out_sdl: fullscreen mode is NOT supported\n"
++#: src/audio_out/audio_directx2_out.c:443
++msgid "Couldn't unlock direct sound buffer"
+ msgstr ""
+
+-#: src/video_out/video_out_sdl.c:570
+-msgid "xine video output plugin using the Simple Direct Media Layer"
++#: src/audio_out/audio_directx2_out.c:540
++msgid "Unable to create primary direct sound buffer."
+ msgstr ""
+
+-#. printf("video_out_stk: get_description()\n");
+-#: src/video_out/video_out_stk.c:452
+-msgid "xine video output plugin using the Libstk Surface Set-top Toolkit"
++#: src/audio_out/audio_directx2_out.c:633
++msgid ": play cursor overran, flushing buffers\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:282
+-msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:651
++#, c-format
++msgid ": delayed by %ld msec\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:298
+-msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n"
++#: src/audio_out/audio_directx2_out.c:755
++#, c-format
++msgid ": can't create pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:936
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n"
++#: src/audio_out/audio_directx2_out.c:759
++#, c-format
++msgid ": can't create pthread mutex: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:941
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n"
++#: src/audio_out/audio_directx2_out.c:766
++#, c-format
++msgid ": can't create buffer pthread: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:946
+-msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n"
++#: src/audio_out/audio_directx2_out.c:873
++#, c-format
++msgid ": can't destroy buffer pthread: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:952
+-msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n"
++#: src/audio_out/audio_directx2_out.c:880
++#, c-format
++msgid ": can't destroy pthread condition: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:959
+-msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:883
++#, c-format
++msgid ": can't destroy pthread mutex: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:964
+-msgid ""
+-"video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor "
+-"RGB565)\n"
++#: src/audio_out/audio_directx2_out.c:943
++#, c-format
++msgid ": unknown control command %d\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:983
+-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"
++#: src/audio_out/audio_directx2_out.c:996
++msgid "second xine audio output plugin using directx"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1007
+-msgid "default number of frame repetitions"
++#: src/audio_out/audio_esd_out.c:167
++#, c-format
++msgid "audio_esd_out: connecting to ESD server %s: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1008
+-msgid ""
+-"This specifies how many times a single video frame will be displayed "
+-"consecutively."
++#: src/audio_out/audio_esd_out.c:499
++msgid "audio_esd_out: connecting to esd server...\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1056
+-msgid ""
+-"xine video output plugin using the SyncFB module for Matrox G200/G400 cards"
++#: src/audio_out/audio_esd_out.c:511
++#, c-format
++msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1073
+-msgid "SyncFB device name"
++#: src/audio_out/audio_esd_out.c:536
++msgid "esd audio output latency (adjust a/v sync)"
+ msgstr ""
+
+-#: src/video_out/video_out_syncfb.c:1074
+-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, "
+-"xine can be used to fill this file with arbitrary content. So you should be "
+-"careful that the value you enter really is a proper framebuffer device."
++#: src/audio_out/audio_esd_out.c:569
++msgid "xine audio output plugin using esound"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "red intensity"
++#: src/audio_out/audio_coreaudio_out.c:452
++msgid "xine output plugin for Coreaudio/Mac OS X"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:964
+-msgid "The intensity of the red colour components."
++#: src/audio_out/audio_directx_out.c:827
++msgid "xine audio output plugin for win32 using directx"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "green intensity"
++#: src/audio_out/audio_file_out.c:362
++msgid "xine file audio output plugin"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:969
+-msgid "The intensity of the green colour components."
++#: src/audio_out/audio_polyp_out.c:489
++msgid "device used for polypaudio"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "blue intensity"
++#: src/audio_out/audio_polyp_out.c:490
++msgid "use 'server[:sink]' for setting the polypaudio sink device."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:974
+-msgid "The intensity of the blue colour components."
++#: src/audio_out/audio_polyp_out.c:535
++msgid "xine audio output plugin using polypaudio sound server"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:987 src/video_out/video_out_xv.c:1455
+-#: src/video_out/video_out_xvmc.c:1521 src/video_out/video_out_xxmc.c:2340
+-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."
++#: src/xine-engine/audio_decoder.c:347
++#, c-format
++msgid "audio_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1034
+-msgid "video_out_vidix: adaptor supports the yuy2 format\n"
++#: src/xine-engine/audio_decoder.c:364
++#, c-format
++msgid "audio_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1045
+-msgid "video_out_vidix: adaptor supports the yv12 format\n"
++#: src/xine-engine/audio_decoder.c:466
++msgid "number of audio buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1061
+-msgid "video_out_vidix: You have wrong version of VIDIX library\n"
++#: src/xine-engine/audio_decoder.c:467
++msgid ""
++"The number of audio 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/video_out/video_out_vidix.c:1069
+-msgid "video_out_vidix: Couldn't find working VIDIX driver\n"
++#: src/xine-engine/video_decoder.c:373
++#, c-format
++msgid "video_decoder: no plugin available to handle '%s'\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1082
++#: src/xine-engine/video_decoder.c:447
+ #, c-format
+-msgid "video_out_vidix: using driver: %s by %s\n"
++msgid "video_decoder: error, unknown buffer type: %08x\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1129
+-msgid "video overlay colour key red component"
++#: src/xine-engine/video_decoder.c:483
++msgid "number of video buffers"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1130 src/video_out/video_out_vidix.c:1137
+-#: src/video_out/video_out_vidix.c:1144 src/video_out/video_out_xv.c:1422
+-#: src/video_out/video_out_xvmc.c:1506 src/video_out/video_out_xxmc.c:2307
++#: src/xine-engine/video_decoder.c:484
+ 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."
++"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/video_out/video_out_vidix.c:1136
+-msgid "video overlay colour key green component"
++#: src/xine-engine/configfile.c:891
++msgid "The current config file has been modified by a newer version of xine."
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1143
+-msgid "video overlay colour key blue component"
++#: src/xine-engine/configfile.c:996
++#, c-format
++msgid "configfile: WARNING: backing up configfile to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1175
+-msgid "xine video output plugin using libvidix for x11"
++#: src/xine-engine/configfile.c:997
++msgid "configfile: WARNING: your configuration will not be saved\n"
+ msgstr ""
+
+-#: src/video_out/video_out_vidix.c:1257
+-msgid "xine video output plugin using libvidix for linux frame buffer"
++#: src/xine-engine/configfile.c:1096
++#, c-format
++msgid "configfile: WARNING: writing configuration to %s failed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:190
+-msgid ""
+-"video_out_xshm: shared memory error when allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/configfile.c:1097
++#, c-format
++msgid "configfile: WARNING: removing possibly broken config file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:206
++#: src/xine-engine/configfile.c:1098
+ #, c-format
+-msgid ""
+-"video_out_xshm: %s: allocating image\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++msgid "configfile: WARNING: you should check the backup file %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:216
+-msgid ""
+-"video_out_xshm: shared memory error (address error) when allocating image \n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/configfile.c:1218
++#, c-format
++msgid "configfile: entry '%s' mustn't be modified from MRL\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:233
+-msgid ""
+-"video_out_xshm: x11 error during shared memory XImage creation\n"
+-"video_out_xshm: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/info_helper.c:204
++msgid "info_helper: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1138
++#: src/xine-engine/info_helper.c:212
+ #, c-format
+ msgid ""
+-"\n"
+-"\n"
+-"WARNING: current display depth is %d. For better performance\n"
+-"a depth of 16 bpp is recommended!\n"
+-"\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xshm.c:1151
+-msgid "video_out_xshm: MIT shared memory extension not present on display.\n"
++"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xshm.c:1233
+-msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n"
++#: src/xine-engine/io_helper.c:253
++msgid "failed to get status of socket"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:287
+-msgid ""
+-"video_out_xv: XvShmCreateImage failed\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/io_helper.c:319
++msgid "io_helper: Permission denied\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:297
+-msgid ""
+-"video_out_xv: XvShmCreateImage returned a zero size\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/io_helper.c:323
++msgid "io_helper: File not found\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:305
+-#, c-format
+-msgid ""
+-"video_out_xv: shared memory error in shmget: %s\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/io_helper.c:327
++msgid "io_helper: Connection Refused\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:337
++#: src/xine-engine/audio_out.c:1045
+ msgid ""
+-"video_out_xv: x11 error during shared memory XImage creation\n"
+-"video_out_xv: => not using MIT Shared Memory extension.\n"
+-msgstr ""
+-
+-#: src/video_out/video_out_xv.c:1267
+-msgid "video_out_xv: Xv extension not present.\n"
++"audio_out: delay calculation impossible with an unavailable audio device\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1304
+-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"
++#. FIXME: USB device unplugged.
++#. * We should get the card into a closed state here, that involves closing
++#. * the PCM as well as the MIXER.
++#. * Maybe we should pause the stream until the USB device is plugged in again.
++#. * Return values 0 happen even if usb not unplugged, so needs further investigation.
++#.
++#: src/xine-engine/audio_out.c:1185
++msgid "write to sound card failed. Was a USB device unplugged ?\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1313
+-#, c-format
+-msgid ""
+-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++#: src/xine-engine/audio_out.c:1303
++msgid "8 bits not supported by driver, converting to 16 bits.\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1430 src/video_out/video_out_xvmc.c:1514
+-#: src/video_out/video_out_xxmc.c:2315
+-msgid "autopaint colour key"
++#: src/xine-engine/audio_out.c:1311
++msgid "mono not supported by driver, converting to stereo.\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1431 src/video_out/video_out_xvmc.c:1515
+-#: src/video_out/video_out_xxmc.c:2316
+-msgid "Make Xv autopaint its colorkey."
++#: src/xine-engine/audio_out.c:1317
++msgid "stereo not supported by driver, converting to mono.\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1438 src/video_out/video_out_xxmc.c:2323
+-msgid "bilinear scaling mode"
++#: src/xine-engine/audio_out.c:1961
++msgid "method to sync audio and video"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1439 src/video_out/video_out_xxmc.c:2324
++#: src/xine-engine/audio_out.c:1962
+ msgid ""
+-"Selects the bilinear scaling mode for Permedia cards. The individual values "
+-"are:\n"
++"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 "
++"sound hardware, which determines the speed of the audio playback. These "
++"clocks are never ticking at the same speed except for some rare cases where "
++"they are physically identical. In general, the two clocks will run drift "
++"after some time, for which xine offers two ways to keep audio and video "
++"synchronized:\n"
+ "\n"
+-"Permedia 2\n"
+-"0 - disable bilinear filtering\n"
+-"1 - enable bilinear filtering\n"
++"metronom feedback\n"
++"This is the standard method, which applies a countereffecting video drift, "
++"as soon as the audio drift has accumulated over a threshold.\n"
+ "\n"
+-"Permedia 3\n"
+-"0 - disable bilinear filtering\n"
+-"1 - horizontal linear filtering\n"
+-"2 - enable full bilinear filtering"
++"resample\n"
++"For some video hardware, which is limited to a fixed frame rate (like the "
++"DXR3 or other decoder cards) the above does not work, because the video "
++"cannot drift. Therefore we resample the audio stream to make it longer or "
++"shorter to compensate the audio drift error. This does not work for digital "
++"passthrough, where audio data is passed to an external decoder in digital "
++"form."
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1488
+-msgid "video_out_xv: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/audio_out.c:1990
++msgid "enable resampling"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1493
+-msgid "video_out_xv: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/audio_out.c:1991
++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 "
++"you can select, whether resampling is enabled, disabled or used "
++"automatically when necessary."
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1515 src/video_out/video_out_xxmc.c:2408
+-msgid "pitch alignment workaround"
++#: src/xine-engine/audio_out.c:1998
++msgid "always resample to this rate (0 to disable)"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1516 src/video_out/video_out_xxmc.c:2409
+-msgid "Some buggy video drivers need a workaround to function properly."
++#: src/xine-engine/audio_out.c:1999
++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/video_out/video_out_xv.c:1522 src/video_out/video_out_xvmc.c:1583
+-msgid "deinterlace method (deprecated)"
++#: src/xine-engine/audio_out.c:2008
++msgid "offset for digital passthrough"
+ msgstr ""
+
+-#: src/video_out/video_out_xv.c:1523 src/video_out/video_out_xvmc.c:1584
++#: src/xine-engine/audio_out.c:2009
+ msgid ""
+-"This config setting is deprecated. You should use the new deinterlacing post "
+-"processing settings instead.\n"
+-"\n"
+-"From the old days of analog television, where the even and odd numbered "
+-"lines of a video frame would be displayed at different times comes the idea "
+-"to increase motion smoothness by also recording the lines at different "
+-"times. This is called \"interlacing\". But unfortunately, todays displays "
+-"show the even and odd numbered lines as one complete frame all at the same "
+-"time (called \"progressive display\"), which results in ugly frame errors "
+-"known as comb artifacts. Software deinterlacing is an approach to reduce "
+-"these artifacts. The individual values are:\n"
+-"\n"
+-"none\n"
+-"Disables software deinterlacing.\n"
+-"\n"
+-"bob\n"
+-"Interpolates between the lines for moving parts of the image.\n"
+-"\n"
+-"weave\n"
+-"Similar to bob, but with a tendency to preserve the full resolution, better "
+-"for high detail in low movement scenes.\n"
+-"\n"
+-"greedy\n"
+-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+-"\n"
+-"onefield\n"
+-"Always interpolates and reduces vertical resolution.\n"
+-"\n"
+-"onefieldxv\n"
+-"Same as onefield, but does the interpolation in hardware.\n"
+-"\n"
+-"linearblend\n"
+-"Applies a slight vertical blur to remove the comb artifacts. Good results "
+-"with medium CPU usage."
++"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/video_out/video_out_xv.c:1579 src/video_out/video_out_xxmc.c:2481
+-msgid "xine video output plugin using the MIT X video extension"
++#: src/xine-engine/audio_out.c:2079
++msgid "startup audio volume"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1652
+-msgid "xine video output plugin using the XvMC X video extension"
++#: src/xine-engine/audio_out.c:2080
++msgid "The overall audio volume set at xine startup."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1698
+-msgid "video_out_xvmc: XvMC extension not present.\n"
++#: src/xine-engine/audio_out.c:2083
++msgid "restore volume level at startup"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1797
+-msgid ""
+-"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
+-"port.\n"
++#: src/xine-engine/audio_out.c:2084
++msgid "If disabled, xine will not modify any mixer settings at startup."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1806
++#: src/xine-engine/audio_out.c:2113
++msgid "audio_out: sorry, this should not happen. please restart xine.\n"
++msgstr ""
++
++#: src/xine-engine/video_out.c:568
+ #, c-format
+-msgid ""
+-"video_out_xvmc: using Xv port %ld from adaptor %s\n"
+-" for hardware colorspace conversion and scaling\n"
++msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1811
+-msgid " idct and motion compensation acceleration \n"
++#: src/xine-engine/video_out.c:739
++#, c-format
++msgid ""
++"video_out: throwing away image with pts %<PRId64> because it's too old "
++"(diff : %<PRId64>).\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1813
+-msgid " motion compensation acceleration only\n"
++#: src/xine-engine/video_out.c:1739
++msgid "percentage of skipped frames to tolerate"
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1815
+-msgid " no XvMC support \n"
++#: src/xine-engine/video_out.c:1740
++msgid ""
++"When more than this percentage of frames are not shown, because they were "
++"not decoded in time, xine sends a notification."
+ msgstr ""
+
+-#: src/video_out/video_out_xvmc.c:1816
+-#, c-format
+-msgid " With Overlay = %d; UnsignedIntra = %d.\n"
++#: src/xine-engine/video_out.c:1745
++msgid "percentage of discarded frames to tolerate"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:601
++#: src/xine-engine/video_out.c:1746
+ msgid ""
+-"video_out_xxmc: XvShmCreateImage failed\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++"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/video_out/video_out_xxmc.c:611
+-msgid ""
+-"video_out_xxmc: XvShmCreateImage returned a zero size\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/video_out.c:1780
++msgid "video_out: sorry, this should not happen. please restart xine.\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:619
+-#, c-format
+-msgid ""
+-"video_out_xxmc: shared memory error in shmget: %s\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/input_cache.c:164
++msgid ": open() function should never be called\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:651
+-msgid ""
+-"video_out_xxmc: x11 error during shared memory XImage creation\n"
+-"video_out_xxmc: => not using MIT Shared Memory extension.\n"
++#: src/xine-engine/input_cache.c:323
++msgid ": input plugin not defined!\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2158
+-msgid "video_out_xxmc: Xv extension not present.\n"
++#: src/xine-engine/xine.c:647 src/xine-engine/xine.c:744
++#: src/xine-engine/xine.c:781 src/xine-engine/xine.c:817
++#: src/xine-engine/xine.c:829 src/xine-engine/xine.c:842
++#: src/xine-engine/xine.c:855 src/xine-engine/xine.c:868
++#: src/xine-engine/xine.c:894 src/xine-engine/xine.c:919
++#: src/xine-engine/xine.c:954
++msgid "xine: error while parsing mrl\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2195
+-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"
++#: src/xine-engine/xine.c:681
++#, c-format
++msgid "xine: found input plugin : %s\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2204
++#: src/xine-engine/xine.c:689
+ #, c-format
+-msgid ""
+-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+-"conversion and scaling.\n"
++msgid "xine: input plugin cannot open MRL [%s]\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2380
+-msgid "video_out_xxmc: this adaptor supports the yv12 format.\n"
++#: src/xine-engine/xine.c:707
++#, c-format
++msgid "xine: cannot find input plugin for MRL [%s]\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2385
+-msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n"
++#: src/xine-engine/xine.c:733
++#, c-format
++msgid "xine: specified demuxer %s failed to start\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2414
+-msgid "Make XvMC allocate more frames for better buffering."
++#: src/xine-engine/xine.c:769
++msgid "xine: join rip input plugin\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2415
+-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"
++#: src/xine-engine/xine.c:774
++msgid "xine: error opening rip input plugin instance\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2421
+-msgid "Unichrome cpu save"
++#: src/xine-engine/xine.c:805
++#, c-format
++msgid "xine: last_probed demuxer %s failed to start\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2422
+-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"
++#: src/xine-engine/xine.c:834
++msgid "ignoring video\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2428
+-msgid "Fix buggy NVIDIA XvMC subpicture colors"
++#: src/xine-engine/xine.c:847
++msgid "ignoring audio\n"
+ msgstr ""
+
+-#: src/video_out/video_out_xxmc.c:2429
+-msgid ""
+-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+-"look blue and vice versa. This option provides a workaround.\n"
++#: src/xine-engine/xine.c:860
++msgid "ignoring subpicture\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:277
+-msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n"
++#: src/xine-engine/xine.c:873
++msgid "input cache plugin disabled\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:290
+-msgid "x11osd: error creating window. unscaled overlay disabled.\n"
++#: src/xine-engine/xine.c:944
++#, c-format
++msgid "subtitle mrl opened '%s'\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:298 src/video_out/x11osd.c:339
+-msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n"
++#: src/xine-engine/xine.c:948
++msgid "xine: error opening subtitle mrl\n"
+ msgstr ""
+
+-#: src/video_out/x11osd.c:349
+-#, c-format
+-msgid "x11osd: unscaled overlay created (%s mode).\n"
++#. the option not found
++#: src/xine-engine/xine.c:980
++msgid "xine: error while parsing MRL\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:347
++#. not permitted to change from MRL
++#: src/xine-engine/xine.c:983
+ #, c-format
+-msgid "audio_decoder: no plugin available to handle '%s'\n"
++msgid "xine: changing option '%s' from MRL isn't permitted\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:364
++#: src/xine-engine/xine.c:1007
+ #, c-format
+-msgid "audio_decoder: error, unknown buffer type: %08x\n"
++msgid "xine: couldn't find demux for >%s<\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:466
+-msgid "number of audio buffers"
++#: src/xine-engine/xine.c:1023
++#, c-format
++msgid "xine: found demuxer plugin: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_decoder.c:467
+-msgid ""
+-"The number of audio 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."
++#: src/xine-engine/xine.c:1043
++msgid "xine: demuxer failed to start\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1045
+-msgid ""
+-"audio_out: delay calculation impossible with an unavailable audio device\n"
++#: src/xine-engine/xine.c:1106
++msgid "xine_play: no demux available\n"
+ msgstr ""
+
+-#. FIXME: USB device unplugged.
+-#. * We should get the card into a closed state here, that involves closing
+-#. * the PCM as well as the MIXER.
+-#. * Maybe we should pause the stream until the USB device is plugged in again.
+-#. * Return values 0 happen even if usb not unplugged, so needs further investigation.
+-#.
+-#: src/xine-engine/audio_out.c:1185
+-msgid "write to sound card failed. Was a USB device unplugged ?\n"
++#: src/xine-engine/xine.c:1176
++msgid "xine_play: demux failed to start\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1303
+-msgid "8 bits not supported by driver, converting to 16 bits.\n"
++#: src/xine-engine/xine.c:1446
++#, c-format
++msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1311
+-msgid "mono not supported by driver, converting to stereo.\n"
++#: src/xine-engine/xine.c:1450
++msgid "The specified save_dir might be a security risk."
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1317
+-msgid "stereo not supported by driver, converting to mono.\n"
++#: src/xine-engine/xine.c:1475
++msgid "xine: locale not supported by C library\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1961
+-msgid "method to sync audio and video"
++#: src/xine-engine/xine.c:1484
++msgid "media format detection strategy"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1962
++#: src/xine-engine/xine.c:1485
+ 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 "
+-"sound hardware, which determines the speed of the audio playback. These "
+-"clocks are never ticking at the same speed except for some rare cases where "
+-"they are physically identical. In general, the two clocks will run drift "
+-"after some time, for which xine offers two ways to keep audio and video "
+-"synchronized:\n"
++"xine offers various methods to detect the media format of input to play. The "
++"individual values are:\n"
+ "\n"
+-"metronom feedback\n"
+-"This is the standard method, which applies a countereffecting video drift, "
+-"as soon as the audio drift has accumulated over a threshold.\n"
++"default\n"
++"First try to detect by content, then by file name extension.\n"
+ "\n"
+-"resample\n"
+-"For some video hardware, which is limited to a fixed frame rate (like the "
+-"DXR3 or other decoder cards) the above does not work, because the video "
+-"cannot drift. Therefore we resample the audio stream to make it longer or "
+-"shorter to compensate the audio drift error. This does not work for digital "
+-"passthrough, where audio data is passed to an external decoder in digital "
+-"form."
++"reverse\n"
++"First try to detect by file name extension, then by content.\n"
++"\n"
++"content\n"
++"Detect by content only.\n"
++"\n"
++"extension\n"
++"Detect by file name extension only.\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1990
+-msgid "enable resampling"
++#: src/xine-engine/xine.c:1503
++msgid "directory for saving streams"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1991
++#: src/xine-engine/xine.c:1504
+ 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 "
+-"you can select, whether resampling is enabled, disabled or used "
+-"automatically when necessary."
++"When using the stream save feature, files will be written only into this "
++"directory.\n"
++"This setting is security critical, because when changed to a different "
++"directory, xine can be used to fill files in it with arbitrary content. So "
++"you should be careful that the directory you specify is robust against any "
++"content in any file."
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1998
+-msgid "always resample to this rate (0 to disable)"
++#: src/xine-engine/xine.c:1515
++msgid "allow implicit changes to the configuration (e.g. by MRL)"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:1999
++#: src/xine-engine/xine.c:1516
+ 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:2008
+-msgid "offset for digital passthrough"
++"If enabled, you allow xine to change your configuration without explicit "
++"actions from your side. For example configuration changes demanded by MRLs "
++"or embedded into playlist will be executed.\n"
++"This setting is security critcal, because xine can receive MRLs or playlists "
++"from untrusted remote sources. If you allow them to arbitrarily change your "
++"configuration, you might end with a totally messed up xine."
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2009
+-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."
++#: src/xine-engine/xine.c:1868
++msgid "messages"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2079
+-msgid "startup audio volume"
++#: src/xine-engine/xine.c:1869
++msgid "plugin"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2080
+-msgid "The overall audio volume set at xine startup."
++#: src/xine-engine/xine.c:1870
++msgid "trace"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2083
+-msgid "restore volume level at startup"
++#: src/xine-engine/osd.c:666
++#, c-format
++msgid "font '%s-%d' already loaded, weird.\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2084
+-msgid "If disabled, xine will not modify any mixer settings at startup."
++#: src/xine-engine/osd.c:678
++#, c-format
++msgid "font '%s' loading failed (%d < %d)\n"
+ msgstr ""
+
+-#: src/xine-engine/audio_out.c:2113
+-msgid "audio_out: sorry, this should not happen. please restart xine.\n"
++#: src/xine-engine/osd.c:688
++#, c-format
++msgid "wrong version for font '%s'. expected %d found %d.\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:901
+-msgid "The current config file has been modified by a newer version of xine."
++#: src/xine-engine/osd.c:804
++msgid "osd: cannot initialize ft2 library\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1006
++#: src/xine-engine/osd.c:820
+ #, c-format
+-msgid "configfile: WARNING: backing up configfile to %s failed\n"
++msgid "osd: error loading font %s with ft2\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1007
+-msgid "configfile: WARNING: your configuration will not be saved\n"
++#: src/xine-engine/osd.c:827
++msgid "osd: error setting font size (no scalable font?)\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1106
++#: src/xine-engine/osd.c:901
+ #, c-format
+-msgid "configfile: WARNING: writing configuration to %s failed\n"
++msgid ""
++"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
++"skipping\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1107
+-#, c-format
+-msgid "configfile: WARNING: removing possibly broken config file %s\n"
++#: src/xine-engine/osd.c:957
++msgid "osd: can't find out current locale character set\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1108
++#: src/xine-engine/osd.c:967
+ #, c-format
+-msgid "configfile: WARNING: you should check the backup file %s\n"
++msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+ msgstr ""
+
+-#: src/xine-engine/configfile.c:1231
+-#, c-format
+-msgid "configfile: entry '%s' mustn't be modified from MRL\n"
++#: src/xine-engine/osd.c:1022 src/xine-engine/osd.c:1190
++msgid "osd: font isn't defined\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:204
+-msgid "info_helper: can't find out current locale character set\n"
++#: src/xine-engine/osd.c:1061
++msgid "osd: error loading glyph\n"
+ msgstr ""
+
+-#: src/xine-engine/info_helper.c:212
++#: src/xine-engine/osd.c:1067
++msgid "osd: error in rendering glyph\n"
++msgstr ""
++
++#: src/xine-engine/osd.c:1227
+ #, c-format
+-msgid ""
+-"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n"
++msgid "osd: error loading glyph %i\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:164
+-msgid ": open() function should never be called\n"
++#: src/xine-engine/osd.c:1234
++msgid "osd: error in rendering\n"
+ msgstr ""
+
+-#: src/xine-engine/input_cache.c:323
+-msgid ": input plugin not defined!\n"
++#: src/xine-engine/osd.c:1481
++msgid "palette (foreground-border-background) to use for subtitles and OSD"
++msgstr ""
++
++#: src/xine-engine/osd.c:1482
++msgid ""
++"The palette for on-screen-display and some subtitle formats that do not "
++"specify any colouring themselves. The palettes are listed in the form: "
++"foreground-border-background."
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:137 src/xine-engine/input_rip.c:257
+@@ -3546,7 +3809,7 @@
+ #: src/xine-engine/input_rip.c:160 src/xine-engine/input_rip.c:289
+ #: src/xine-engine/input_rip.c:641
+ #, c-format
+-msgid "input_rip: error writing to file %<PRIiMAX> bytes: %s\n"
++msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:181
+@@ -3564,7 +3827,7 @@
+
+ #: src/xine-engine/input_rip.c:395
+ #, c-format
+-msgid "input_rip: %<PRIiMAX> bytes dropped\n"
++msgid "input_rip: %<PRIdMAX> bytes dropped\n"
+ msgstr ""
+
+ #: src/xine-engine/input_rip.c:546
+@@ -3602,22 +3865,6 @@
+ msgid "input_rip: error opening file %s: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/io_helper.c:253
+-msgid "failed to get status of socket"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:319
+-msgid "io_helper: Permission denied\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:323
+-msgid "io_helper: File not found\n"
+-msgstr ""
+-
+-#: src/xine-engine/io_helper.c:327
+-msgid "io_helper: Connection Refused\n"
+-msgstr ""
+-
+ #: src/xine-engine/load_plugins.c:314
+ #, c-format
+ msgid ""
+@@ -3711,150 +3958,17 @@
+ msgid "load_plugins: using demuxer '%s'\n"
+ msgstr ""
+
+-#: src/xine-engine/load_plugins.c:1560
++#: src/xine-engine/load_plugins.c:1539
+ #, c-format
+ msgid "load_plugins: failed to load audio output plugin <%s>\n"
+ msgstr ""
+
+-#: src/xine-engine/load_plugins.c:1563
++#: src/xine-engine/load_plugins.c:1542
+ msgid ""
+ "load_plugins: audio output auto-probing didn't find any usable audio "
+ "driver.\n"
+ msgstr ""
+
+-#: src/xine-engine/osd.c:662
+-#, c-format
+-msgid "font '%s-%d' already loaded, weird.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:674
+-#, c-format
+-msgid "font '%s' loading failed (%d < %d)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:684
+-#, c-format
+-msgid "wrong version for font '%s'. expected %d found %d.\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:800
+-msgid "osd: cannot initialize ft2 library\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:816
+-#, c-format
+-msgid "osd: error loading font %s with ft2\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:823
+-msgid "osd: error setting font size (no scalable font?)\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:897
+-#, c-format
+-msgid ""
+-"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", "
+-"skipping\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:953
+-msgid "osd: can't find out current locale character set\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:963
+-#, c-format
+-msgid "osd: unsupported conversion %s -> %s, no conversion performed\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1012 src/xine-engine/osd.c:1155
+-msgid "osd: font isn't defined\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1056
+-msgid "osd: error loading glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1062
+-msgid "osd: error in rendering glyph\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1185
+-#, c-format
+-msgid "osd: error loading glyph %i\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1192
+-msgid "osd: error in rendering\n"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1421
+-msgid "palette (foreground-border-background) to use for subtitles and OSD"
+-msgstr ""
+-
+-#: src/xine-engine/osd.c:1422
+-msgid ""
+-"The palette for on-screen-display and some subtitle formats that do not "
+-"specify any colouring themselves. The palettes are listed in the form: "
+-"foreground-border-background."
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:373
+-#, c-format
+-msgid "video_decoder: no plugin available to handle '%s'\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:447
+-#, c-format
+-msgid "video_decoder: error, unknown buffer type: %08x\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:483
+-msgid "number of video buffers"
+-msgstr ""
+-
+-#: src/xine-engine/video_decoder.c:484
+-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:568
+-#, c-format
+-msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:739
+-#, 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:1739
+-msgid "percentage of skipped frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1740
+-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:1745
+-msgid "percentage of discarded frames to tolerate"
+-msgstr ""
+-
+-#: src/xine-engine/video_out.c:1746
+-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:1780
+-msgid "video_out: sorry, this should not happen. please restart xine.\n"
+-msgstr ""
+-
+ #: src/xine-engine/vo_scale.c:393
+ msgid "horizontal image position in the output window"
+ msgstr ""
+@@ -3894,192 +4008,292 @@
+ "accelerated, this can dramatically reduce CPU usage."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:634 src/xine-engine/xine.c:730
+-#: src/xine-engine/xine.c:767 src/xine-engine/xine.c:803
+-#: src/xine-engine/xine.c:815 src/xine-engine/xine.c:828
+-#: src/xine-engine/xine.c:841 src/xine-engine/xine.c:854
+-#: src/xine-engine/xine.c:880 src/xine-engine/xine.c:905
+-#: src/xine-engine/xine.c:940
+-msgid "xine: error while parsing mrl\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:667
+-#, c-format
+-msgid "xine: found input plugin : %s\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:675
+-#, c-format
+-msgid "xine: input plugin cannot open MRL [%s]\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:693
++#: src/libreal/audio_decoder.c:207
+ #, c-format
+-msgid "xine: cannot find input plugin for MRL [%s]\n"
++msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:719
++#: src/libreal/audio_decoder.c:364
+ #, c-format
+-msgid "xine: specified demuxer %s failed to start\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:755
+-msgid "xine: join rip input plugin\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:760
+-msgid "xine: error opening rip input plugin instance\n"
++msgid "libareal: decoder init failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:791
++#: src/libreal/audio_decoder.c:378
+ #, c-format
+-msgid "xine: last_probed demuxer %s failed to start\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:820
+-msgid "ignoring video\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:833
+-msgid "ignoring audio\n"
+-msgstr ""
+-
+-#: src/xine-engine/xine.c:846
+-msgid "ignoring subpicture\n"
++msgid "libareal: decoder flavor setup failed, error code: 0x%x\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:859
+-msgid "input cache plugin disabled\n"
++#: src/libreal/audio_decoder.c:415
++msgid "libareal: oups, real can do more than 2 channels ?\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:930
+-#, c-format
+-msgid "subtitle mrl opened '%s'\n"
++#: src/libreal/audio_decoder.c:731 src/libreal/xine_decoder.c:611
++msgid "path to RealPlayer codecs"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:934
+-msgid "xine: error opening subtitle mrl\n"
++#: src/libreal/audio_decoder.c:732 src/libreal/xine_decoder.c:612
++msgid ""
++"If you have RealPlayer installed, specify the path to its codec directory "
++"here. You can easily find the codec directory by looking for a file named "
++"\"drv3.so.6.0\" in it. If xine can find the RealPlayer codecs, it will use "
++"them to decode RealPlayer content for you. Consult the xine FAQ for more "
++"information on how to install the codecs."
+ msgstr ""
+
+-#. the option not found
+-#: src/xine-engine/xine.c:966
+-msgid "xine: error while parsing MRL\n"
++#: src/libreal/xine_decoder.c:195
++msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+ msgstr ""
+
+-#. not permitted to change from MRL
+-#: src/xine-engine/xine.c:969
+-#, c-format
+-msgid "xine: changing option '%s' from MRL isn't permitted\n"
++#: src/post/mosaico/mosaico.c:273
++msgid ""
++"Mosaico does simple picture in picture effects.\n"
++"\n"
++"Parameters\n"
++" pip_num: the number of the picture slot the following settings apply to\n"
++" x: the x coordinate of the left upper corner of the picture\n"
++" y: the y coordinate of the left upper corner of the picture\n"
++" w: the width of the picture\n"
++" h: the height of the picture\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:993
+-#, c-format
+-msgid "xine: couldn't find demux for >%s<\n"
++#: src/post/mosaico/switch.c:230
++msgid ""
++"Switch can be used for fast switching between multiple inputs.\n"
++"\n"
++"Parameters\n"
++" select: the number of the input which will be passed to the output\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1009
+-#, c-format
+-msgid "xine: found demuxer plugin: %s\n"
++#: src/post/planar/pp.c:108
++msgid ""
++"FFmpeg libpostprocess plugin.\n"
++"\n"
++"Parameters\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1029
+-msgid "xine: demuxer failed to start\n"
++#: src/post/planar/pp.c:114
++msgid ""
++"\n"
++"* libpostprocess (C) Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1090
+-msgid "xine_play: no demux available\n"
++#: src/post/planar/eq.c:186
++msgid ""
++"Software equalizer with interactive controls just like the hardware "
++"equalizer, for cards/drivers that do not support brightness and contrast "
++"controls in hardware.\n"
++"\n"
++"Parameters\n"
++" brightness\n"
++" contrast\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
++"* mplayer's eq (C) Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1160
+-msgid "xine_play: demux failed to start\n"
++#: src/post/planar/expand.c:223
++msgid ""
++"The expand plugin is meant to take frames of arbitrary aspect ratio and "
++"converts them to 4:3 aspect by adding black bars on the top and bottom of "
++"the frame. This allows us to shift overlays down into the black area so they "
++"don't cover the image.\n"
++"\n"
++"Parameters (FIXME: better help)\n"
++" Enable_automatic_shift: Enable automatic overlay shifting\n"
++" Overlay_y_offset: Manually shift the overlay vertically\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1430
+-#, c-format
+-msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
++#: src/post/planar/denoise3d.c:136
++msgid ""
++"This filter aims to reduce image noise producing smooth images and making "
++"still images really still (This should enhance compressibility.). It can be "
++"given from 0 to 3 parameters. If you omit a parameter, a reasonable value "
++"will be inferred.\n"
++"\n"
++"Parameters\n"
++" Luma: Spatial luma strength (default = 4)\n"
++" Chroma: Spatial chroma strength (default = 3)\n"
++" Time: Temporal strength (default = 6)\n"
++"\n"
++"* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1434
+-msgid "The specified save_dir might be a security risk."
++#: src/post/planar/boxblur.c:103
++msgid ""
++"Box blur does a simple blurring of the image.\n"
++"\n"
++"Parameters\n"
++" Radius: size of the filter\n"
++" Power: how often the filter should be applied\n"
++"\n"
++"* mplayer's boxblur (C) 2002 Michael Niedermayer\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1459
+-msgid "xine: locale not supported by C library\n"
++#: src/post/planar/eq2.c:359
++msgid ""
++"Alternative software equalizer that uses lookup tables (very slow), allowing "
++"gamma correction in addition to simple brightness, contrast and saturation "
++"adjustment.\n"
++"Note that it uses the same MMX optimized code as 'eq' if all gamma values "
++"are 1.0.\n"
++"\n"
++"Parameters\n"
++" gamma\n"
++" brightness\n"
++" contrast\n"
++" saturation\n"
++" rgamma (gamma for the red component)\n"
++" ggamma (gamma for the green component)\n"
++" bgamma (gamma for the blue component)\n"
++"\n"
++"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values "
++"result in a negative image), -1 - 1 for brightness and 0 - 3 for "
++"saturation.\n"
++"\n"
++"* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1468
+-msgid "media format detection strategy"
++#: src/post/planar/unsharp.c:219
++msgid ""
++"Unsharp mask / gaussian blur\n"
++"It is possible to set the width and height of the matrix, odd sized in both "
++"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 "
++"and 7x7) and the relative amount of sharpness/blur to add to the image (a "
++"sane range should be -1.5 - 1.5).\n"
++"\n"
++"Parameters\n"
++"\n"
++" Luma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Luma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++" Chroma_matrix_width: Width of the matrix (must be odd)\n"
++"\n"
++" Chroma_matrix_height: Height of the matrix (must be odd)\n"
++"\n"
++" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 "
++"sharpen)\n"
++"\n"
++"\n"
++"* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1469
++#: src/post/deinterlace/xine_plugin.c:200
+ msgid ""
+-"xine offers various methods to detect the media format of input to play. The "
+-"individual values are:\n"
++"Advanced tvtime/deinterlacer plugin with pulldown detection\n"
++"This plugin aims to provide deinterlacing mechanisms comparable to high "
++"quality progressive DVD players and so called line-doublers, for use with "
++"computer monitors, projectors and other progressive display devices.\n"
+ "\n"
+-"default\n"
+-"First try to detect by content, then by file name extension.\n"
++"Parameters\n"
+ "\n"
+-"reverse\n"
+-"First try to detect by file name extension, then by content.\n"
++" Method: Select deinterlacing method/algorithm to use, see below for "
++"explanation of each method.\n"
+ "\n"
+-"content\n"
+-"Detect by content only.\n"
++" Enabled: Enable/disable the plugin.\n"
+ "\n"
+-"extension\n"
+-"Detect by file name extension only.\n"
++" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that "
++"have being converted to NTSC can be detected and intelligently reconstructed "
++"to their original (non-interlaced) frames.\n"
++"\n"
++" Framerate_mode: Selecting 'full' will deinterlace every field to an unique "
++"frame for television quality and beyond. This feature will effetively double "
++"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is "
++"not possible with plain 2.4 Linux kernel (that use a timer interrupt "
++"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings "
++"(512 and 1000, respectively) and should work fine.\n"
++"\n"
++" Judder_correction: Once 2-3 pulldown is enabled and a film material is "
++"detected, it is possible to reduce the frame rate to original rate used (24 "
++"FPS). This will make the frames evenly spaced in time, matching the speed "
++"they were shot and eliminating the judder effect.\n"
++"\n"
++" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to "
++"indicate progressive material. This setting control whether we trust this "
++"flag or not (some rare and buggy mpeg2 streams set it wrong).\n"
++"\n"
++" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very "
++"poor vertical chroma resolution. Upsampling the chroma for purposes of "
++"deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
++"this option to blur the chroma vertically after deinterlacing to remove the "
++"artifacts. Warning: cpu intensive.\n"
++"\n"
++" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, "
++"tricking tvtime/dscaler routines like if they were still handling YUY2 "
++"images. Of course, this is not correct, not all pixels will be evaluated by "
++"the algorithms to decide the regions to deinterlace and chroma will be "
++"processed separately. Nevertheless, it allows people with not so fast "
++"systems to try deinterlace algorithms, in a tradeoff between quality and cpu "
++"usage.\n"
++"\n"
++"Deinterlacing methods: (Not all methods are available for all plataforms)\n"
++"\n"
++"(FIXME: explain each method, check tvtime/dscaler docs... i fell lazy)\n"
++"\n"
++"* Uses several algorithms from tvtime and dscaler projects.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1487
+-msgid "directory for saving streams"
++#: src/post/deinterlace/xine_plugin.c:326
++msgid "tvtime: No deinterlacing methods available, exiting.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1488
++#: src/post/audio/stretch.c:264
+ msgid ""
+-"When using the stream save feature, files will be written only into this "
+-"directory.\n"
+-"This setting is security critical, because when changed to a different "
+-"directory, xine can be used to fill files in it with arbitrary content. So "
+-"you should be careful that the directory you specify is robust against any "
+-"content in any file."
++"This filter will perform a time stretch, playing the stream faster or slower "
++"by a factor. Pitch is optionally preserved, so it is possible, for example, "
++"to use it to watch a movie in less time than it was originaly shot.\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1499
+-msgid "allow implicit changes to the configuration (e.g. by MRL)"
++#: src/post/audio/upmix.c:137
++msgid ""
++"Upmix functions. e.g. Take stereo input and produce Surround 5.1 output.\n"
++"Parameters\n"
++" cut_off_freq\n"
++"\n"
++"Note: It is possible to use frontend's control window to set these "
++"parameters.\n"
++"\n"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1500
++#: src/post/goom/xine_goom.c:200
++msgid "frames per second to generate"
++msgstr ""
++
++#: src/post/goom/xine_goom.c:201
+ msgid ""
+-"If enabled, you allow xine to change your configuration without explicit "
+-"actions from your side. For example configuration changes demanded by MRLs "
+-"or embedded into playlist will be executed.\n"
+-"This setting is security critcal, because xine can receive MRLs or playlists "
+-"from untrusted remote sources. If you allow them to arbitrarily change your "
+-"configuration, you might end with a totally messed up xine."
++"With more frames per second, the animation will get smoother and faster, but "
++"will also require more CPU power."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1852
+-msgid "messages"
++#: src/post/goom/xine_goom.c:206
++msgid "goom image width"
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1853
+-msgid "plugin"
++#: src/post/goom/xine_goom.c:207
++msgid "The width in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-engine/xine.c:1854
+-msgid "trace"
++#: src/post/goom/xine_goom.c:211
++msgid "goom image height"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:481
+-msgid "memcopy method used by xine"
++#: src/post/goom/xine_goom.c:212
++msgid "The height in pixels of the image to be generated."
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:482
+-msgid ""
+-"The copying of large memory blocks is one of the most expensive operations "
+-"on todays computers. Therefore xine provides various tuned methods to do "
+-"this copying. Usually, the best method is detected automatically."
++#: src/post/goom/xine_goom.c:218
++msgid "colorspace conversion method"
+ msgstr ""
+
+-#: src/xine-utils/memcpy.c:509
+-msgid "Benchmarking memcpy methods (smaller is better):\n"
++#: src/post/goom/xine_goom.c:219
++msgid ""
++"You can choose the colorspace conversion method used by goom.\n"
++"The available selections should be self-explaining."
+ msgstr ""
+--- ./src/Makefile.am 1 Dec 2004 07:33:36 -0000 1.53
++++ ./src/Makefile.am 9 Feb 2005 19:39:03 -0000 1.53.2.1
+@@ -29,4 +29,5 @@
+ libreal \
+ libfaad \
+ libflac \
++ libmusepack \
+ post
+--- ./src/audio_out/Makefile.am 15 Nov 2004 03:58:55 -0000 1.52
++++ ./src/audio_out/Makefile.am 9 Feb 2005 19:39:04 -0000 1.52.2.1
+@@ -35,6 +35,7 @@
+
+ if HAVE_DIRECTX
+ directx_module = xineplug_ao_out_directx.la
++directx2_module = xineplug_ao_out_directx2.la
+ endif
+
+ if HAVE_COREAUDIO
+@@ -59,7 +60,8 @@
+ $(esd_module) \
+ $(directx_module) \
+ $(coreaudio_module) \
+- $(polypaudio_module)
++ $(polypaudio_module) \
++ $(directx2_module)
+
+ #lib_LTLIBRARIES = \
+ # $(alsa_module) \
+@@ -118,3 +120,8 @@
+ xineplug_ao_out_polypaudio_la_SOURCES = audio_polyp_out.c
+ xineplug_ao_out_polypaudio_la_LIBADD = $(POLYPAUDIO_LIBS) $(XINE_LIB)
+ xineplug_ao_out_polypaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c
++xineplug_ao_out_directx2_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
++xineplug_ao_out_directx2_la_LIBADD = $(XINE_LIB) $(DIRECTX_AUDIO_LIBS)
++xineplug_ao_out_directx2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+--- ./src/audio_out/audio_alsa_out.c 22 Dec 2004 17:51:38 -0000 1.151
++++ ./src/audio_out/audio_alsa_out.c 1 Jan 2005 13:33:09 -0000 1.151.2.1
+@@ -26,7 +26,7 @@
+ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
+ *
+ *
+- * $Id: audio_alsa_out.c,v 1.151 2004/12/22 17:51:38 f1rmb Exp $
++ * $Id: audio_alsa_out.c,v 1.151.2.1 2005/01/01 13:33:09 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -97,6 +97,7 @@
+ int capabilities;
+ int open_mode;
+ int has_pause_resume;
++ int is_paused;
+
+ int32_t output_sample_rate, input_sample_rate;
+ double sample_rate_factor;
+@@ -1023,7 +1024,9 @@
+ "audio_alsa_out: Pause call failed. (err=%d:%s)\n",err, snd_strerror(err));
+ this->has_pause_resume = 0;
+ ao_alsa_ctrl(this_gen, AO_CTRL_PLAY_PAUSE, NULL);
+- }
++ } else {
++ this->is_paused = 1;
++ }
+ } else {
+ if ((err=snd_pcm_reset(this->audio_fd)) < 0) {
+ xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
+@@ -1043,7 +1046,7 @@
+
+ case AO_CTRL_PLAY_RESUME:
+ if (this->audio_fd) {
+- if (this->has_pause_resume) {
++ if (this->has_pause_resume && this->is_paused) {
+ if ((err=snd_pcm_pause(this->audio_fd, 0)) < 0) {
+ if (err == -77) {
+ xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
+@@ -1054,7 +1057,9 @@
+ xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
+ "audio_alsa_out: Resume call failed. (err=%d:%s)\n",err, snd_strerror(err));
+ this->has_pause_resume = 0;
+- }
++ } else {
++ this->is_paused = 0;
++ }
+ }
+ }
+ break;
+@@ -1512,6 +1517,7 @@
+ xprintf(class->xine, XINE_VERBOSITY_LOG, _("(5.1-channel not enabled in xine config) "));
+
+ this->has_pause_resume = 0; /* This is checked at open time instead */
++ this->is_paused = 0;
+
+ snd_pcm_close (this->audio_fd);
+ this->audio_fd=NULL;
+--- ./src/demuxers/Makefile.am 27 Aug 2004 19:33:19 -0000 1.105
++++ ./src/demuxers/Makefile.am 9 Feb 2005 19:39:04 -0000 1.105.2.1
+@@ -121,7 +121,8 @@
+ demux_cdda.c demux_mpgaudio.c demux_nsf.c \
+ demux_realaudio.c demux_snd.c demux_voc.c \
+ demux_vox.c demux_wav.c demux_ac3.c id3.c \
+- demux_aac.c demux_mod.c demux_flac.c
++ demux_aac.c demux_mod.c demux_flac.c \
++ demux_mpc.c
+ xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS)
+ xineplug_dmx_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+
+--- ./src/demuxers/asfheader.h 6 Oct 2003 15:46:20 -0000 1.3
++++ ./src/demuxers/asfheader.h 15 Jan 2005 17:51:39 -0000 1.3.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: asfheader.h,v 1.3 2003/10/06 15:46:20 mroi Exp $
++ * $Id: asfheader.h,v 1.3.2.1 2005/01/15 17:51:39 mroi Exp $
+ *
+ * demultiplexer for asf streams
+ *
+@@ -41,60 +41,71 @@
+ #define GUID_ASF_HEADER 1
+ #define GUID_ASF_DATA 2
+ #define GUID_ASF_SIMPLE_INDEX 3
++#define GUID_INDEX 4
++#define GUID_MEDIA_OBJECT_INDEX 5
++#define GUID_TIMECODE_INDEX 6
+
+ /* header ASF objects */
+-#define GUID_ASF_FILE_PROPERTIES 4
+-#define GUID_ASF_STREAM_PROPERTIES 5
+-#define GUID_ASF_STREAM_BITRATE_PROPERTIES 6
+-#define GUID_ASF_CONTENT_DESCRIPTION 7
+-#define GUID_ASF_EXTENDED_CONTENT_ENCRYPTION 8
+-#define GUID_ASF_SCRIPT_COMMAND 9
+-#define GUID_ASF_MARKER 10
+-#define GUID_ASF_HEADER_EXTENSION 11
+-#define GUID_ASF_BITRATE_MUTUAL_EXCLUSION 12
+-#define GUID_ASF_CODEC_LIST 13
+-#define GUID_ASF_EXTENDED_CONTENT_DESCRIPTION 14
+-#define GUID_ASF_ERROR_CORRECTION 15
+-#define GUID_ASF_PADDING 16
++#define GUID_ASF_FILE_PROPERTIES 7
++#define GUID_ASF_STREAM_PROPERTIES 8
++#define GUID_ASF_HEADER_EXTENSION 9
++#define GUID_ASF_CODEC_LIST 10
++#define GUID_ASF_SCRIPT_COMMAND 11
++#define GUID_ASF_MARKER 12
++#define GUID_ASF_BITRATE_MUTUAL_EXCLUSION 13
++#define GUID_ASF_ERROR_CORRECTION 14
++#define GUID_ASF_CONTENT_DESCRIPTION 15
++#define GUID_ASF_EXTENDED_CONTENT_DESCRIPTION 16
++#define GUID_ASF_STREAM_BITRATE_PROPERTIES 17
++#define GUID_ASF_EXTENDED_CONTENT_ENCRYPTION 18
++#define GUID_ASF_PADDING 19
+
+ /* stream properties object stream type */
+-#define GUID_ASF_AUDIO_MEDIA 17
+-#define GUID_ASF_VIDEO_MEDIA 18
+-#define GUID_ASF_COMMAND_MEDIA 19
++#define GUID_ASF_AUDIO_MEDIA 20
++#define GUID_ASF_VIDEO_MEDIA 21
++#define GUID_ASF_COMMAND_MEDIA 22
++#define GUID_ASF_JFIF_MEDIA 23
++#define GUID_ASF_DEGRADABLE_JPEG_MEDIA 24
++#define GUID_ASF_FILE_TRANSFER_MEDIA 25
++#define GUID_ASF_BINARY_MEDIA 26
+
+ /* stream properties object error correction type */
+-#define GUID_ASF_NO_ERROR_CORRECTION 20
+-#define GUID_ASF_AUDIO_SPREAD 21
++#define GUID_ASF_NO_ERROR_CORRECTION 27
++#define GUID_ASF_AUDIO_SPREAD 28
+
+ /* mutual exclusion object exlusion type */
+-#define GUID_ASF_MUTEX_BITRATE 22
+-#define GUID_ASF_MUTEX_UKNOWN 23
++#define GUID_ASF_MUTEX_BITRATE 29
++#define GUID_ASF_MUTEX_UKNOWN 30
+
+ /* header extension */
+-#define GUID_ASF_RESERVED_1 24
++#define GUID_ASF_RESERVED_1 31
+
+ /* script command */
+-#define GUID_ASF_RESERVED_SCRIPT_COMMNAND 25
++#define GUID_ASF_RESERVED_SCRIPT_COMMNAND 32
+
+ /* marker object */
+-#define GUID_ASF_RESERVED_MARKER 26
++#define GUID_ASF_RESERVED_MARKER 33
+
+ /* various */
+ /*
+ #define GUID_ASF_HEAD2 27
+ */
+-#define GUID_ASF_AUDIO_CONCEAL_NONE 27
+-#define GUID_ASF_CODEC_COMMENT1_HEADER 28
+-#define GUID_ASF_2_0_HEADER 29
++#define GUID_ASF_AUDIO_CONCEAL_NONE 34
++#define GUID_ASF_CODEC_COMMENT1_HEADER 35
++#define GUID_ASF_2_0_HEADER 36
+
+-#define GUID_END 30
++#define GUID_END 37
+
+
+ /* asf stream types */
+-#define ASF_STREAM_TYPE_UNKNOWN 0
+-#define ASF_STREAM_TYPE_AUDIO 1
+-#define ASF_STREAM_TYPE_VIDEO 2
+-#define ASF_STREAM_TYPE_CONTROL 3
++#define ASF_STREAM_TYPE_UNKNOWN 0
++#define ASF_STREAM_TYPE_AUDIO 1
++#define ASF_STREAM_TYPE_VIDEO 2
++#define ASF_STREAM_TYPE_CONTROL 3
++#define ASF_STREAM_TYPE_JFIF 4
++#define ASF_STREAM_TYPE_DEGRADABLE_JPEG 5
++#define ASF_STREAM_TYPE_FILE_TRANSFER 6
++#define ASF_STREAM_TYPE_BINARY 7
+
+ #define ASF_MAX_NUM_STREAMS 23
+
+@@ -130,6 +141,14 @@
+ { "simple index",
+ { 0x33000890, 0xe5b1, 0x11cf, { 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb }} },
+
++ { "index",
++ { 0xd6e229d3, 0x35da, 0x11d1, { 0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe }} },
++
++ { "media object index",
++ { 0xfeb103f8, 0x12ad, 0x4c64, { 0x84, 0x0f, 0x2a, 0x1d, 0x2f, 0x7a, 0xd4, 0x8c }} },
++
++ { "timecode index",
++ { 0x3cb73fd0, 0x0c4a, 0x4803, { 0x95, 0x3d, 0xed, 0xf7, 0xb6, 0x22, 0x8f, 0x0c }} },
+
+ /* header ASF objects */
+ { "file properties",
+@@ -138,14 +157,11 @@
+ { "stream header",
+ { 0xb7dc0791, 0xa9b7, 0x11cf, { 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }} },
+
+- { "stream bitrate properties", /* (http://get.to/sdp) */
+- { 0x7bf875ce, 0x468d, 0x11d1, { 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 }} },
+-
+- { "content description",
+- { 0x75b22633, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }} },
++ { "header extension",
++ { 0x5fbf03b5, 0xa92e, 0x11cf, { 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }} },
+
+- { "extended content encryption",
+- { 0x298ae614, 0x2622, 0x4c17, { 0xb9, 0x35, 0xda, 0xe0, 0x7e, 0xe9, 0x28, 0x9c }} },
++ { "codec list",
++ { 0x86d15240, 0x311d, 0x11d0, { 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 }} },
+
+ { "script command",
+ { 0x1efb1a30, 0x0b62, 0x11d0, { 0xa3, 0x9b, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 }} },
+@@ -153,20 +169,23 @@
+ { "marker",
+ { 0xf487cd01, 0xa951, 0x11cf, { 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }} },
+
+- { "header extension",
+- { 0x5fbf03b5, 0xa92e, 0x11cf, { 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }} },
+-
+ { "bitrate mutual exclusion",
+ { 0xd6e229dc, 0x35da, 0x11d1, { 0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe }} },
+
+- { "codec list",
+- { 0x86d15240, 0x311d, 0x11d0, { 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 }} },
++ { "error correction",
++ { 0x75b22635, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }} },
++
++ { "content description",
++ { 0x75b22633, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }} },
+
+ { "extended content description",
+ { 0xd2d0a440, 0xe307, 0x11d2, { 0x97, 0xf0, 0x00, 0xa0, 0xc9, 0x5e, 0xa8, 0x50 }} },
+
+- { "error correction",
+- { 0x75b22635, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }} },
++ { "stream bitrate properties", /* (http://get.to/sdp) */
++ { 0x7bf875ce, 0x468d, 0x11d1, { 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 }} },
++
++ { "extended content encryption",
++ { 0x298ae614, 0x2622, 0x4c17, { 0xb9, 0x35, 0xda, 0xe0, 0x7e, 0xe9, 0x28, 0x9c }} },
+
+ { "padding",
+ { 0x1806d474, 0xcadf, 0x4509, { 0xa4, 0xba, 0x9a, 0xab, 0xcb, 0x96, 0xaa, 0xe8 }} },
+@@ -182,6 +201,17 @@
+ { "command media",
+ { 0x59dacfc0, 0x59e6, 0x11d0, { 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 }} },
+
++ { "JFIF media (JPEG)",
++ { 0xb61be100, 0x5b4e, 0x11cf, { 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b }} },
++
++ { "Degradable JPEG media",
++ { 0x35907de0, 0xe415, 0x11cf, { 0xa9, 0x17, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b }} },
++
++ { "File Transfer media",
++ { 0x91bd222c, 0xf21c, 0x497a, { 0x8b, 0x6d, 0x5a, 0xa8, 0x6b, 0xfc, 0x01, 0x85 }} },
++
++ { "Binary media",
++ { 0x3afb65e2, 0x47ef, 0x40f2, { 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 }} },
+
+ /* stream properties object error correction */
+ { "no error correction",
+--- ./src/demuxers/demux_asf.c 24 Dec 2004 17:43:38 -0000 1.167
++++ ./src/demuxers/demux_asf.c 15 Jan 2005 17:51:39 -0000 1.167.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: demux_asf.c,v 1.167 2004/12/24 17:43:38 hadess Exp $
++ * $Id: demux_asf.c,v 1.167.2.1 2005/01/15 17:51:39 mroi Exp $
+ *
+ * demultiplexer for asf streams
+ *
+@@ -44,7 +44,6 @@
+ /*
+ #define LOG
+ */
+-
+ #include "xine_internal.h"
+ #include "demux.h"
+ #include "xineutils.h"
+@@ -246,11 +245,11 @@
+ return LE_64(buf);
+ }
+
+-static int get_guid_id (demux_asf_t *this, GUID g) {
++static int get_guid_id (demux_asf_t *this, GUID *g) {
+ int i;
+
+ for (i = 1; i < GUID_END; i++) {
+- if (!memcmp(&g, &guids[i].guid, sizeof(GUID))) {
++ if (!memcmp(g, &guids[i].guid, sizeof(GUID))) {
+ lprintf ("GUID: %s\n", guids[i].name);
+ return i;
+ }
+@@ -259,8 +258,8 @@
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "demux_asf: unknown GUID: 0x%" PRIx32 ", 0x%" PRIx16 ", 0x%" PRIx16 ", "
+ "{ 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 ", 0x%" PRIx8 " }\n",
+- g.Data1, g.Data2, g.Data3,
+- g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]);
++ g->Data1, g->Data2, g->Data3,
++ g->Data4[0], g->Data4[1], g->Data4[2], g->Data4[3], g->Data4[4], g->Data4[5], g->Data4[6], g->Data4[7]);
+
+ return GUID_ERROR;
+ }
+@@ -277,7 +276,7 @@
+ g.Data4[i] = get_byte(this);
+ }
+
+- return get_guid_id(this, g);
++ return get_guid_id(this, &g);
+ }
+
+ static void get_str16_nolen(demux_asf_t *this, int len,
+@@ -396,7 +395,7 @@
+
+ guid = get_guid(this);
+ file_size = get_le64(this); /* file size */
+-
++
+ get_le64(this); /* creation time */
+ this->packet_count = get_le64(this); /* nb packets */
+
+@@ -450,7 +449,10 @@
+ break;
+
+ default:
+- goto fail;
++ lprintf("unexpected GUID\n");
++ pos2 = this->input->get_current_pos (this->input);
++ this->input->seek (this->input, gsize - (pos2 - pos1 + 24), SEEK_CUR);
++ continue;
+ }
+
+ guid = get_guid(this);
+@@ -978,6 +980,7 @@
+ mod = (current_pos - this->first_packet_pos) % this->packet_size;
+ this->packet_size_left = mod ? this->packet_size - mod : 0;
+ packet_pos = current_pos + this->packet_size_left;
++
+ if (this->packet_size_left) {
+ lprintf("last packet is not finished, %d bytes\n", this->packet_size_left);
+ current_pos = this->input->seek (this->input, packet_pos, SEEK_SET);
+@@ -988,9 +991,9 @@
+ this->packet_size_left = 0;
+
+ /* check packet_count */
+- packet_num = (current_pos - this->first_packet_pos) / this->packet_size;
++ packet_num = (packet_pos - this->first_packet_pos) / this->packet_size;
+ lprintf("packet_num=%lld, packet_count=%lld\n", packet_num, this->packet_count);
+- if (packet_num == this->packet_count) {
++ if (packet_num >= this->packet_count) {
+ /* end of payload data */
+ current_pos = this->input->get_current_pos (this->input);
+ lprintf("end of payload data, current_pos=%lld\n", current_pos);
+@@ -1046,10 +1049,29 @@
+ *p_hdr_size += read_size;
+
+ } else {
+-
+- /* skip invalid packet */
+- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: skip invalid packet: %2X\n", ecd_flags);
+- this->input->seek (this->input, this->packet_size - *p_hdr_size, SEEK_CUR);
++ GUID *guid = (GUID *)buf;
++
++ /* check if it's a new stream */
++ buf[0] = ecd_flags;
++ if (this->input->read (this->input, buf + 1, 15) != 15) {
++ this->status = DEMUX_FINISHED;
++ return 1;
++ }
++ *p_hdr_size += 15;
++ guid->Data1 = LE_32(buf);
++ guid->Data2 = LE_16(buf + 4);
++ guid->Data3 = LE_16(buf + 6);
++ if (get_guid_id(this, guid) == GUID_ASF_HEADER) {
++ lprintf("new asf header detected\n");
++ _x_demux_control_end(this->stream, 0);
++ if (demux_asf_send_headers_common(this))
++ return 1;
++ } else {
++
++ /* skip invalid packet */
++ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: skip invalid packet: %2X\n", ecd_flags);
++ this->input->seek (this->input, this->packet_size - *p_hdr_size, SEEK_CUR);
++ }
+ invalid_packet = 1;
+ }
+ }
+--- ./src/demuxers/demux_avi.c 25 Dec 2004 17:52:10 -0000 1.214
++++ ./src/demuxers/demux_avi.c 9 Feb 2005 19:39:04 -0000 1.214.2.2
+@@ -19,7 +19,7 @@
+ */
+
+ /*
+- * $Id: demux_avi.c,v 1.214 2004/12/25 17:52:10 f1rmb Exp $
++ * $Id: demux_avi.c,v 1.214.2.2 2005/02/09 19:39:04 mroi Exp $
+ *
+ * demultiplexer for avi streams
+ *
+@@ -485,7 +485,7 @@
+ maxframe--;
+ }
+ return -1;
+-}
++}
+
+ /* Use this one to ensure that a video frame with the given timestamp
+ * is in the index. */
+@@ -620,7 +620,7 @@
+ if ((data[0] == audio->audio_tag[0]) &&
+ (data[1] == audio->audio_tag[1])) {
+ off_t pos = chunk_pos + AVI_HEADER_SIZE;
+-
++
+ valid_chunk = 1;
+ /* VBR streams (hack from mplayer) */
+ if (audio->wavex && audio->wavex->nBlockAlign) {
+@@ -639,7 +639,7 @@
+ }
+ }
+ if (!valid_chunk) {
+- xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos);
++ xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)chunk_pos);
+ }
+ chunk_pos = this->input->seek(this->input, this->idx_grow.nexttagoffset, SEEK_SET);
+ if (chunk_pos != this->idx_grow.nexttagoffset) {
+@@ -687,6 +687,7 @@
+ static audio_index_entry_t *audio_cur_index_entry(demux_avi_t *this,
+ avi_audio_t *AVI_A) {
+
++ lprintf("posc: %d, chunks: %d\n", AVI_A->audio_posc, AVI_A->audio_idx.audio_chunks);
+ if (AVI_A->audio_posc >= AVI_A->audio_idx.audio_chunks) {
+ /* We don't have enough chunks; see if the file's bigger yet. */
+ if (idx_grow(this, audio_pos_stopper, AVI_A) < 0) {
+@@ -782,7 +783,7 @@
+ this->idx_grow.nexttagoffset = this->input->get_current_pos(this->input);
+
+ if (this->input->read(this->input, data,8) != 8 ) {
+- xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIiMAX "\n", (intmax_t)this->idx_grow.nexttagoffset);
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %" PRIdMAX "\n", (intmax_t)this->idx_grow.nexttagoffset);
+ break; /* We assume it's EOF */
+ }
+
+@@ -846,7 +847,7 @@
+ }
+ }
+ if (next_chunk != this->input->seek(this->input, next_chunk, SEEK_SET)) {
+- xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIiMAX ")\n"), (intmax_t)next_chunk);
++ xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: failed to seek to the next chunk (pos %" PRIdMAX ")\n"), (intmax_t)next_chunk);
+ break; /* probably slow seek */
+ }
+ }
+@@ -1056,6 +1057,7 @@
+ #endif
+ }
+
++ this->has_index = 1;
+ if (lasttag == 1) {
+ /* V I D E O */
+ AVI->video_superindex = superindex;
+@@ -1192,6 +1194,7 @@
+ off_t pos = LE_32(AVI->idx[i] + 8) + ioff;
+ uint32_t len = LE_32(AVI->idx[i] + 12);
+ uint32_t flags = LE_32(AVI->idx[i] + 4);
++
+ if (video_index_append(AVI, pos, len, flags) == -1) {
+ ERR_EXIT(AVI_ERR_NO_MEM) ;
+ }
+@@ -1229,12 +1232,11 @@
+ int k = 0, audtr = 0;
+ uint32_t nrEntries = 0;
+ int nvi, nai[MAX_AUDIO_STREAMS];
+- uint64_t totb, tot[MAX_AUDIO_STREAMS];
+
+ xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+ "demux_avi: This is an OpenDML stream\n");
+ nvi = 0;
+- for(audtr=0; audtr<AVI->n_audio; ++audtr) nai[audtr] = tot[audtr] = 0;
++ for(audtr=0; audtr<AVI->n_audio; ++audtr) nai[audtr] = 0;
+
+ /* ************************ */
+ /* VIDEO */
+@@ -1305,27 +1307,28 @@
+ /* ************************ */
+ lprintf("audio tracks\n");
+ for(audtr=0; audtr<AVI->n_audio; ++audtr) {
++ avi_audio_t *audio = AVI->audio[audtr];
+
+ k = 0;
+- if (!AVI->audio[audtr]->audio_superindex) {
++ if (!audio->audio_superindex) {
+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "demux_avi: Warning: cannot read audio index for track %d\n", audtr);
+ continue;
+ }
+- for (j=0; j<AVI->audio[audtr]->audio_superindex->nEntriesInUse; j++) {
++ for (j=0; j<audio->audio_superindex->nEntriesInUse; j++) {
+
+ /* read from file */
+- chunk_start = en = malloc (AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len);
++ chunk_start = en = malloc (audio->audio_superindex->aIndex[j].dwSize+hdrl_len);
+
+- if (this->input->seek(this->input, AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) {
+- lprintf("cannot seek to 0x%" PRIx64 "\n", AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
++ if (this->input->seek(this->input, audio->audio_superindex->aIndex[j].qwOffset, SEEK_SET) == (off_t)-1) {
++ lprintf("cannot seek to 0x%" PRIx64 "\n", audio->audio_superindex->aIndex[j].qwOffset);
+ free(chunk_start);
+ continue;
+ }
+
+- if (this->input->read(this->input, en, AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize+hdrl_len) <= 0) {
++ if (this->input->read(this->input, en, audio->audio_superindex->aIndex[j].dwSize+hdrl_len) <= 0) {
+ lprintf("cannot read from offset 0x%" PRIx64 "; broken (incomplete) file?\n",
+- AVI->audio[audtr]->audio_superindex->aIndex[j].qwOffset);
++ audio->audio_superindex->aIndex[j].qwOffset);
+ free(chunk_start);
+ continue;
+ }
+@@ -1347,19 +1350,25 @@
+
+ pos = offset + LE_32(en); en += 4;
+ len = odml_len(en); en += 4;
+- totb = tot[audtr];
+- tot[audtr] += len;
+- audio_index_append(AVI, audtr, pos, len, totb, k);
++
++ /* VBR streams (hack from mplayer) */
++ if (audio->wavex && audio->wavex->nBlockAlign) {
++ audio->block_no += (len + audio->wavex->nBlockAlign - 1) /
++ audio->wavex->nBlockAlign;
++ } else {
++ audio->block_no += 1;
++ }
+
++ audio_index_append(AVI, audtr, pos, len, audio->audio_tot, audio->block_no);
+
+ #ifdef DEBUG_ODML
+ /*
+ printf("[%d:%d] POS 0x%llX len=%d offset (%llx) (%ld)\n", k, audtr,
+ pos, (int)len,
+- offset, (long)AVI->audio[audtr]->audio_superindex->aIndex[j].dwSize);
++ offset, (long)audio->audio_superindex->aIndex[j].dwSize);
+ */
+ #endif
+-
++ audio->audio_tot += len;
+ ++k;
+ }
+ free(chunk_start);
+@@ -1422,24 +1431,9 @@
+
+ /* lprintf ("avi audio package len: %d\n", AVI_A->audio_index[AVI_A->audio_posc].len); */
+
+-
+- while(bytes > 0) {
+- left = aie->len - AVI_A->audio_posb;
+- if(left == 0) {
+- AVI_A->audio_posc++;
+- AVI_A->audio_posb = 0;
+- aie = audio_cur_index_entry(this, AVI_A);
+- if (!aie) {
+- this->AVI_errno = AVI_ERR_NO_IDX;
+- return -1;
+- }
+- if (nr > 0) {
+- *buf_flags = BUF_FLAG_FRAME_END;
+- return nr;
+- }
+- left = aie->len - AVI_A->audio_posb;
+- }
+- if(bytes < left)
++ left = aie->len - AVI_A->audio_posb;
++ while ((bytes > 0) && (left > 0)) {
++ if (bytes < left)
+ todo = bytes;
+ else
+ todo = left;
+@@ -1455,13 +1449,16 @@
+ bytes -= todo;
+ nr += todo;
+ AVI_A->audio_posb += todo;
++ left = aie->len - AVI_A->audio_posb;
+ }
+
+- left = aie->len - AVI_A->audio_posb;
+- if (left == 0)
++ if (left == 0) {
++ AVI_A->audio_posc++;
++ AVI_A->audio_posb = 0;
+ *buf_flags = BUF_FLAG_FRAME_END;
+- else
++ } else {
+ *buf_flags = 0;
++ }
+
+ return nr;
+ }
+@@ -1480,25 +1477,10 @@
+
+ nr = 0; /* total number of bytes read */
+
+- while(bytes>0) {
+-
+- left = vie->len - AVI->video_posb;
+-
+- if(left==0) {
+- AVI->video_posf++;
+- AVI->video_posb = 0;
+- vie = video_cur_index_entry(this);
+- if (!vie) {
+- this->AVI_errno = AVI_ERR_NO_IDX;
+- return -1;
+- }
+- if (nr>0) {
+- *buf_flags = BUF_FLAG_FRAME_END;
+- return nr;
+- }
+- left = vie->len - AVI->video_posb;
+- }
+- if(bytes<left)
++ left = vie->len - AVI->video_posb;
++
++ while ((bytes > 0) && (left > 0)) {
++ if (bytes < left)
+ todo = bytes;
+ else
+ todo = left;
+@@ -1514,14 +1496,16 @@
+ bytes -= todo;
+ nr += todo;
+ AVI->video_posb += todo;
++ left = vie->len - AVI->video_posb;
+ }
+
+- left = vie->len - AVI->video_posb;
+- if (left==0)
++ if (left == 0) {
++ AVI->video_posf++;
++ AVI->video_posb = 0;
+ *buf_flags = BUF_FLAG_FRAME_END;
+- else
++ } else {
+ *buf_flags = 0;
+-
++ }
+ return nr;
+ }
+
+@@ -1532,6 +1516,8 @@
+ buf_element_t *buf = NULL;
+ int64_t audio_pts, video_pts;
+ int do_read_video = (this->avi->n_audio == 0);
++ int video_sent = 0;
++ int audio_sent = 0;
+
+ lprintf("begin\n");
+
+@@ -1540,23 +1526,21 @@
+ * the end of the stream. */
+ if (this->avi->video_idx.video_frames <= this->avi->video_posf) {
+ if (idx_grow(this, video_pos_stopper, NULL) < 0) {
+- lprintf("end: idx_grow video_pos_stopper\n");
+- return 0;
++ lprintf("end of stream\n");
+ }
+ }
+-
++
+ for (i = 0; i < this->avi->n_audio; i++) {
+ avi_audio_t *audio = this->avi->audio[i];
+
+ if (!this->no_audio &&
+ (audio->audio_idx.audio_chunks <= audio->audio_posc)) {
+ if (idx_grow(this, audio_pos_stopper, this->avi->audio[i]) < 0) {
+- lprintf("end: idx_grow audio_pos_stopper\n");
+- return 0;
++ lprintf("end of stream\n");
+ }
+ }
+ }
+-
++
+ video_pts = get_video_pts (this, this->avi->video_posf);
+
+ for (i=0; i < this->avi->n_audio; i++) {
+@@ -1566,8 +1550,8 @@
+ /* The tests above mean aie should never be NULL, but just to be
+ * safe. */
+ if (!aie) {
+- lprintf("end: aie == NULL\n");
+- return 0;
++ lprintf("aie == NULL\n");
++ continue;
+ }
+
+ audio_pts =
+@@ -1588,22 +1572,28 @@
+
+ if (buf->size < 0) {
+ buf->free_buffer (buf);
+- lprintf("end: audio buf->size < 0\n");
+- return 0;
+- }
+-
+- buf->type = audio->audio_type | i;
+- buf->extra_info->input_time = audio_pts / 90;
+- if( this->input->get_length (this->input) )
+- buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
+- 65535 / this->input->get_length (this->input) );
++ lprintf("audio buf->size < 0\n");
++ } else {
+
+- check_newpts (this, buf->pts, PTS_AUDIO);
+- this->audio_fifo->put (this->audio_fifo, buf);
++ buf->type = audio->audio_type | i;
++ buf->extra_info->input_time = audio_pts / 90;
++ if( this->input->get_length (this->input) )
++ buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) *
++ 65535 / this->input->get_length (this->input) );
++
++ check_newpts (this, buf->pts, PTS_AUDIO);
++ this->audio_fifo->put (this->audio_fifo, buf);
++
++ audio_sent++;
++ }
+ } else
+ do_read_video = 1;
+ }
+
++ if (audio_sent == 0) {
++ do_read_video = 1;
++ }
++
+ if (do_read_video) {
+
+ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
+@@ -1632,19 +1622,25 @@
+
+ if (buf->size < 0) {
+ buf->free_buffer (buf);
+- lprintf("end: video buf->size < 0\n");
+- return 0;
+- }
+-
+- /*
+- lprintf ("adding buf %d to video fifo, decoder_info[0]: %d\n",
+- buf, buf->decoder_info[0]);
+- */
++ lprintf("video buf->size < 0\n");
++ } else {
+
+- check_newpts (this, buf->pts, PTS_VIDEO);
+- this->video_fifo->put (this->video_fifo, buf);
++ /*
++ lprintf ("adding buf %d to video fifo, decoder_info[0]: %d\n",
++ buf, buf->decoder_info[0]);
++ */
++
++ check_newpts (this, buf->pts, PTS_VIDEO);
++ this->video_fifo->put (this->video_fifo, buf);
++ video_sent++;
++ }
+ }
+
++ if (!audio_sent && !video_sent) {
++ xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
++ "demux_avi: video and audio streams are ended\n");
++ return 0;
++ }
+ return 1;
+ }
+
+@@ -1696,7 +1692,7 @@
+ return AVI_HEADER_AUDIO;
+ }
+ }
+- xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIiMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input));
++ xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %" PRIdMAX "\n"), data[0], data[1], data[2], data[3], (intmax_t)this->input->get_current_pos(this->input));
+ return AVI_HEADER_UNKNOWN;
+ }
+ /* unreachable code */
+@@ -2088,7 +2084,7 @@
+ */
+
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "start pos is %" PRIiMAX ", start time is %d\n", (intmax_t)start_pos,
++ "start pos is %" PRIdMAX ", start time is %d\n", (intmax_t)start_pos,
+ start_time);
+
+ /* Seek video. We do a single idx_grow at the beginning rather than
+--- ./src/demuxers/demux_film.c 17 Sep 2004 19:21:34 -0000 1.77
++++ ./src/demuxers/demux_film.c 9 Feb 2005 19:39:05 -0000 1.77.2.1
+@@ -21,7 +21,7 @@
+ * For more information on the FILM file format, visit:
+ * http://www.pcisys.net/~melanson/codecs/
+ *
+- * $Id: demux_film.c,v 1.77 2004/09/17 19:21:34 valtri Exp $
++ * $Id: demux_film.c,v 1.77.2.1 2005/02/09 19:39:05 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -311,7 +311,7 @@
+ if (film->sample_table[j].pts > largest_pts)
+ largest_pts = film->sample_table[j].pts;
+
+- llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIXMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n",
++ llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIxMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n",
+ j,
+ (intmax_t)film->sample_table[j].sample_offset,
+ film->sample_table[j].sample_size,
+--- ./src/demuxers/demux_flv.c 17 Sep 2004 19:21:34 -0000 1.4
++++ ./src/demuxers/demux_flv.c 9 Feb 2005 19:39:05 -0000 1.4.2.1
+@@ -24,7 +24,7 @@
+ * For more information on the FLV file format, visit:
+ * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf
+ *
+- * $Id: demux_flv.c,v 1.4 2004/09/17 19:21:34 valtri Exp $
++ * $Id: demux_flv.c,v 1.4.2.1 2005/02/09 19:39:05 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -99,7 +99,7 @@
+
+ first_offset = BE_32(buffer);
+ this->input->seek(this->input, first_offset, SEEK_SET);
+- lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIXMAX "\n",
++ lprintf(" qualified FLV file, repositioned @ offset 0x%" PRIxMAX "\n",
+ (intmax_t)first_offset);
+
+ return 1;
+--- ./src/demuxers/demux_matroska.c 13 Dec 2004 16:07:43 -0000 1.32
++++ ./src/demuxers/demux_matroska.c 9 Feb 2005 19:39:05 -0000 1.32.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: demux_matroska.c,v 1.32 2004/12/13 16:07:43 miguelfreitas Exp $
++ * $Id: demux_matroska.c,v 1.32.2.1 2005/02/09 19:39:05 mroi Exp $
+ *
+ * demultiplexer for matroska streams
+ *
+@@ -1453,7 +1453,7 @@
+ if (size > 8) {
+ off_t pos = this->input->get_current_pos(this->input);
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+- "demux_matroska: Invalid Track Number at position %" PRIiMAX "\n",
++ "demux_matroska: Invalid Track Number at position %" PRIdMAX "\n",
+ (intmax_t)pos);
+ return 0;
+ }
+@@ -1507,7 +1507,7 @@
+ if (this->input->read(this->input, this->block_data, len) != len) {
+ off_t pos = this->input->get_current_pos(this->input);
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+- "demux_matroska: read error at position %" PRIiMAX "\n",
++ "demux_matroska: read error at position %" PRIdMAX "\n",
+ (intmax_t)pos);
+ return 0;
+ }
+@@ -1877,7 +1877,7 @@
+ this->ebml->level = 1;
+ if (this->input->seek(this->input, seek_pos, SEEK_SET) < 0) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "demux_matroska: failed to seek to pos: %" PRIiMAX "\n",
++ "demux_matroska: failed to seek to pos: %" PRIdMAX "\n",
+ (intmax_t)seek_pos);
+ return 0;
+ }
+@@ -1888,13 +1888,13 @@
+ memcpy(this->ebml, &ebml_bak, sizeof(ebml_parser_t)); /* FIXME */
+ if (this->input->seek(this->input, current_pos, SEEK_SET) < 0) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "demux_matroska: failed to seek to pos: %" PRIiMAX "\n",
++ "demux_matroska: failed to seek to pos: %" PRIdMAX "\n",
+ (intmax_t)current_pos);
+ return 0;
+ }
+ } else {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "demux_matroska: out of stream seek pos: %" PRIiMAX "\n",
++ "demux_matroska: out of stream seek pos: %" PRIdMAX "\n",
+ (intmax_t)seek_pos);
+ }
+ return 1;
+@@ -2182,7 +2182,7 @@
+ next_level = 1;
+ if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "demux_matroska: failed to seek to pos: %" PRIiMAX "\n",
++ "demux_matroska: failed to seek to pos: %" PRIdMAX "\n",
+ (intmax_t)this->segment.start);
+ this->status = DEMUX_FINISHED;
+ return;
+@@ -2202,7 +2202,7 @@
+ next_level = 1;
+ if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "demux_matroska: failed to seek to pos: %" PRIiMAX "\n",
++ "demux_matroska: failed to seek to pos: %" PRIdMAX "\n",
+ (intmax_t)this->segment.start);
+ this->status = DEMUX_FINISHED;
+ }
+--- ./src/demuxers/demux_mng.c 13 Jun 2004 21:28:53 -0000 1.23
++++ ./src/demuxers/demux_mng.c 9 Feb 2005 19:39:21 -0000 1.23.2.1
+@@ -19,7 +19,7 @@
+ */
+
+ /*
+- * $Id: demux_mng.c,v 1.23 2004/06/13 21:28:53 miguelfreitas Exp $
++ * $Id: demux_mng.c,v 1.23.2.1 2005/02/09 19:39:21 mroi Exp $
+ *
+ * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format
+ *
+@@ -62,6 +62,7 @@
+
+ mng_handle mngh;
+ xine_bmiheader bih;
++ int left_edge;
+ uint8_t *image;
+
+ int started;
+@@ -113,12 +114,13 @@
+ static mng_bool mymng_process_header(mng_handle mngh, mng_uint32 width, mng_uint32 height){
+ demux_mng_t *this = (demux_mng_t*)mng_get_userdata(mngh);
+
+- this->bih.biWidth = width;
++ this->bih.biWidth = (width + 7) & ~7;
+ this->bih.biHeight = height;
++ this->left_edge = (this->bih.biWidth - width) / 2;
+
+- this->image = malloc(width * height * 3);
++ this->image = malloc(this->bih.biWidth * height * 3);
+
+- mng_set_canvasstyle(mngh, MNG_CANVAS_BGR8);
++ mng_set_canvasstyle(mngh, MNG_CANVAS_RGB8);
+
+ return MNG_TRUE;
+ }
+@@ -140,7 +142,7 @@
+ static mng_ptr mymng_get_canvas_line(mng_handle mngh, mng_uint32 line){
+ demux_mng_t *this = (demux_mng_t*)mng_get_userdata(mngh);
+
+- return this->image + line * this->bih.biWidth * 3;
++ return this->image + (this->left_edge + line * this->bih.biWidth) * 3;
+ }
+
+ static mng_bool mymng_refresh(mng_handle mngh, mng_uint32 x, mng_uint32 y, mng_uint32 w, mng_uint32 h){
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/demuxers/demux_mpc.c 9 Feb 2005 19:39:21 -0000 1.2.2.1
+@@ -0,0 +1,385 @@
++/*
++ * Copyright (C) 2005 the xine project
++ *
++ * This file is part of xine, a free video player.
++ *
++ * xine is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * xine is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * Musepack demuxer by James Stembridge <jstembridge@gmail.com>
++ *
++ * TODO:
++ * ID3 tag reading
++ * APE tag reading
++ * Seeking??
++ *
++ * $Id: demux_mpc.c,v 1.2.2.1 2005/02/09 19:39:21 mroi Exp $
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <stdio.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
++
++#define LOG_MODULE "demux_mpc"
++#define LOG_VERBOSE
++/*
++#define LOG
++*/
++
++#include "xine_internal.h"
++#include "xineutils.h"
++#include "demux.h"
++#include "buffer.h"
++#include "bswap.h"
++#include "group_audio.h"
++
++/* Note that the header is actually 25 bytes long, so we'd only read 28
++ * (because of byte swapping we have to round up to nearest multiple of 4)
++ * if it weren't for libmusepack reading 32 bytes when it parses the header */
++#define HEADER_SIZE 32
++
++typedef struct {
++ demux_plugin_t demux_plugin;
++
++ xine_stream_t *stream;
++ fifo_buffer_t *audio_fifo;
++ input_plugin_t *input;
++ int status;
++
++ unsigned char header[HEADER_SIZE];
++ unsigned int frames;
++ double samplerate;
++ unsigned int length;
++
++ unsigned int current_frame;
++ unsigned int next_frame_bits;
++} demux_mpc_t;
++
++typedef struct {
++ demux_class_t demux_class;
++} demux_mpc_class_t;
++
++
++/* Open a musepack file
++ * This function is called from the _open() function of this demuxer.
++ * It returns 1 if the musepack file was opened successfully. */
++static int open_mpc_file(demux_mpc_t *this) {
++ unsigned char preamble[4];
++ unsigned int first_frame_size;
++
++ /* Fetch the file signature */
++ if (_x_demux_read_header(this->input, preamble, 4) != 4)
++ return 0;
++
++ /* Validate signature - We only support SV7 at the moment */
++ if ((preamble[0] != 'M') ||
++ (preamble[1] != 'P') ||
++ (preamble[2] != '+') ||
++ (preamble[3] != 0x07))
++ return 0;
++
++ /* Read header */
++ if (_x_demux_read_header(this->input, this->header, HEADER_SIZE) != HEADER_SIZE)
++ return 0;
++
++ /* Get frame count */
++ this->current_frame = 0;
++ this->frames = LE_32(&this->header[4]);
++ lprintf("number of frames: %u\n", this->frames);
++
++ /* Get sample rate */
++ switch ((LE_32(&this->header[8]) >> 16) & 0x3) {
++ case 0:
++ this->samplerate = 44.1;
++ break;
++ case 1:
++ this->samplerate = 48.0;
++ break;
++ case 2:
++ this->samplerate = 37.8;
++ break;
++ case 3:
++ this->samplerate = 32.0;
++ break;
++ default:
++ break;
++ }
++ lprintf("samplerate: %f kHz\n", this->samplerate);
++
++ /* Calculate stream length */
++ this->length = (int) ((double) this->frames * 1152 / this->samplerate);
++ lprintf("stream length: %d ms\n", this->length);
++
++ /* Calculate the number of bits of the first frame that are still be sent */
++ first_frame_size = (LE_32(&this->header[24]) >> 4) & 0xFFFFF;
++ this->next_frame_bits = first_frame_size - 4;
++ lprintf("first frame size: %u\n", first_frame_size);
++
++ /* Move input to start of data (to nearest multiple of 4) */
++ this->input->seek(this->input, 28, SEEK_SET);
++
++ /* Set stream info */
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, ME_32(preamble));
++
++ return 1;
++}
++
++static int demux_mpc_send_chunk(demux_plugin_t *this_gen) {
++ demux_mpc_t *this = (demux_mpc_t *) this_gen;
++ unsigned int bits_to_read, bytes_to_read, extra_bits_read, next_frame_size;
++ off_t bytes_read;
++
++ buf_element_t *buf = NULL;
++
++ /* Check if we've finished */
++ if (this->current_frame++ == this->frames) {
++ lprintf("all frames read\n");
++ this->status = DEMUX_FINISHED;
++ return this->status;
++ }
++ lprintf("current frame: %u\n", this->current_frame);
++
++ /* Get a buffer */
++ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
++ buf->type = BUF_AUDIO_MPC;
++ buf->pts = 0;
++ buf->extra_info->total_time = this->length;
++
++ /* Set normalised position */
++ buf->extra_info->input_normpos =
++ (int) ((double) this->input->get_current_pos(this->input) * 65535 /
++ this->input->get_length(this->input));
++
++ /* Set time based on there being 1152 audio frames per frame */
++ buf->extra_info->input_time =
++ (int) ((double) this->current_frame * 1152 / this->samplerate);
++
++ /* Calculate the number of bits that need to be read to finish reading
++ * the current frame and read the size of the next frame. This number
++ * has to be rounded up to the nearest 4 bytes on account of the
++ * byte swapping used */
++ bits_to_read = (this->next_frame_bits+20+31) & ~31;
++ bytes_to_read = bits_to_read / 8;
++
++ /* Check we'll be able to read directly into the buffer */
++ if (bytes_to_read > buf->max_size) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("demux_mpc: frame too big for buffer"));
++ this->status = DEMUX_FINISHED;
++ return this->status;
++ }
++
++ /* Read data */
++ bytes_read = this->input->read(this->input, buf->content, bytes_to_read);
++ if(bytes_read == 0) {
++ buf->free_buffer(buf);
++ this->status = DEMUX_FINISHED;
++ return this->status;
++ } else
++ buf->size = bytes_read;
++
++ /* Read the size of the next frame */
++ if (this->current_frame < this->frames) {
++ /* The number of bits of the next frame we've read */
++ extra_bits_read = bits_to_read - (this->next_frame_bits+20);
++
++ if(extra_bits_read <= 12)
++ next_frame_size = (LE_32(&buf->content[bytes_to_read-4]) >> extra_bits_read) & 0xFFFFF;
++ else
++ next_frame_size = ((LE_32(&buf->content[bytes_to_read-8]) << (32-extra_bits_read)) |
++ (LE_32(&buf->content[bytes_to_read-4]) >> extra_bits_read)) & 0xFFFFF;
++
++ lprintf("next frame size: %u\n", next_frame_size);
++
++ /* The number of bits of the next frame still to read */
++ this->next_frame_bits = next_frame_size - extra_bits_read;
++ }
++
++ /* Each buffer contains at least one frame */
++ buf->decoder_flags |= BUF_FLAG_FRAME_END;
++
++ this->audio_fifo->put(this->audio_fifo, buf);
++
++ return this->status;
++}
++
++static void demux_mpc_send_headers(demux_plugin_t *this_gen) {
++ demux_mpc_t *this = (demux_mpc_t *) this_gen;
++ buf_element_t *buf;
++
++ this->audio_fifo = this->stream->audio_fifo;
++
++ this->status = DEMUX_OK;
++
++ /* Send start buffers */
++ _x_demux_control_start(this->stream);
++
++ /* Send header to decoder */
++ if (this->audio_fifo) {
++ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
++
++ buf->type = BUF_AUDIO_MPC;
++ buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_FRAME_END;
++ buf->decoder_info[0] = this->input->get_length(this->input);
++ buf->decoder_info[1] = 0;
++ buf->decoder_info[2] = 0;
++ buf->decoder_info[3] = 0;
++
++ /* Copy the header */
++ buf->size = HEADER_SIZE;
++ memcpy(buf->content, this->header, buf->size);
++
++ this->audio_fifo->put (this->audio_fifo, buf);
++ }
++}
++
++static int demux_mpc_seek (demux_plugin_t *this_gen,
++ off_t start_pos, int start_time, int playing) {
++ demux_mpc_t *this = (demux_mpc_t *) this_gen;
++
++ /* If thread is not running, initialize demuxer */
++ if( !playing ) {
++
++ /* send new pts */
++ _x_demux_control_newpts(this->stream, 0, 0);
++
++ this->status = DEMUX_OK;
++ }
++
++ return this->status;
++}
++
++static void demux_mpc_dispose (demux_plugin_t *this_gen) {
++ demux_mpc_t *this = (demux_mpc_t *) this_gen;
++
++ free(this);
++}
++
++static int demux_mpc_get_status (demux_plugin_t *this_gen) {
++ demux_mpc_t *this = (demux_mpc_t *) this_gen;
++
++ return this->status;
++}
++
++static int demux_mpc_get_stream_length (demux_plugin_t *this_gen) {
++// demux_mpc_t *this = (demux_mpc_t *) this_gen;
++
++ return 0;
++}
++
++static uint32_t demux_mpc_get_capabilities(demux_plugin_t *this_gen) {
++ return DEMUX_CAP_NOCAP;
++}
++
++static int demux_mpc_get_optional_data(demux_plugin_t *this_gen,
++ void *data, int data_type) {
++ return DEMUX_OPTIONAL_UNSUPPORTED;
++}
++
++static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream,
++ input_plugin_t *input) {
++
++ demux_mpc_t *this;
++
++ this = xine_xmalloc (sizeof (demux_mpc_t));
++ this->stream = stream;
++ this->input = input;
++
++ this->demux_plugin.send_headers = demux_mpc_send_headers;
++ this->demux_plugin.send_chunk = demux_mpc_send_chunk;
++ this->demux_plugin.seek = demux_mpc_seek;
++ this->demux_plugin.dispose = demux_mpc_dispose;
++ this->demux_plugin.get_status = demux_mpc_get_status;
++ this->demux_plugin.get_stream_length = demux_mpc_get_stream_length;
++ this->demux_plugin.get_capabilities = demux_mpc_get_capabilities;
++ this->demux_plugin.get_optional_data = demux_mpc_get_optional_data;
++ this->demux_plugin.demux_class = class_gen;
++
++ this->status = DEMUX_FINISHED;
++ switch (stream->content_detection_method) {
++
++ case METHOD_BY_EXTENSION: {
++ char *extensions, *mrl;
++
++ mrl = input->get_mrl (input);
++ extensions = class_gen->get_extensions (class_gen);
++
++ if (!_x_demux_check_extension (mrl, extensions)) {
++ free (this);
++ return NULL;
++ }
++ }
++ /* Falling through is intended */
++
++ case METHOD_BY_CONTENT:
++ case METHOD_EXPLICIT:
++
++ if (!open_mpc_file(this)) {
++ free (this);
++ return NULL;
++ }
++
++ break;
++
++ default:
++ free (this);
++ return NULL;
++ }
++
++ return &this->demux_plugin;
++}
++
++static char *get_description (demux_class_t *this_gen) {
++ return "Musepack demux plugin";
++}
++
++static char *get_identifier (demux_class_t *this_gen) {
++ return "Musepack";
++}
++
++static char *get_extensions (demux_class_t *this_gen) {
++ return "mpc mp+";
++}
++
++static char *get_mimetypes (demux_class_t *this_gen) {
++ return NULL;
++}
++
++static void class_dispose (demux_class_t *this_gen) {
++ demux_mpc_class_t *this = (demux_mpc_class_t *) this_gen;
++
++ free (this);
++}
++
++void *demux_mpc_init_plugin (xine_t *xine, void *data) {
++ demux_mpc_class_t *this;
++
++ this = xine_xmalloc (sizeof (demux_mpc_class_t));
++
++ this->demux_class.open_plugin = open_plugin;
++ this->demux_class.get_description = get_description;
++ this->demux_class.get_identifier = get_identifier;
++ this->demux_class.get_mimetypes = get_mimetypes;
++ this->demux_class.get_extensions = get_extensions;
++ this->demux_class.dispose = class_dispose;
++
++ return this;
++}
+--- ./src/demuxers/demux_mpeg_pes.c 17 Dec 2004 20:08:46 -0000 1.28
++++ ./src/demuxers/demux_mpeg_pes.c 9 Feb 2005 19:39:21 -0000 1.28.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: demux_mpeg_pes.c,v 1.28 2004/12/17 20:08:46 miguelfreitas Exp $
++ * $Id: demux_mpeg_pes.c,v 1.28.2.1 2005/02/09 19:39:21 mroi Exp $
+ *
+ * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
+ * reads streams of variable blocksizes
+@@ -1499,12 +1499,14 @@
+ ending = strrchr(mrl, '.');
+
+ if (!ending) {
++ free (this->scratch_base);
+ free (this);
+ return NULL;
+ }
+
+ if (strncasecmp(ending, ".MPEG", 5)
+ && strncasecmp (ending, ".mpg", 4)) {
++ free (this->scratch_base);
+ free (this);
+ return NULL;
+ }
+--- ./src/demuxers/demux_mpgaudio.c 16 Dec 2004 13:59:11 -0000 1.139
++++ ./src/demuxers/demux_mpgaudio.c 9 Feb 2005 19:39:21 -0000 1.139.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: demux_mpgaudio.c,v 1.139 2004/12/16 13:59:11 mroi Exp $
++ * $Id: demux_mpgaudio.c,v 1.139.2.1 2005/02/09 19:39:21 mroi Exp $
+ *
+ * demultiplexer for mpeg audio (i.e. mp3) streams
+ *
+@@ -603,6 +603,8 @@
+ int bs = 0;
+ int i, optional;
+
++ memset(buf, 0, 4);
++
+ if(!input)
+ return 0;
+
+@@ -615,7 +617,8 @@
+ if(!bs)
+ bs = MAX_PREVIEW_SIZE;
+
+- input->read(input, buf, bs);
++ if (input->read(input, buf, bs) < 4)
++ return 0;
+
+ lprintf("stream is seekable\n");
+
+--- ./src/demuxers/demux_qt.c 12 Dec 2004 22:01:03 -0000 1.196
++++ ./src/demuxers/demux_qt.c 3 Jan 2005 21:13:54 -0000 1.196.2.1
+@@ -30,7 +30,7 @@
+ * build_frame_table
+ * free_qt_info
+ *
+- * $Id: demux_qt.c,v 1.196 2004/12/12 22:01:03 mroi Exp $
++ * $Id: demux_qt.c,v 1.196.2.1 2005/01/03 21:13:54 mroi Exp $
+ *
+ */
+
+@@ -2984,7 +2984,7 @@
+ }
+
+ static char *get_extensions (demux_class_t *this_gen) {
+- return "mov qt mp4";
++ return "mov qt mp4 m4a";
+ }
+
+ static char *get_mimetypes (demux_class_t *this_gen) {
+--- ./src/demuxers/demux_ts.c 20 Dec 2004 20:00:27 -0000 1.115
++++ ./src/demuxers/demux_ts.c 9 Feb 2005 19:39:22 -0000 1.115.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: demux_ts.c,v 1.115 2004/12/20 20:00:27 jcdutton Exp $
++ * $Id: demux_ts.c,v 1.115.2.1 2005/02/09 19:39:22 mroi Exp $
+ *
+ * Demultiplexer for MPEG2 Transport Streams.
+ *
+@@ -868,6 +868,7 @@
+ if (!demux_ts_parse_pes_header(this->stream->xine, m, ts, len, this->stream)) {
+ m->corrupted_pes = 1;
+ m->buf->free_buffer(m->buf);
++ m->buf = NULL;
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+ "demux_ts: PID 0x%.4x: corrupted pes encountered\n", m->pid);
+
+@@ -1833,11 +1834,16 @@
+ demux_ts_t*this = (demux_ts_t*)this_gen;
+
+ for (i=0; i < MAX_PMTS; i++) {
+- if (this->pmt[i] != NULL) free(this->pmt[i]);
++ if (this->pmt[i] != NULL) {
++ free(this->pmt[i]);
++ this->pmt[i] = NULL;
++ }
+ }
+ for (i=0; i < MAX_PIDS; i++) {
+- if (this->media[i].buf != NULL)
++ if (this->media[i].buf != NULL) {
+ this->media[i].buf->free_buffer(this->media[i].buf);
++ this->media[i].buf = NULL;
++ }
+ }
+
+ xine_event_dispose_queue (this->event_queue);
+--- ./src/demuxers/ebml.c 17 Sep 2004 19:21:45 -0000 1.2
++++ ./src/demuxers/ebml.c 9 Feb 2005 19:39:22 -0000 1.2.2.1
+@@ -20,7 +20,7 @@
+ * EBML parser
+ * a lot of ideas from the gstreamer parser
+ *
+- * $Id: ebml.c,v 1.2 2004/09/17 19:21:45 valtri Exp $
++ * $Id: ebml.c,v 1.2.2.1 2005/02/09 19:39:22 mroi Exp $
+ *
+ */
+ #ifdef HAVE_CONFIG_H
+@@ -107,7 +107,7 @@
+ if (size > 4) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: invalid EBML ID size (0x%x) at position %" PRIiMAX "\n",
++ "ebml: invalid EBML ID size (0x%x) at position %" PRIdMAX "\n",
+ data[0], (intmax_t)pos);
+ return 0;
+ }
+@@ -116,7 +116,7 @@
+ if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos);
++ "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos);
+ return 0;
+ }
+ for(i = 1; i < size; i++) {
+@@ -139,7 +139,7 @@
+ if (ebml->input->read(ebml->input, data, 1) != 1) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos);
++ "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos);
+ return 0;
+ }
+ value = data[0];
+@@ -152,7 +152,7 @@
+ if (size > 8) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: Invalid EBML length size (0x%x) at position %" PRIiMAX "\n",
++ "ebml: Invalid EBML length size (0x%x) at position %" PRIdMAX "\n",
+ data[0], (intmax_t)pos);
+ return 0;
+ }
+@@ -170,7 +170,7 @@
+ if (ebml->input->read(ebml->input, data + 1, size - 1) != (size - 1)) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos);
++ "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos);
+ return 0;
+ }
+ for (i = 1; i < size; i++) {
+@@ -193,7 +193,7 @@
+ if (ebml->input->read(ebml->input, buf, len) != len) {
+ off_t pos = ebml->input->get_current_pos(ebml->input);
+ xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+- "ebml: read error at position %" PRIiMAX "\n", (intmax_t)pos);
++ "ebml: read error at position %" PRIdMAX "\n", (intmax_t)pos);
+ return 0;
+ }
+
+--- ./src/demuxers/group_audio.c 13 Jun 2004 21:28:55 -0000 1.15
++++ ./src/demuxers/group_audio.c 9 Feb 2005 19:39:22 -0000 1.15.2.1
+@@ -19,7 +19,7 @@
+ *
+ * This file contains plugin entries for several demuxers used in games
+ *
+- * $Id: group_audio.c,v 1.15 2004/06/13 21:28:55 miguelfreitas Exp $
++ * $Id: group_audio.c,v 1.15.2.1 2005/02/09 19:39:22 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -63,6 +63,10 @@
+ 0 /* priority */
+ };
+
++demuxer_info_t demux_info_mpc = {
++ 0 /* priority */
++};
++
+ demuxer_info_t demux_info_nsf = {
+ 10 /* priority */
+ };
+@@ -102,6 +106,7 @@
+ { PLUGIN_DEMUX, 25, "cdda", XINE_VERSION_CODE, &demux_info_cdda, demux_cdda_init_plugin },
+ { PLUGIN_DEMUX, 25, "flac", XINE_VERSION_CODE, &demux_info_flac, demux_flac_init_plugin },
+ { PLUGIN_DEMUX, 25, "mp3", XINE_VERSION_CODE, &demux_info_mpgaudio, demux_mpgaudio_init_class },
++ { PLUGIN_DEMUX, 25, "mpc", XINE_VERSION_CODE, &demux_info_mpc, demux_mpc_init_plugin },
+ { PLUGIN_DEMUX, 25, "nsf", XINE_VERSION_CODE, &demux_info_nsf, demux_nsf_init_plugin },
+ { PLUGIN_DEMUX, 25, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin },
+ { PLUGIN_DEMUX, 25, "snd", XINE_VERSION_CODE, &demux_info_snd, demux_snd_init_plugin },
+--- ./src/demuxers/group_audio.h 11 Jun 2004 01:29:49 -0000 1.5
++++ ./src/demuxers/group_audio.h 9 Feb 2005 19:39:22 -0000 1.5.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: group_audio.h,v 1.5 2004/06/11 01:29:49 tmmm Exp $
++ * $Id: group_audio.h,v 1.5.2.1 2005/02/09 19:39:22 mroi Exp $
+ */
+
+ #ifndef HAVE_GROUP_AUDIO_H
+@@ -32,6 +32,7 @@
+ void *demux_cdda_init_plugin (xine_t *xine, void *data);
+ void *demux_flac_init_plugin (xine_t *xine, void *data);
+ void *demux_mpgaudio_init_class (xine_t *xine, void *data);
++void *demux_mpc_init_plugin (xine_t *xine, void *data);
+ void *demux_nsf_init_plugin (xine_t *xine, void *data);
+ void *demux_realaudio_init_plugin (xine_t *xine, void *data);
+ void *demux_snd_init_plugin (xine_t *xine, void *data);
+--- ./src/dxr3/video_out_dxr3.c 12 Dec 2004 22:01:04 -0000 1.106
++++ ./src/dxr3/video_out_dxr3.c 9 Feb 2005 19:39:22 -0000 1.106.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: video_out_dxr3.c,v 1.106 2004/12/12 22:01:04 mroi Exp $
++ * $Id: video_out_dxr3.c,v 1.106.2.1 2005/02/09 19:39:22 mroi Exp $
+ */
+
+ /* mpeg1 encoding video out plugin for the dxr3.
+@@ -333,7 +333,7 @@
+ "this setting can be \"fame\", \"rte\", \"libavcodec\" or \"none\".\n"
+ "The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships with xine, "
+ "so you do not need to install any additional library for that. Even better is that "
+- "libdavcodec also provides high quality with low CPU usage. Using \"libavcodec\" is "
++ "libavcodec also provides high quality with low CPU usage. Using \"libavcodec\" is "
+ "therefore strongly suggested.\n\"fame\" and \"rte\" are still there, "
+ "but xine support for them is outdated, so these might fail to work."),
+ 0, NULL, NULL);
+--- ./src/input/input_dvb.c 20 Dec 2004 15:59:05 -0000 1.64
++++ ./src/input/input_dvb.c 15 Jan 2005 17:51:40 -0000 1.64.2.1
+@@ -758,7 +758,11 @@
+ channel->front_param.u.qam.modulation = find_param(qam_list, field);
+ break;
+ case FE_OFDM:
+- channel->front_param.frequency = freq;
++ /* DVB-T frequency is in kHz - workaround broken channels.confs */
++ if (freq < 1000000)
++ freq*=1000;
++
++ channel->front_param.frequency = freq;
+
+ /* find out the inversion */
+ if(!(field = strsep(&tmp, ":")))return -1;
+--- ./src/input/input_dvd.c 12 Dec 2004 22:01:05 -0000 1.195
++++ ./src/input/input_dvd.c 9 Feb 2005 19:39:23 -0000 1.195.2.1
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: input_dvd.c,v 1.195 2004/12/12 22:01:05 mroi Exp $
++ * $Id: input_dvd.c,v 1.195.2.1 2005/02/09 19:39:23 mroi Exp $
+ *
+ */
+
+@@ -422,8 +422,8 @@
+ } else {
+ pthread_mutex_unlock(&this->buf_mutex);
+ pthread_mutex_destroy(&this->buf_mutex);
+- if (this->mem)
+- free(this->mem);
++ free(this->mem);
++ free(this->mrl);
+ free(this);
+ }
+ }
+@@ -528,6 +528,7 @@
+ /* all buffers returned, we can free the plugin now */
+ pthread_mutex_destroy(&this->buf_mutex);
+ free(this->mem);
++ free(this->mrl);
+ free(this);
+ }
+ }
+--- ./src/input/input_http.c 24 Dec 2004 01:59:12 -0000 1.102
++++ ./src/input/input_http.c 9 Feb 2005 19:39:25 -0000 1.102.2.2
+@@ -19,7 +19,7 @@
+ *
+ * input plugin for http network streams
+ *
+- * $Id: input_http.c,v 1.102 2004/12/24 01:59:12 dsalt Exp $
++ * $Id: input_http.c,v 1.102.2.2 2005/02/09 19:39:25 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -33,6 +33,7 @@
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <ctype.h>
+
+ #ifndef WIN32
+ #include <netdb.h>
+@@ -99,6 +100,9 @@
+ off_t shoutcast_pos;
+ char *shoutcast_songtitle;
+
++ /* NSV */
++ int is_nsv;
++
+ /* scratch buffer for forward seeking */
+
+ char seek_buf[BUFSIZE];
+@@ -153,8 +157,8 @@
+ }
+
+ /*
+- * handle no proxy list config option and returns, if use the proxy or not
+- * if error occured, is expected using the proxy
++ * handle no-proxy list config option and returns, if use the proxy or not
++ * if error occurred, is expected using the proxy
+ */
+ static int _x_use_proxy(http_input_class_t *this, const char *host) {
+ const char *target;
+@@ -176,16 +180,37 @@
+
+ host_len = strlen(target);
+ no_proxy = strdup(this->noproxylist);
+- domain = strtok_r(no_proxy, ", ", &ptr);
++ domain = strtok_r(no_proxy, ",", &ptr);
+ while (domain) {
+- noprox_len = strlen(domain);
+- if (host_len >= noprox_len && strcmp(target + host_len - noprox_len, domain) == 0) {
+- lprintf("host '%s' is in no-proxy domain '%s'\n", target, domain);
+- return 1;
++ /* skip leading spaces */
++ while (isspace (*domain))
++ ++domain;
++ /* only check for matches if we've not reached the end of the token */
++ if (*domain) {
++ /* special-case domain beginning with '=' -> is a host name */
++ if (domain[0] == '=' && strcmp(target, domain + 1) == 0) {
++ lprintf("host '%s' is in no-proxy domain '%s'\n", target, domain);
++ return 1;
++ }
++ noprox_len = strlen(domain);
++ /* special-case host==domain, avoiding dot checks */
++ if (host_len == noprox_len && strcmp(target, domain) == 0) {
++ lprintf("host '%s' is in no-proxy domain '%s'\n", target, domain);
++ return 1;
++ }
++ /* check for host in domain, and require that (if matched) the domain
++ * name is preceded by a dot, either in the host or domain strings,
++ * e.g. "a.foo.bar" is in "foo.bar" and ".foo.bar" but not "o.bar"
++ */
++ if (host_len > noprox_len
++ && (domain[0] == '.' || target[host_len - noprox_len - 1] == '.')
++ && strcmp(target + host_len - noprox_len, domain) == 0) {
++ lprintf("host '%s' is in no-proxy domain '%s'\n", target, domain);
++ return 1;
++ }
++ lprintf("host '%s' isn't in no-proxy domain '%s'\n", target, domain);
+ }
+- lprintf("host '%s' isn't in no-proxy domain '%s'\n", target, domain);
+-
+- domain = strtok_r(NULL, ", ", &ptr);
++ domain = strtok_r(NULL, ",", &ptr);
+ i++;
+ }
+ free(no_proxy);
+@@ -301,7 +326,7 @@
+ strncat(data.str, songtitle, sizeof(data.str) - len - 3);
+ } else {
+ strncpy(data.str, songtitle, sizeof(data.str));
+- }
++ }
+ data.str[sizeof(data.str) - 1] = '\0';
+ data.str_len = strlen(data.str) + 1;
+
+@@ -401,123 +426,49 @@
+ return num_bytes;
+ }
+
+-static int read_shoutcast_header(http_input_plugin_t *this) {
+- int done, len, linenum;
+-
+- done = 0; len = 0; linenum = 0;
+- while (!done) {
+-
+- if (_x_io_tcp_read (this->stream, this->fh, &this->buf[len], 1) != 1) {
+- return 0;
+- }
+-
+- if (this->buf[len] == '\012') {
+-
+- this->buf[len] = '\0';
+- len--;
+-
+- if (len >= 0 && this->buf[len] == '\015') {
+- this->buf[len] = '\0';
+- len--;
+- }
+-
+- linenum++;
+-
+- lprintf ("shoutcast answer: >%s<\n", this->buf);
+-
+- if (!strncasecmp(this->buf, TAG_ICY_NAME, sizeof(TAG_ICY_NAME) - 1)) {
+- _x_meta_info_set(this->stream, XINE_META_INFO_ALBUM,
+- (this->buf + sizeof(TAG_ICY_NAME) - 1 +
+- (*(this->buf + sizeof(TAG_ICY_NAME)) == ' ')));
+- _x_meta_info_set(this->stream, XINE_META_INFO_TITLE,
+- (this->buf + sizeof(TAG_ICY_NAME) - 1 +
+- (*(this->buf + sizeof(TAG_ICY_NAME)) == ' ')));
+- }
+-
+- if (!strncasecmp(this->buf, TAG_ICY_GENRE, sizeof(TAG_ICY_GENRE) - 1)) {
+- _x_meta_info_set(this->stream, XINE_META_INFO_GENRE,
+- (this->buf + sizeof(TAG_ICY_GENRE) - 1 +
+- (*(this->buf + sizeof(TAG_ICY_GENRE)) == ' ')));
+- }
+-
+- /* icy-notice1 is always the same */
+- if (!strncasecmp(this->buf, TAG_ICY_NOTICE2, sizeof(TAG_ICY_NOTICE2) - 1)) {
+- _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT,
+- (this->buf + sizeof(TAG_ICY_NOTICE2) - 1 +
+- (*(this->buf + sizeof(TAG_ICY_NOTICE2)) == ' ')));
+- }
+-
+- /* metadata interval (in byte) */
+- if (sscanf(this->buf, "icy-metaint:%d", &this->shoutcast_metaint) == 1) {
+- lprintf("shoutcast_metaint: %d\n", this->shoutcast_metaint);
+- }
+-
+- /* content type */
+- if (!strncasecmp(this->buf, TAG_CONTENT_TYPE, sizeof(TAG_CONTENT_TYPE) - 1)) {
+- if (!strncasecmp(this->buf + sizeof(TAG_CONTENT_TYPE) - 1, "video/nsv", 9)) {
+- lprintf("shoutcast nsv detected\n");
+- this->shoutcast_mode = 2;
+- } else {
+- lprintf("shoutcast mp3 detected\n");
+- }
+- }
++static int resync_nsv(http_input_plugin_t *this) {
++ uint8_t c;
++ int pos = 0;
++ int read_bytes = 0;
+
+- if (len == -1)
+- done = 1;
+- else
+- len = 0;
+- } else
+- len ++;
+- }
++ lprintf("resyncing NSV stream\n");
++ while ((pos < 3) && (read_bytes < (1024*1024))) {
+
+- this->shoutcast_pos = 0;
+-
+- /* NSV resync */
+- if (this->shoutcast_mode == 2) {
+- uint8_t c;
+- int pos = 0;
+- int read_bytes = 0;
+-
+- lprintf("resyncing NSV stream\n");
+- while ((pos < 3) && (read_bytes < (1024*1024))) {
+-
+- if (http_plugin_read_int(this, &c, 1) != 1)
+- return 1;
++ if (http_plugin_read_int(this, &c, 1) != 1)
++ return 1;
+
+- this->preview[pos] = c;
+- switch (pos) {
+- case 0:
++ this->preview[pos] = c;
++ switch (pos) {
++ case 0:
++ if (c == 'N')
++ pos++;
++ break;
++ case 1:
++ if (c == 'S')
++ pos++;
++ else
++ if (c != 'N')
++ pos = 0;
++ break;
++ case 2:
++ if (c == 'V')
++ pos++;
++ else
+ if (c == 'N')
+- pos++;
+- break;
+- case 1:
+- if (c == 'S')
+- pos++;
++ pos = 1;
+ else
+- if (c != 'N')
+- pos = 0;
+- break;
+- case 2:
+- if (c == 'V')
+- pos++;
+- else
+- if (c == 'N')
+- pos = 1;
+- else
+- pos = 0;
+- break;
+- }
+- read_bytes++;
+- }
+- if (pos == 3) {
+- lprintf("NSV stream resynced\n");
+- } else {
+- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "http: cannot resync NSV stream!\n");
+- return 0;
++ pos = 0;
++ break;
+ }
++ read_bytes++;
++ }
++ if (pos == 3) {
++ lprintf("NSV stream resynced\n");
++ } else {
++ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
++ "http: cannot resync NSV stream!\n");
++ return 0;
+ }
+- lprintf ("end of the shoutcast header\n");
+
+ return 1;
+ }
+@@ -593,7 +544,7 @@
+ this->curpos = offset;
+ else
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "http: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n",
++ "http: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n",
+ (intmax_t)this->curpos, (intmax_t)offset);
+
+ } else {
+@@ -675,7 +626,7 @@
+ http_input_plugin_t *this = (http_input_plugin_t *) this_gen;
+ http_input_class_t *this_class = (http_input_class_t *) this->input_plugin.input_class;
+ int done, len, linenum;
+- int shoutcast = 0, httpcode;
++ int httpcode;
+ int res, progress;
+ int buflen;
+ int use_proxy;
+@@ -839,15 +790,12 @@
+ if (sscanf(this->buf, "HTTP/%d.%d %d %50[^\015\012]", &httpver, &httpsub,
+ &httpcode, httpstatus) != 4) {
+
+- /* icecast ? */
++ /* icecast 1 ? */
+ if (sscanf(this->buf, "ICY %d %50[^\015\012]", &httpcode, httpstatus) != 2) {
+ _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
+ xine_log (this->stream->xine, XINE_LOG_MSG,
+ _("input_http: invalid http answer\n"));
+ return 0;
+- } else {
+- shoutcast = 1;
+- done = 1;
+ }
+ }
+
+@@ -881,7 +829,7 @@
+
+ if (sscanf(this->buf, "Content-Length: %" SCNdMAX , &contentlength) == 1) {
+ xine_log (this->stream->xine, XINE_LOG_MSG,
+- _("input_http: content length = %" PRIiMAX " bytes\n"),
++ _("input_http: content length = %" PRIdMAX " bytes\n"),
+ contentlength);
+ this->contentlength = (off_t)contentlength;
+ }
+@@ -897,6 +845,44 @@
+ this->mrl = href;
+ return http_plugin_open(this_gen);
+ }
++
++ /* Icecast / ShoutCast Stuff */
++ if (!strncasecmp(this->buf, TAG_ICY_NAME, sizeof(TAG_ICY_NAME) - 1)) {
++ _x_meta_info_set(this->stream, XINE_META_INFO_ALBUM,
++ (this->buf + sizeof(TAG_ICY_NAME) - 1 +
++ (*(this->buf + sizeof(TAG_ICY_NAME)) == ' ')));
++ _x_meta_info_set(this->stream, XINE_META_INFO_TITLE,
++ (this->buf + sizeof(TAG_ICY_NAME) - 1 +
++ (*(this->buf + sizeof(TAG_ICY_NAME)) == ' ')));
++ }
++
++ if (!strncasecmp(this->buf, TAG_ICY_GENRE, sizeof(TAG_ICY_GENRE) - 1)) {
++ _x_meta_info_set(this->stream, XINE_META_INFO_GENRE,
++ (this->buf + sizeof(TAG_ICY_GENRE) - 1 +
++ (*(this->buf + sizeof(TAG_ICY_GENRE)) == ' ')));
++ }
++
++ /* icy-notice1 is always the same */
++ if (!strncasecmp(this->buf, TAG_ICY_NOTICE2, sizeof(TAG_ICY_NOTICE2) - 1)) {
++ _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT,
++ (this->buf + sizeof(TAG_ICY_NOTICE2) - 1 +
++ (*(this->buf + sizeof(TAG_ICY_NOTICE2)) == ' ')));
++ }
++
++ /* metadata interval (in byte) */
++ if (sscanf(this->buf, TAG_ICY_METAINT"%d", &this->shoutcast_metaint) == 1) {
++ lprintf("shoutcast_metaint: %d\n", this->shoutcast_metaint);
++ this->shoutcast_mode = 1;
++ this->shoutcast_pos = 0;
++ }
++
++ /* content type */
++ if (!strncasecmp(this->buf, TAG_CONTENT_TYPE, sizeof(TAG_CONTENT_TYPE) - 1)) {
++ if (!strncasecmp(this->buf + sizeof(TAG_CONTENT_TYPE) - 1, "video/nsv", 9)) {
++ lprintf("shoutcast nsv detected\n");
++ this->is_nsv = 1;
++ }
++ }
+ }
+
+ if (len == -1)
+@@ -909,27 +895,14 @@
+
+ lprintf ("end of headers\n");
+
+-
+- /* Trivial shoutcast detection */
+- this->shoutcast_metaint = 0;
+- this->shoutcast_songtitle = NULL;
+- if (shoutcast) {
+- this->shoutcast_mode = 1;
+- if (!read_shoutcast_header(this)) {
+- /* problem when reading shoutcast header */
+- _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "can't read shoutcast header", NULL);
+- xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "can't read shoutcast header\n");
+- return 0;
+- }
+- } else {
+- this->shoutcast_mode = 0;
+- }
+-
+ /*
+ * fill preview buffer
+ */
+ this->preview_size = MAX_PREVIEW_SIZE;
+- if (this->shoutcast_mode == 2) {
++ if (this->is_nsv) {
++ if (!resync_nsv(this))
++ return 0;
++
+ /* the first 3 chars are "NSV" */
+ this->preview_size = http_plugin_read_int (this, this->preview + 3, MAX_PREVIEW_SIZE - 3);
+ } else {
+@@ -1069,8 +1042,8 @@
+ _("The password for the HTTP proxy."), 10,
+ proxy_password_change_cb, (void *) this);
+ this->noproxylist = config->register_string(config,
+- "input.http_no_proxy", "", _("Domains, where to ignore the HTTP proxy"),
+- _("A Comma separated list of domain names, where the proxy is to be ignored."), 10,
++ "media.network.http_no_proxy", "", _("Domains for which to ignore the HTTP proxy"),
++ _("A comma-separated list of domain names for which the proxy is to be ignored.\nIf a domain name is prefixed with '=' then it is treated as a host name only (full match required)."), 10,
+ no_proxy_list_change_cb, (void *) this);
+
+ return this;
+--- ./src/input/input_net.c 17 Sep 2004 19:21:46 -0000 1.60
++++ ./src/input/input_net.c 9 Feb 2005 19:39:25 -0000 1.60.2.2
+@@ -20,7 +20,7 @@
+ * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the
+ * other end and you can watch tv anywhere in the house ..)
+ *
+- * $Id: input_net.c,v 1.60 2004/09/17 19:21:46 valtri Exp $
++ * $Id: input_net.c,v 1.60.2.2 2005/02/09 19:39:25 mroi Exp $
+ *
+ * how to set up mp1e for use with this plugin:
+ *
+@@ -206,7 +206,6 @@
+ struct addrinfo hints, *res, *tmpaddr;
+ int error;
+ char strport[16];
+- int i;
+ int s;
+
+ memset(&hints, 0, sizeof(hints));
+@@ -272,7 +271,7 @@
+ if( (len-total) > 0 ) {
+ n = _x_read_abort (this->stream, this->fh, &buf[total], len-total);
+
+- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIiMAX " bytes (%" PRIiMAX "/%" PRIiMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len);
++ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_net: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len);
+
+ if (n < 0) {
+ _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
+@@ -349,7 +348,7 @@
+ this->curpos = offset;
+ else
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "input_net: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n",
++ "input_net: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n",
+ (intmax_t)this->curpos, (intmax_t)offset);
+
+ } else {
+--- ./src/input/input_pnm.c 17 Sep 2004 19:21:46 -0000 1.20
++++ ./src/input/input_pnm.c 9 Feb 2005 19:39:25 -0000 1.20.2.1
+@@ -121,7 +121,7 @@
+ pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen;
+
+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+- "input_pnm: seek %" PRIiMAX " bytes, origin %d\n", (intmax_t)offset,
++ "input_pnm: seek %" PRIdMAX " bytes, origin %d\n", (intmax_t)offset,
+ origin);
+
+ /* only realtive forward-seeking is implemented */
+--- ./src/input/input_stdin_fifo.c 17 Sep 2004 19:21:46 -0000 1.60
++++ ./src/input/input_stdin_fifo.c 9 Feb 2005 19:39:25 -0000 1.60.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: input_stdin_fifo.c,v 1.60 2004/09/17 19:21:46 valtri Exp $
++ * $Id: input_stdin_fifo.c,v 1.60.2.1 2005/02/09 19:39:25 mroi Exp $
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -158,7 +158,7 @@
+ this->curpos = offset;
+ else
+ xprintf (this->xine, XINE_VERBOSITY_LOG,
+- _("stdin: cannot seek back! (%" PRIiMAX " > %" PRIiMAX ")\n"),
++ _("stdin: cannot seek back! (%" PRIdMAX " > %" PRIdMAX ")\n"),
+ (intmax_t)this->curpos, (intmax_t)offset);
+
+ } else {
+--- ./src/input/mms.c 14 Dec 2004 23:13:09 -0000 1.52
++++ ./src/input/mms.c 9 Feb 2005 19:39:25 -0000 1.52.2.2
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: mms.c,v 1.52 2004/12/14 23:13:09 tmattern Exp $
++ * $Id: mms.c,v 1.52.2.2 2005/02/09 19:39:25 mroi Exp $
+ *
+ * MMS over TCP protocol
+ * based on work from major mms
+@@ -58,7 +58,6 @@
+ /*
+ #define LOG
+ */
+-
+ #include "xine_internal.h"
+ #include "xineutils.h"
+
+@@ -140,7 +139,7 @@
+ int stream_ids[ASF_MAX_NUM_STREAMS];
+ int stream_types[ASF_MAX_NUM_STREAMS];
+ int asf_packet_len;
+- uint32_t file_len;
++ uint64_t file_len;
+ char guid[37];
+ uint32_t bitrates[ASF_MAX_NUM_STREAMS];
+ uint32_t bitrates_pos[ASF_MAX_NUM_STREAMS];
+@@ -271,22 +270,25 @@
+ mms_buffer_init(&command_buffer, this->scmd);
+ mms_buffer_put_32 (&command_buffer, 0x00000001); /* start sequence */
+ mms_buffer_put_32 (&command_buffer, 0xB00BFACE); /* #-)) */
+- mms_buffer_put_32 (&command_buffer, length + 32);
++ mms_buffer_put_32 (&command_buffer, len8 * 8 + 32);
+ mms_buffer_put_32 (&command_buffer, 0x20534d4d); /* protocol type "MMS " */
+ mms_buffer_put_32 (&command_buffer, len8 + 4);
+ mms_buffer_put_32 (&command_buffer, this->seq_num);
+ this->seq_num++;
+ mms_buffer_put_32 (&command_buffer, 0x0); /* timestamp */
+ mms_buffer_put_32 (&command_buffer, 0x0);
+- mms_buffer_put_32 (&command_buffer, len8+2);
++ mms_buffer_put_32 (&command_buffer, len8 + 2);
+ mms_buffer_put_32 (&command_buffer, 0x00030000 | command); /* dir | command */
+ /* end of the 40 byte command header */
+
+ mms_buffer_put_32 (&command_buffer, prefix1);
+ mms_buffer_put_32 (&command_buffer, prefix2);
+
+- n = _x_io_tcp_write (this->stream, this->s, this->scmd, length + CMD_HEADER_LEN + CMD_PREFIX_LEN);
+- if (n != (length + CMD_HEADER_LEN + CMD_PREFIX_LEN)) {
++ if (length & 7)
++ memset(this->scmd + length + CMD_HEADER_LEN + CMD_PREFIX_LEN, 0, 8 - (length & 7));
++
++ n = _x_io_tcp_write (this->stream, this->s, this->scmd, len8 * 8 + CMD_HEADER_LEN + CMD_PREFIX_LEN);
++ if (n != (len8 * 8 + CMD_HEADER_LEN + CMD_PREFIX_LEN)) {
+ return 0;
+ }
+
+@@ -540,9 +542,9 @@
+ case GUID_ASF_FILE_PROPERTIES:
+
+ this->asf_packet_len = LE_32(this->asf_header + i + 92 - 24);
+- this->file_len = LE_32(this->asf_header + i + 40 - 24);
+- lprintf ("file object, packet length = %d (%d)\n",
+- this->asf_packet_len, LE_32(this->asf_header + i + 96 - 24));
++ this->file_len = LE_64(this->asf_header + i + 40 - 24);
++ lprintf ("file object, file_length = %lld, packet length = %d",
++ this->file_len, this->asf_packet_len);
+ break;
+
+ case GUID_ASF_STREAM_PROPERTIES:
+@@ -560,6 +562,8 @@
+ break;
+
+ case GUID_ASF_VIDEO_MEDIA:
++ case GUID_ASF_JFIF_MEDIA:
++ case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
+ type = ASF_STREAM_TYPE_VIDEO;
+ this->has_video = 1;
+ break;
+@@ -927,13 +931,23 @@
+ /* command 0x5 */
+ {
+ mms_buffer_t command_buffer;
++ char *path;
++ int pathlen;
++
++ /* remove the first '/' */
++ path = this->uri;
++ pathlen = strlen(path);
++ if (pathlen > 1) {
++ path++;
++ pathlen--;
++ }
+
+ lprintf("send command 0x05\n");
+ mms_buffer_init(&command_buffer, this->scmd_body);
+ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
+ mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
+- string_utf16 (url_conv, this->scmd_body + command_buffer.pos, this->uri, strlen(this->uri));
+- if (!send_command (this, 5, 1, 0xffffffff, strlen(this->uri) * 2 + 12))
++ string_utf16 (url_conv, this->scmd_body + command_buffer.pos, path, pathlen);
++ if (!send_command (this, 5, 1, 0xffffffff, pathlen * 2 + 12))
+ goto fail;
+ }
+
+@@ -1170,10 +1184,7 @@
+ "libmms: invalid asf packet len: %d bytes\n", header.packet_len);
+ return 0;
+ }
+-
+- /* simulate a seek */
+- this->current_pos = (off_t)this->asf_header_len + (off_t)header.packet_seq * (off_t)this->asf_packet_len;
+-
++
+ len = _x_io_tcp_read (this->stream, this->s, this->buf, header.packet_len);
+ if (len != header.packet_len) {
+ xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
+--- ./src/input/mmsh.c 14 Dec 2004 23:13:09 -0000 1.33
++++ ./src/input/mmsh.c 15 Jan 2005 17:51:41 -0000 1.33.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: mmsh.c,v 1.33 2004/12/14 23:13:09 tmattern Exp $
++ * $Id: mmsh.c,v 1.33.2.1 2005/01/15 17:51:41 mroi Exp $
+ *
+ * MMS over HTTP protocol
+ * written by Thibaut Mattern
+@@ -183,7 +183,7 @@
+ int stream_ids[ASF_MAX_NUM_STREAMS];
+ int stream_types[ASF_MAX_NUM_STREAMS];
+ int packet_length;
+- uint32_t file_length;
++ int64_t file_length;
+ char guid[37];
+ uint32_t bitrates[ASF_MAX_NUM_STREAMS];
+ uint32_t bitrates_pos[ASF_MAX_NUM_STREAMS];
+@@ -452,7 +452,6 @@
+ if (len != this->chunk_length) {
+ return 0;
+ } else {
+- this->buf_size = this->packet_length;
+ return 1;
+ }
+ } else {
+@@ -492,9 +491,9 @@
+ case GUID_ASF_FILE_PROPERTIES:
+
+ this->packet_length = LE_32(this->asf_header + i + 92 - 24);
+- this->file_length = LE_32(this->asf_header + i + 40 - 24);
+- lprintf ("file object, packet length = %d (%d)\n",
+- this->packet_length, LE_32(this->asf_header + i + 96 - 24));
++ this->file_length = LE_64(this->asf_header + i + 40 - 24);
++ lprintf ("file object, file_length = %lld, packet length = %d",
++ this->file_length, this->packet_count);
+ break;
+
+ case GUID_ASF_STREAM_PROPERTIES:
+@@ -510,16 +509,18 @@
+ type = ASF_STREAM_TYPE_AUDIO;
+ this->has_audio = 1;
+ break;
+-
++
+ case GUID_ASF_VIDEO_MEDIA:
++ case GUID_ASF_JFIF_MEDIA:
++ case GUID_ASF_DEGRADABLE_JPEG_MEDIA:
+ type = ASF_STREAM_TYPE_VIDEO;
+ this->has_video = 1;
+ break;
+-
++
+ case GUID_ASF_COMMAND_MEDIA:
+ type = ASF_STREAM_TYPE_CONTROL;
+ break;
+-
++
+ default:
+ type = ASF_STREAM_TYPE_UNKNOWN;
+ }
+@@ -793,6 +794,7 @@
+ if (!get_header(this))
+ goto fail;
+ interp_header(this);
++ this->buf_size = this->packet_length;
+
+ for (i = 0; i < this->num_stream_ids; i++) {
+ if ((this->stream_ids[i] != audio_stream) &&
+@@ -928,12 +930,15 @@
+
+ case CHUNK_TYPE_RESET:
+ /* next chunk is an ASF header */
++
+ if (this->chunk_length != 0) {
+ /* that's strange, don't know what to do */
+ return 0;
+ }
+ if (!get_header(this))
+ return 0;
++ interp_header(this);
++ this->buf_size = this->packet_length;
+ return 2;
+
+ default:
+@@ -946,6 +951,12 @@
+
+ if (len == this->chunk_length) {
+ /* explicit padding with 0 */
++ if (this->chunk_length > this->packet_length) {
++ xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
++ "libmmsh: chunk_length(%d) > packet_length(%d)\n",
++ this->chunk_length, this->packet_length);
++ return 0;
++ }
+ memset(this->buf + this->chunk_length, 0,
+ this->packet_length - this->chunk_length);
+ this->buf_size = this->packet_length;
+--- ./src/input/vcd/vcdio.c 7 Sep 2004 19:29:49 -0000 1.3
++++ ./src/input/vcd/vcdio.c 15 Jan 2005 17:51:41 -0000 1.3.2.2
+@@ -1,7 +1,7 @@
+ /*
+- $Id: vcdio.c,v 1.3 2004/09/07 19:29:49 valtri Exp $
++ $Id: vcdio.c,v 1.3.2.2 2005/01/15 17:51:41 mroi Exp $
+
+- Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -57,25 +57,25 @@
+ #include "vcdplayer.h"
+ #include "vcdio.h"
+
+-#define LOG_ERR(this, s, args...) \
+- if (this != NULL && this->log_err != NULL) \
+- this->log_err("%s: "s, __func__ , ##args)
++#define LOG_ERR(p_vcdplayer, s, args...) \
++ if (p_vcdplayer != NULL && p_vcdplayer->log_err != NULL) \
++ p_vcdplayer->log_err("%s: "s, __func__ , ##args)
+
+ #define FREE_AND_NULL(ptr) if (NULL != ptr) free(ptr); ptr = NULL;
+
+ /*! Closes VCD device specified via "this", and also wipes memory of it
+ from it inside "this". */
+ int
+-vcdio_close(vcdplayer_input_t *this)
++vcdio_close(vcdplayer_t *p_vcdplayer)
+ {
+- this->opened = false;
++ p_vcdplayer->opened = false;
+
+- FREE_AND_NULL(this->current_vcd_device);
+- FREE_AND_NULL(this->track);
+- FREE_AND_NULL(this->segment);
+- FREE_AND_NULL(this->entry);
++ FREE_AND_NULL(p_vcdplayer->psz_source);
++ FREE_AND_NULL(p_vcdplayer->track);
++ FREE_AND_NULL(p_vcdplayer->segment);
++ FREE_AND_NULL(p_vcdplayer->entry);
+
+- return vcdinfo_close(this->vcd);
++ return vcdinfo_close(p_vcdplayer->vcd);
+ }
+
+
+@@ -86,37 +86,38 @@
+ to open new device.
+ */
+ bool
+-vcdio_open(vcdplayer_input_t *this, char *intended_vcd_device)
++vcdio_open(vcdplayer_t *p_vcdplayer, char *intended_vcd_device)
+ {
+- vcdinfo_obj_t *obj = this->vcd;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+ unsigned int i;
+
+ dbg_print(INPUT_DBG_CALL, "called with %s\n", intended_vcd_device);
+
+- if ( this->opened ) {
+- if ( strcmp(intended_vcd_device, this->current_vcd_device)==0 ) {
++ if ( p_vcdplayer->opened ) {
++ if ( strcmp(intended_vcd_device, p_vcdplayer->psz_source)==0 ) {
+ /* Already open and the same device, so do nothing */
+ return true;
+ } else {
+ /* Changing VCD device */
+- vcdio_close(this);
++ vcdio_close(p_vcdplayer);
+ }
+ }
+
+- if ( vcdinfo_open(&this->vcd, &intended_vcd_device, DRIVER_UNKNOWN, NULL) !=
+- VCDINFO_OPEN_VCD) {
++ if ( vcdinfo_open(&p_vcdplayer->vcd, &intended_vcd_device, DRIVER_UNKNOWN,
++ NULL) != VCDINFO_OPEN_VCD) {
+ return false;
+ }
+
+- obj = this->vcd;
++ p_vcdinfo = p_vcdplayer->vcd;
+
+- this->current_vcd_device=strdup(intended_vcd_device);
+- this->opened = true;
+- this->num_LIDs = vcdinfo_get_num_LIDs(obj);
++ p_vcdplayer->psz_source = strdup(intended_vcd_device);
++ p_vcdplayer->opened = true;
++ p_vcdplayer->i_lids = vcdinfo_get_num_LIDs(p_vcdinfo);
++ p_vcdplayer->i_still = 0;
+
+- if (vcdinfo_read_psd (obj)) {
++ if (vcdinfo_read_psd (p_vcdinfo)) {
+
+- vcdinfo_visit_lot (obj, false);
++ vcdinfo_visit_lot (p_vcdinfo, false);
+
+ #if FIXED
+ /*
+@@ -125,8 +126,8 @@
+ selection features in the extended PSD haven't been implemented,
+ it's best then to not try to read this at all.
+ */
+- if (vcdinfo_get_psd_x_size(obj))
+- vcdinfo_visit_lot (obj, true);
++ if (vcdinfo_get_psd_x_size(p_vcdinfo))
++ vcdinfo_visit_lot (p_vcdinfo, true);
+ #endif
+
+ }
+@@ -135,39 +136,45 @@
+ Save summary info on tracks, segments and entries...
+ */
+
+- if ( 0 < (this->num_tracks = vcdinfo_get_num_tracks(obj)) ) {
+- this->track = (vcdplayer_play_item_info *)
+- calloc(this->num_tracks, sizeof(vcdplayer_play_item_info));
++ if ( 0 < (p_vcdplayer->i_tracks = vcdinfo_get_num_tracks(p_vcdinfo)) ) {
++ p_vcdplayer->track = (vcdplayer_play_item_info_t *)
++ calloc(p_vcdplayer->i_tracks, sizeof(vcdplayer_play_item_info_t));
+
+- for (i=0; i<this->num_tracks; i++) {
+- unsigned int track_num=i+1;
+- this->track[i].size = vcdinfo_get_track_sect_count(obj, track_num);
+- this->track[i].start_LSN = vcdinfo_get_track_lsn(obj, track_num);
++ for (i=0; i<p_vcdplayer->i_tracks; i++) {
++ track_t i_track=i+1;
++ p_vcdplayer->track[i].size
++ = vcdinfo_get_track_sect_count(p_vcdinfo, i_track);
++ p_vcdplayer->track[i].start_LSN
++ = vcdinfo_get_track_lsn(p_vcdinfo, i_track);
+ }
+ } else
+- this->track = NULL;
++ p_vcdplayer->track = NULL;
+
+- if ( 0 < (this->num_entries = vcdinfo_get_num_entries(obj)) ) {
+- this->entry = (vcdplayer_play_item_info *)
+- calloc(this->num_entries, sizeof(vcdplayer_play_item_info));
+-
+- for (i=0; i<this->num_entries; i++) {
+- this->entry[i].size = vcdinfo_get_entry_sect_count(obj, i);
+- this->entry[i].start_LSN = vcdinfo_get_entry_lsn(obj, i);
++ if ( 0 < (p_vcdplayer->i_entries = vcdinfo_get_num_entries(p_vcdinfo)) ) {
++ p_vcdplayer->entry = (vcdplayer_play_item_info_t *)
++ calloc(p_vcdplayer->i_entries, sizeof(vcdplayer_play_item_info_t));
++
++ for (i=0; i<p_vcdplayer->i_entries; i++) {
++ p_vcdplayer->entry[i].size
++ = vcdinfo_get_entry_sect_count(p_vcdinfo, i);
++ p_vcdplayer->entry[i].start_LSN
++ = vcdinfo_get_entry_lsn(p_vcdinfo, i);
+ }
+ } else
+- this->entry = NULL;
++ p_vcdplayer->entry = NULL;
+
+- if ( 0 < (this->num_segments = vcdinfo_get_num_segments(obj)) ) {
+- this->segment = (vcdplayer_play_item_info *)
+- calloc(this->num_segments, sizeof(vcdplayer_play_item_info));
++ if ( 0 < (p_vcdplayer->i_segments = vcdinfo_get_num_segments(p_vcdinfo)) ) {
++ p_vcdplayer->segment = (vcdplayer_play_item_info_t *)
++ calloc(p_vcdplayer->i_segments, sizeof(vcdplayer_play_item_info_t));
+
+- for (i=0; i<this->num_segments; i++) {
+- this->segment[i].size = vcdinfo_get_seg_sector_count(obj, i);
+- this->segment[i].start_LSN = vcdinfo_get_seg_lsn(obj, i);
++ for (i=0; i<p_vcdplayer->i_segments; i++) {
++ p_vcdplayer->segment[i].size
++ = vcdinfo_get_seg_sector_count(p_vcdinfo, i);
++ p_vcdplayer->segment[i].start_LSN
++ = vcdinfo_get_seg_lsn(p_vcdinfo, i);
+ }
+ } else
+- this->segment = NULL;
++ p_vcdplayer->segment = NULL;
+
+ return true;
+ }
+@@ -178,26 +185,26 @@
+ if seeking failed, -1 is returned
+ */
+ off_t
+-vcdio_seek (vcdplayer_input_t *this, off_t offset, int origin)
++vcdio_seek (vcdplayer_t *p_vcdplayer, off_t offset, int origin)
+ {
+
+ switch (origin) {
+ case SEEK_SET:
+ {
+- lsn_t old_lsn = this->cur_lsn;
+- this->cur_lsn = this->origin_lsn + (offset / M2F2_SECTOR_SIZE);
++ lsn_t old_lsn = p_vcdplayer->i_lsn;
++ p_vcdplayer->i_lsn = p_vcdplayer->origin_lsn + (offset / M2F2_SECTOR_SIZE);
+
+ dbg_print(INPUT_DBG_SEEK_SET, "seek_set to %ld => %u (start is %u)\n",
+- (long int) offset, this->cur_lsn, this->origin_lsn);
++ (long int) offset, p_vcdplayer->i_lsn, p_vcdplayer->origin_lsn);
+
+ /* Seek was successful. Invalidate entry location by setting
+ entry number back to 1. Over time it will adjust upward
+ to the correct value. */
+- if ( !vcdplayer_pbc_is_on(this)
+- && this->play_item.type != VCDINFO_ITEM_TYPE_TRACK
+- && this->cur_lsn < old_lsn) {
++ if ( !vcdplayer_pbc_is_on(p_vcdplayer)
++ && p_vcdplayer->play_item.type != VCDINFO_ITEM_TYPE_TRACK
++ && p_vcdplayer->i_lsn < old_lsn) {
+ dbg_print(INPUT_DBG_SEEK_SET, "seek_set entry backwards\n");
+- this->next_entry = 1;
++ p_vcdplayer->next_entry = 1;
+ }
+ break;
+ }
+@@ -206,22 +213,22 @@
+ {
+ off_t diff;
+ if (offset) {
+- LOG_ERR(this, "%s: %d\n",
+- _("SEEK_CUR not implemented for nozero offset"),
++ LOG_ERR(p_vcdplayer, "%s: %d\n",
++ _("SEEK_CUR not implemented for non-zero offset"),
+ (int) offset);
+ return (off_t) -1;
+ }
+
+- if (this->slider_length == VCDPLAYER_SLIDER_LENGTH_TRACK) {
+- diff = this->cur_lsn - this->track_lsn;
++ if (p_vcdplayer->slider_length == VCDPLAYER_SLIDER_LENGTH_TRACK) {
++ diff = p_vcdplayer->i_lsn - p_vcdplayer->track_lsn;
+ dbg_print(INPUT_DBG_SEEK_CUR,
+ "current pos: %u, track diff %ld\n",
+- this->cur_lsn, (long int) diff);
++ p_vcdplayer->i_lsn, (long int) diff);
+ } else {
+- diff = this->cur_lsn - this->origin_lsn;
++ diff = p_vcdplayer->i_lsn - p_vcdplayer->origin_lsn;
+ dbg_print(INPUT_DBG_SEEK_CUR,
+ "current pos: %u, entry diff %ld\n",
+- this->cur_lsn, (long int) diff);
++ p_vcdplayer->i_lsn, (long int) diff);
+ }
+
+ if (diff < 0) {
+@@ -235,10 +242,10 @@
+ }
+
+ case SEEK_END:
+- LOG_ERR(this, "%s\n", _("SEEK_END not implemented yet."));
++ LOG_ERR(p_vcdplayer, "%s\n", _("SEEK_END not implemented yet."));
+ return (off_t) -1;
+ default:
+- LOG_ERR(this, "%s %d\n", _("seek not implemented yet for"),
++ LOG_ERR(p_vcdplayer, "%s %d\n", _("seek not implemented yet for"),
+ origin);
+ return (off_t) -1;
+ }
+--- ./src/input/vcd/vcdio.h 13 Oct 2003 11:47:11 -0000 1.1
++++ ./src/input/vcd/vcdio.h 15 Jan 2005 17:51:41 -0000 1.1.2.2
+@@ -1,7 +1,7 @@
+ /*
+- $Id: vcdio.h,v 1.1 2003/10/13 11:47:11 f1rmb Exp $
++ $Id: vcdio.h,v 1.1.2.2 2005/01/15 17:51:41 mroi Exp $
+
+- Copyright (C) 2002 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -28,7 +28,7 @@
+ read nlen bytes, return number of bytes read.
+ */
+ off_t
+-vcdio_read (vcdplayer_input_t *this, char *buf, const off_t nlen);
++vcdio_read (vcdplayer_t *p_vcdplayer, char *psz_buf, const off_t nlen);
+
+ /*! Opens VCD device and initializes things.
+
+@@ -37,13 +37,13 @@
+ to open new device.
+ */
+ bool
+-vcdio_open(vcdplayer_input_t *this, char *intended_vcd_device);
++vcdio_open(vcdplayer_t *p_vcdplayer, char *psz_device);
+
+ /*! Closes VCD device specified via "this", and also wipes memory of it
+ from it inside "this". */
+ /* FIXME Move player stuff to player. */
+ int
+-vcdio_close(vcdplayer_input_t *this);
++vcdio_close(vcdplayer_t *p_vcdplayer);
+
+ /*!
+ From xine plugin spec:
+@@ -53,7 +53,7 @@
+ if seeking failed, -1 is returned
+ */
+ off_t
+-vcdio_seek (vcdplayer_input_t *this, off_t offset, int origin);
++vcdio_seek (vcdplayer_t *p_vcdplayer, off_t offset, int origin);
+
+ #endif /* _VCDIO_H_ */
+
+--- ./src/input/vcd/vcdplayer.c 25 Jul 2004 17:42:22 -0000 1.6
++++ ./src/input/vcd/vcdplayer.c 15 Jan 2005 17:51:41 -0000 1.6.2.2
+@@ -1,7 +1,7 @@
+ /*
+- $Id: vcdplayer.c,v 1.6 2004/07/25 17:42:22 mroi Exp $
++ $Id: vcdplayer.c,v 1.6.2.2 2005/01/15 17:51:41 mroi Exp $
+
+- Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -46,37 +46,37 @@
+ #include "vcdplayer.h"
+ #include "vcdio.h"
+
+-#define LOG_ERR(this, s, args...) \
+- if (this != NULL && this->log_err != NULL) \
+- this->log_err("%s: "s, __func__ , ##args)
++#define LOG_ERR(p_vcdplayer, s, args...) \
++ if (p_vcdplayer != NULL && p_vcdplayer->log_err != NULL) \
++ p_vcdplayer->log_err("%s: "s, __func__ , ##args)
+
+ unsigned long int vcdplayer_debug = 0;
+
+-static void _vcdplayer_set_origin(vcdplayer_input_t *this);
++static void _vcdplayer_set_origin(vcdplayer_t *p_vcdplayer);
+
+ /*!
+ Return true if playback control (PBC) is on
+ */
+ bool
+-vcdplayer_pbc_is_on(const vcdplayer_input_t *this)
++vcdplayer_pbc_is_on(const vcdplayer_t *p_vcdplayer)
+ {
+- return VCDINFO_INVALID_ENTRY != this->cur_lid;
++ return VCDINFO_INVALID_ENTRY != p_vcdplayer->i_lid;
+ }
+
+ /* Given an itemid, return the size for the object (via information
+ previously stored when opening the vcd). */
+ static size_t
+-_vcdplayer_get_item_size(vcdplayer_input_t *this, vcdinfo_itemid_t itemid)
++_vcdplayer_get_item_size(vcdplayer_t *p_vcdplayer, vcdinfo_itemid_t itemid)
+ {
+ switch (itemid.type) {
+ case VCDINFO_ITEM_TYPE_ENTRY:
+- return this->entry[itemid.num].size;
++ return p_vcdplayer->entry[itemid.num].size;
+ break;
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+- return this->segment[itemid.num].size;
++ return p_vcdplayer->segment[itemid.num].size;
+ break;
+ case VCDINFO_ITEM_TYPE_TRACK:
+- return this->track[itemid.num-1].size;
++ return p_vcdplayer->track[itemid.num-1].size;
+ break;
+ case VCDINFO_ITEM_TYPE_LID:
+ /* Play list number (LID) */
+@@ -85,7 +85,7 @@
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+ case VCDINFO_ITEM_TYPE_SPAREID2:
+ default:
+- LOG_ERR(this, "%s %d\n", _("bad item type"), itemid.type);
++ LOG_ERR(p_vcdplayer, "%s %d\n", _("bad item type"), itemid.type);
+ return 0;
+ }
+ }
+@@ -139,7 +139,7 @@
+ %% : a %
+ */
+ char *
+-vcdplayer_format_str(vcdplayer_input_t *this, const char format_str[])
++vcdplayer_format_str(vcdplayer_t *p_vcdplayer, const char format_str[])
+ {
+ #define TEMP_STR_SIZE 256
+ #define TEMP_STR_LEN (TEMP_STR_SIZE-1)
+@@ -148,7 +148,7 @@
+ char * tp = temp_str;
+ bool saw_control_prefix = false;
+ size_t format_len = strlen(format_str);
+- vcdinfo_obj_t *obj = this->vcd;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+
+ memset(temp_str, 0, TEMP_STR_SIZE);
+
+@@ -168,25 +168,25 @@
+ saw_control_prefix = !saw_control_prefix;
+ break;
+ case 'A':
+- add_format_str_info(vcdinfo_strip_trail(vcdinfo_get_album_id(obj),
++ add_format_str_info(vcdinfo_strip_trail(vcdinfo_get_album_id(p_vcdinfo),
+ MAX_ALBUM_LEN));
+ break;
+
+ case 'c':
+- add_format_num_info(vcdinfo_get_volume_num(obj), "%d");
++ add_format_num_info(vcdinfo_get_volume_num(p_vcdinfo), "%d");
+ break;
+
+ case 'C':
+- add_format_num_info(vcdinfo_get_volume_count(obj), "%d");
++ add_format_num_info(vcdinfo_get_volume_count(p_vcdinfo), "%d");
+ break;
+
+ case 'F':
+- add_format_str_info(vcdinfo_get_format_version_str(obj));
++ add_format_str_info(vcdinfo_get_format_version_str(p_vcdinfo));
+ break;
+
+ case 'I':
+ {
+- switch (this->play_item.type) {
++ switch (p_vcdplayer->play_item.type) {
+ case VCDINFO_ITEM_TYPE_TRACK:
+ strncat(tp, "Track", TEMP_STR_LEN-(tp-temp_str));
+ tp += strlen("Track");
+@@ -216,9 +216,9 @@
+ break;
+
+ case 'L':
+- if (vcdplayer_pbc_is_on(this)) {
++ if (vcdplayer_pbc_is_on(p_vcdplayer)) {
+ char num_str[20];
+- snprintf(num_str, sizeof(num_str), " List ID %d", this->cur_lid);
++ snprintf(num_str, sizeof(num_str), " List ID %d", p_vcdplayer->i_lid);
+ strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str));
+ tp += strlen(num_str);
+ }
+@@ -226,23 +226,23 @@
+ break;
+
+ case 'N':
+- add_format_num_info(this->play_item.num, "%d");
++ add_format_num_info(p_vcdplayer->play_item.num, "%d");
+ break;
+
+ case 'p':
+- add_format_str_info(vcdinfo_get_preparer_id(obj));
++ add_format_str_info(vcdinfo_get_preparer_id(p_vcdinfo));
+ break;
+
+ case 'P':
+- add_format_str_info(vcdinfo_get_publisher_id(obj));
++ add_format_str_info(vcdinfo_get_publisher_id(p_vcdinfo));
+ break;
+
+ case 'S':
+- if ( VCDINFO_ITEM_TYPE_SEGMENT==this->play_item.type ) {
+- char seg_type_str[10];
++ if ( VCDINFO_ITEM_TYPE_SEGMENT==p_vcdplayer->play_item.type ) {
++ char seg_type_str[30];
+
+ snprintf(seg_type_str, sizeof(seg_type_str), " %s",
+- vcdinfo_video_type2str(obj, this->play_item.num));
++ vcdinfo_video_type2str(p_vcdinfo, p_vcdplayer->play_item.num));
+ strncat(tp, seg_type_str, TEMP_STR_LEN-(tp-temp_str));
+ tp += strlen(seg_type_str);
+ }
+@@ -250,15 +250,15 @@
+ break;
+
+ case 'T':
+- add_format_num_info(this->cur_track, "%d");
++ add_format_num_info(p_vcdplayer->i_track, "%d");
+ break;
+
+ case 'V':
+- add_format_str_info(vcdinfo_get_volumeset_id(obj));
++ add_format_str_info(vcdinfo_get_volumeset_id(p_vcdinfo));
+ break;
+
+ case 'v':
+- add_format_str_info(vcdinfo_get_volume_id(obj));
++ add_format_str_info(vcdinfo_get_volume_id(p_vcdinfo));
+ break;
+
+ default:
+@@ -271,123 +271,136 @@
+ }
+
+ static void
+-_vcdplayer_update_entry(vcdinfo_obj_t *obj, uint16_t ofs, uint16_t *entry,
+- const char *label)
++_vcdplayer_update_entry(vcdinfo_obj_t *p_vcdinfo, uint16_t ofs,
++ uint16_t *entry, const char *label)
+ {
+ if ( ofs == VCDINFO_INVALID_OFFSET ) {
+ *entry = VCDINFO_INVALID_ENTRY;
+ } else {
+- vcdinfo_offset_t *off = vcdinfo_get_offset_t(obj, ofs);
++ vcdinfo_offset_t *off = vcdinfo_get_offset_t(p_vcdinfo, ofs);
+ if (off != NULL) {
+ *entry = off->lid;
+- dbg_print(INPUT_DBG_PBC, "%s: %d\n", label, off->lid);
++ dbg_print(INPUT_DBG_PBC, "%s: LID %d\n", label, off->lid);
+ } else
+ *entry = VCDINFO_INVALID_ENTRY;
+ }
+ }
+
+ /*!
+- Update next/prev/return/default navigation buttons (via this->cur_lid).
+- Update size of play-item (via this->play_item).
++ Update next/prev/return/default navigation buttons
++ (via p_vcdplayer->i_lid). Update size of play-item
++ (via p_vcdplayer->play_item).
+ */
+ void
+-vcdplayer_update_nav(vcdplayer_input_t *this)
++vcdplayer_update_nav(vcdplayer_t *p_vcdplayer)
+ {
+- int play_item = this->play_item.num;
+- vcdinfo_obj_t *obj = this->vcd;
++ int play_item = p_vcdplayer->play_item.num;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+
+ int min_entry = 1;
+ int max_entry = 0;
+
+- if (vcdplayer_pbc_is_on(this)) {
++ if (vcdplayer_pbc_is_on(p_vcdplayer)) {
+
+- vcdinfo_lid_get_pxd(obj, &(this->pxd), this->cur_lid);
++ vcdinfo_lid_get_pxd(p_vcdinfo, &(p_vcdplayer->pxd), p_vcdplayer->i_lid);
+
+- switch (this->pxd.descriptor_type) {
++ switch (p_vcdplayer->pxd.descriptor_type) {
+ case PSD_TYPE_SELECTION_LIST:
+ case PSD_TYPE_EXT_SELECTION_LIST:
+- if (this->pxd.psd == NULL) return;
+- _vcdplayer_update_entry(obj, vcdinf_psd_get_prev_offset(this->pxd.psd),
+- &(this->prev_entry), "prev");
+-
+- _vcdplayer_update_entry(obj, vcdinf_psd_get_next_offset(this->pxd.psd),
+- &(this->next_entry), "next");
+-
+- _vcdplayer_update_entry(obj, vcdinf_psd_get_return_offset(this->pxd.psd),
+- &(this->return_entry), "return");
+-
+- _vcdplayer_update_entry(obj,
+- vcdinfo_get_default_offset(obj, this->cur_lid),
+- &(this->default_entry), "default");
++ if (p_vcdplayer->pxd.psd == NULL) return;
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_psd_get_prev_offset(p_vcdplayer->pxd.psd),
++ &(p_vcdplayer->prev_entry), "prev");
++
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_psd_get_next_offset(p_vcdplayer->pxd.psd),
++ &(p_vcdplayer->next_entry), "next");
++
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_psd_get_return_offset(p_vcdplayer->pxd.psd),
++ &(p_vcdplayer->return_entry), "return");
++
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinfo_get_default_offset(p_vcdinfo,
++ p_vcdplayer->i_lid),
++ &(p_vcdplayer->default_entry), "default");
+ break;
+ case PSD_TYPE_PLAY_LIST:
+- if (this->pxd.pld == NULL) return;
+- _vcdplayer_update_entry(obj, vcdinf_pld_get_prev_offset(this->pxd.pld),
+- &(this->prev_entry), "prev");
+-
+- _vcdplayer_update_entry(obj, vcdinf_pld_get_next_offset(this->pxd.pld),
+- &(this->next_entry), "next");
+-
+- _vcdplayer_update_entry(obj, vcdinf_pld_get_return_offset(this->pxd.pld),
+- &(this->return_entry), "return");
+- this->default_entry = VCDINFO_INVALID_ENTRY;
++ if (p_vcdplayer->pxd.pld == NULL) return;
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_pld_get_prev_offset(p_vcdplayer->pxd.pld),
++ &(p_vcdplayer->prev_entry), "prev");
++
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_pld_get_next_offset(p_vcdplayer->pxd.pld),
++ &(p_vcdplayer->next_entry), "next");
++
++ _vcdplayer_update_entry(p_vcdinfo,
++ vcdinf_pld_get_return_offset(p_vcdplayer->pxd.pld),
++ &(p_vcdplayer->return_entry), "return");
++ p_vcdplayer->default_entry = VCDINFO_INVALID_ENTRY;
+ break;
+ case PSD_TYPE_END_LIST:
+- this->origin_lsn = this->cur_lsn = this->end_lsn = VCDINFO_NULL_LSN;
++ p_vcdplayer->origin_lsn = p_vcdplayer->i_lsn = p_vcdplayer->end_lsn
++ = VCDINFO_NULL_LSN;
+ /* Fall through */
+ case PSD_TYPE_COMMAND_LIST:
+- this->next_entry = this->prev_entry = this->return_entry =
+- this->default_entry = VCDINFO_INVALID_ENTRY;
++ p_vcdplayer->next_entry = p_vcdplayer->prev_entry
++ = p_vcdplayer->return_entry = VCDINFO_INVALID_ENTRY;
++ p_vcdplayer->default_entry = VCDINFO_INVALID_ENTRY;
+ break;
+ }
+-
+- this->update_title();
++
++ if (p_vcdplayer->update_title)
++ p_vcdplayer->update_title();
+ return;
+ }
+
+ /* PBC is not on. Set up for simplified next, prev, and return. */
+
+- switch (this->play_item.type) {
++ switch (p_vcdplayer->play_item.type) {
+ case VCDINFO_ITEM_TYPE_ENTRY:
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+ case VCDINFO_ITEM_TYPE_TRACK:
+
+- switch (this->play_item.type) {
++ switch (p_vcdplayer->play_item.type) {
+ case VCDINFO_ITEM_TYPE_ENTRY:
+- max_entry = this->num_entries;
++ max_entry = p_vcdplayer->i_entries;
+ min_entry = 0; /* Can remove when Entries start at 1. */
+- this->cur_track = vcdinfo_get_track(obj, play_item);
+- this->track_lsn = vcdinfo_get_track_lsn(obj, this->cur_track);
++ p_vcdplayer->i_track = vcdinfo_get_track(p_vcdinfo, play_item);
++ p_vcdplayer->track_lsn = vcdinfo_get_track_lsn(p_vcdinfo,
++ p_vcdplayer->i_track);
+ break;
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+- max_entry = this->num_segments;
+- this->cur_track = VCDINFO_INVALID_TRACK;
++ max_entry = p_vcdplayer->i_segments;
++ p_vcdplayer->i_track = VCDINFO_INVALID_TRACK;
+
+ break;
+ case VCDINFO_ITEM_TYPE_TRACK:
+- max_entry = this->num_tracks;
+- this->cur_track = this->play_item.num;
+- this->track_lsn = vcdinfo_get_track_lsn(obj, this->cur_track);
++ max_entry = p_vcdplayer->i_tracks;
++ p_vcdplayer->i_track = p_vcdplayer->play_item.num;
++ p_vcdplayer->track_lsn = vcdinfo_get_track_lsn(p_vcdinfo,
++ p_vcdplayer->i_track);
+ break;
+ default: ; /* Handle exceptional cases below */
+ }
+
+- _vcdplayer_set_origin(this);
++ _vcdplayer_set_origin(p_vcdplayer);
+ /* Set next, prev, return and default to simple and hopefully
+ useful values.
+ */
+ if (play_item+1 >= max_entry)
+- this->next_entry = VCDINFO_INVALID_ENTRY;
++ p_vcdplayer->next_entry = VCDINFO_INVALID_ENTRY;
+ else
+- this->next_entry = play_item+1;
++ p_vcdplayer->next_entry = play_item+1;
+
+ if (play_item-1 >= min_entry)
+- this->prev_entry = play_item-1;
++ p_vcdplayer->prev_entry = play_item-1;
+ else
+- this->prev_entry = VCDINFO_INVALID_ENTRY;
++ p_vcdplayer->prev_entry = VCDINFO_INVALID_ENTRY;
+
+- this->default_entry = play_item;
+- this->return_entry = min_entry;
++ p_vcdplayer->default_entry = play_item;
++ p_vcdplayer->return_entry = min_entry;
+ break;
+
+ case VCDINFO_ITEM_TYPE_LID:
+@@ -397,32 +410,32 @@
+ }
+ default: ;
+ }
+- this->update_title();
++ p_vcdplayer->update_title();
+ }
+
+ /*!
+ Set reading to play an entire track.
+ */
+ static void
+-_vcdplayer_set_track(vcdplayer_input_t *this, unsigned int track_num)
++_vcdplayer_set_track(vcdplayer_t *p_vcdplayer, unsigned int i_track)
+ {
+- if (track_num < 1 || track_num > this->num_tracks)
++ if (i_track < 1 || i_track > p_vcdplayer->i_tracks)
+ return;
+ else {
+- vcdinfo_obj_t *obj = this->vcd;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+ vcdinfo_itemid_t itemid;
+
+- itemid.num = track_num;
+- itemid.type = VCDINFO_ITEM_TYPE_TRACK;
+- this->in_still = 0;
+- this->cur_lsn = vcdinfo_get_track_lsn(obj, track_num);
+- this->play_item = itemid;
+- this->cur_track = track_num;
+- this->track_lsn = this->cur_lsn;
++ itemid.num = i_track;
++ itemid.type = VCDINFO_ITEM_TYPE_TRACK;
++ p_vcdplayer->i_still = 0;
++ p_vcdplayer->i_lsn = vcdinfo_get_track_lsn(p_vcdinfo, i_track);
++ p_vcdplayer->play_item = itemid;
++ p_vcdplayer->i_track = i_track;
++ p_vcdplayer->track_lsn = p_vcdplayer->i_lsn;
+
+- _vcdplayer_set_origin(this);
++ _vcdplayer_set_origin(p_vcdplayer);
+
+- dbg_print(INPUT_DBG_LSN, "LSN: %u\n", this->cur_lsn);
++ dbg_print(INPUT_DBG_LSN, "LSN: %u\n", p_vcdplayer->i_lsn);
+ }
+ }
+
+@@ -430,31 +443,32 @@
+ Set reading to play an entry
+ */
+ static void
+-_vcdplayer_set_entry(vcdplayer_input_t *this, unsigned int num)
++_vcdplayer_set_entry(vcdplayer_t *p_vcdplayer, unsigned int num)
+ {
+- vcdinfo_obj_t *obj = this->vcd;
+- unsigned int num_entries = vcdinfo_get_num_entries(obj);
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
++ const unsigned int i_entries = vcdinfo_get_num_entries(p_vcdinfo);
+
+- if (num >= num_entries) {
+- LOG_ERR(this, "%s %d\n", _("bad entry number"), num);
++ if (num >= i_entries) {
++ LOG_ERR(p_vcdplayer, "%s %d\n", _("bad entry number"), num);
+ return;
+ } else {
+ vcdinfo_itemid_t itemid;
+
+- itemid.num = num;
+- itemid.type = VCDINFO_ITEM_TYPE_ENTRY;
+- this->in_still = 0;
+- this->cur_lsn = vcdinfo_get_entry_lsn(obj, num);
+- this->play_item = itemid;
+- this->cur_track = vcdinfo_get_track(obj, num);
+- this->track_lsn = vcdinfo_get_track_lsn(obj, this->cur_track);
+- this->track_end_lsn = this->track_lsn +
+- this->track[this->cur_track-1].size;
++ itemid.num = num;
++ itemid.type = VCDINFO_ITEM_TYPE_ENTRY;
++ p_vcdplayer->i_still = 0;
++ p_vcdplayer->i_lsn = vcdinfo_get_entry_lsn(p_vcdinfo, num);
++ p_vcdplayer->play_item = itemid;
++ p_vcdplayer->i_track = vcdinfo_get_track(p_vcdinfo, num);
++ p_vcdplayer->track_lsn = vcdinfo_get_track_lsn(p_vcdinfo,
++ p_vcdplayer->i_track);
++ p_vcdplayer->track_end_lsn = p_vcdplayer->track_lsn +
++ p_vcdplayer->track[p_vcdplayer->i_track-1].size;
+
+- _vcdplayer_set_origin(this);
++ _vcdplayer_set_origin(p_vcdplayer);
+
+ dbg_print(INPUT_DBG_LSN, "LSN: %u, track_end LSN: %u\n",
+- this->cur_lsn, this->track_end_lsn);
++ p_vcdplayer->i_lsn, p_vcdplayer->track_end_lsn);
+ }
+ }
+
+@@ -462,61 +476,61 @@
+ Set reading to play an segment (e.g. still frame)
+ */
+ static void
+-_vcdplayer_set_segment(vcdplayer_input_t *this, unsigned int num)
++_vcdplayer_set_segment(vcdplayer_t *p_vcdplayer, unsigned int num)
+ {
+- vcdinfo_obj_t *obj = this->vcd;
+- segnum_t num_segs = vcdinfo_get_num_segments(obj);
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
++ segnum_t i_segs = vcdinfo_get_num_segments(p_vcdinfo);
+
+- if (num >= num_segs) {
+- LOG_ERR(this, "%s %d\n", _("bad segment number"), num);
++ if (num >= i_segs) {
++ LOG_ERR(p_vcdplayer, "%s %d\n", _("bad segment number"), num);
+ return;
+ } else {
+ vcdinfo_itemid_t itemid;
+
+- this->cur_lsn = vcdinfo_get_seg_lsn(obj, num);
+- this->cur_track = 0;
++ p_vcdplayer->i_lsn = vcdinfo_get_seg_lsn(p_vcdinfo, num);
++ p_vcdplayer->i_track = 0;
+
+- if (VCDINFO_NULL_LSN==this->cur_lsn) {
+- LOG_ERR(this, "%s %d\n",
++ if (VCDINFO_NULL_LSN==p_vcdplayer->i_lsn) {
++ LOG_ERR(p_vcdplayer, "%s %d\n",
+ _("Error in getting current segment number"), num);
+ return;
+ }
+
+ itemid.num = num;
+ itemid.type = VCDINFO_ITEM_TYPE_SEGMENT;
+- this->play_item = itemid;
++ p_vcdplayer->play_item = itemid;
+
+- _vcdplayer_set_origin(this);
++ _vcdplayer_set_origin(p_vcdplayer);
+
+- dbg_print(INPUT_DBG_LSN, "LSN: %u\n", this->cur_lsn);
++ dbg_print(INPUT_DBG_LSN, "LSN: %u\n", p_vcdplayer->i_lsn);
+ }
+ }
+
+ /* Play entry. */
+ /* Play a single item. */
+ static void
+-vcdplayer_play_single_item(vcdplayer_input_t *this, vcdinfo_itemid_t itemid)
++vcdplayer_play_single_item(vcdplayer_t *p_vcdplayer, vcdinfo_itemid_t itemid)
+ {
+- vcdinfo_obj_t *obj = this->vcd;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+
+ dbg_print(INPUT_DBG_CALL, "called itemid.num: %d, itemid.type: %d\n",
+ itemid.num, itemid.type);
+
+- this->in_still = 0;
++ p_vcdplayer->i_still = 0;
+
+ switch (itemid.type) {
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+ {
+ vcdinfo_video_segment_type_t segtype
+- = vcdinfo_get_video_type(obj, itemid.num);
+- segnum_t num_segs = vcdinfo_get_num_segments(obj);
++ = vcdinfo_get_video_type(p_vcdinfo, itemid.num);
++ segnum_t i_segs = vcdinfo_get_num_segments(p_vcdinfo);
+
+ dbg_print(INPUT_DBG_PBC, "%s (%d), itemid.num: %d\n",
+- vcdinfo_video_type2str(obj, itemid.num),
++ vcdinfo_video_type2str(p_vcdinfo, itemid.num),
+ (int) segtype, itemid.num);
+
+- if (itemid.num >= num_segs) return;
+- _vcdplayer_set_segment(this, itemid.num);
++ if (itemid.num >= i_segs) return;
++ _vcdplayer_set_segment(p_vcdplayer, itemid.num);
+
+ switch (segtype)
+ {
+@@ -524,10 +538,13 @@
+ case VCDINFO_FILES_VIDEO_NTSC_STILL2:
+ case VCDINFO_FILES_VIDEO_PAL_STILL:
+ case VCDINFO_FILES_VIDEO_PAL_STILL2:
+- this->in_still = -5;
++ /* Note that we are reading a still frame but haven't
++ got to the end.
++ */
++ p_vcdplayer->i_still = STILL_READING;
+ break;
+ default:
+- this->in_still = 0;
++ p_vcdplayer->i_still = 0;
+ }
+
+ break;
+@@ -535,41 +552,41 @@
+
+ case VCDINFO_ITEM_TYPE_TRACK:
+ dbg_print(INPUT_DBG_PBC, "track %d\n", itemid.num);
+- if (itemid.num < 1 || itemid.num > this->num_tracks) return;
+- _vcdplayer_set_track(this, itemid.num);
++ if (itemid.num < 1 || itemid.num > p_vcdplayer->i_tracks) return;
++ _vcdplayer_set_track(p_vcdplayer, itemid.num);
+ break;
+
+ case VCDINFO_ITEM_TYPE_ENTRY:
+ {
+- unsigned int num_entries = vcdinfo_get_num_entries(obj);
++ unsigned int i_entries = vcdinfo_get_num_entries(p_vcdinfo);
+ dbg_print(INPUT_DBG_PBC, "entry %d\n", itemid.num);
+- if (itemid.num >= num_entries) return;
+- _vcdplayer_set_entry(this, itemid.num);
++ if (itemid.num >= i_entries) return;
++ _vcdplayer_set_entry(p_vcdplayer, itemid.num);
+ break;
+ }
+
+ case VCDINFO_ITEM_TYPE_LID:
+- LOG_ERR(this, "%s\n", _("Should have converted this above"));
++ LOG_ERR(p_vcdplayer, "%s\n", _("Should have converted this above"));
+ break;
+
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+ dbg_print(INPUT_DBG_PBC, "play nothing\n");
+- this->cur_lsn = this->end_lsn;
++ p_vcdplayer->i_lsn = p_vcdplayer->end_lsn;
+ return;
+
+ default:
+- LOG_ERR(this, "item type %d not implemented.\n", itemid.type);
++ LOG_ERR(p_vcdplayer, "item type %d not implemented.\n", itemid.type);
+ return;
+ }
+
+- this->play_item = itemid;
++ p_vcdplayer->play_item = itemid;
+
+- vcdplayer_update_nav(this);
++ vcdplayer_update_nav(p_vcdplayer);
+
+ /* Some players like xine, have a fifo queue of audio and video buffers
+ that need to be flushed when playing a new selection. */
+- /* if (this->flush_buffers)
+- this->flush_buffers(); */
++ /* if (p_vcdplayer->flush_buffers)
++ p_vcdplayer->flush_buffers(); */
+
+ }
+
+@@ -580,77 +597,77 @@
+ "next" field of a LID which moves us to a different LID.
+ */
+ static bool
+-_vcdplayer_inc_play_item(vcdplayer_input_t *this)
++_vcdplayer_inc_play_item(vcdplayer_t *p_vcdplayer)
+ {
+ int noi;
+
+- dbg_print(INPUT_DBG_CALL, "called pli: %d\n", this->pdi);
++ dbg_print(INPUT_DBG_CALL, "called pli: %d\n", p_vcdplayer->pdi);
+
+- if ( NULL == this || NULL == this->pxd.pld ) return false;
++ if ( NULL == p_vcdplayer || NULL == p_vcdplayer->pxd.pld ) return false;
+
+- noi = vcdinf_pld_get_noi(this->pxd.pld);
++ noi = vcdinf_pld_get_noi(p_vcdplayer->pxd.pld);
+
+ if ( noi <= 0 ) return false;
+
+ /* Handle delays like autowait or wait here? */
+
+- this->pdi++;
++ p_vcdplayer->pdi++;
+
+- if ( this->pdi < 0 || this->pdi >= noi ) return false;
++ if ( p_vcdplayer->pdi < 0 || p_vcdplayer->pdi >= noi ) return false;
+
+ else {
+- uint16_t trans_itemid_num=vcdinf_pld_get_play_item(this->pxd.pld,
+- this->pdi);
++ uint16_t trans_itemid_num=vcdinf_pld_get_play_item(p_vcdplayer->pxd.pld,
++ p_vcdplayer->pdi);
+ vcdinfo_itemid_t trans_itemid;
+
+ if (VCDINFO_INVALID_ITEMID == trans_itemid_num) return false;
+
+ vcdinfo_classify_itemid(trans_itemid_num, &trans_itemid);
+ dbg_print(INPUT_DBG_PBC, " play-item[%d]: %s\n",
+- this->pdi, vcdinfo_pin2str (trans_itemid_num));
+- vcdplayer_play_single_item(this, trans_itemid);
++ p_vcdplayer->pdi, vcdinfo_pin2str (trans_itemid_num));
++ vcdplayer_play_single_item(p_vcdplayer, trans_itemid);
+ return true;
+ }
+ }
+
+ void
+-vcdplayer_play(vcdplayer_input_t *this, vcdinfo_itemid_t itemid)
++vcdplayer_play(vcdplayer_t *p_vcdplayer, vcdinfo_itemid_t itemid)
+ {
+ dbg_print(INPUT_DBG_CALL, "called itemid.num: %d itemid.type: %d\n",
+ itemid.num, itemid.type);
+
+- if (!vcdplayer_pbc_is_on(this)) {
+- vcdplayer_play_single_item(this, itemid);
++ if (!vcdplayer_pbc_is_on(p_vcdplayer)) {
++ vcdplayer_play_single_item(p_vcdplayer, itemid);
+ } else {
+ /* PBC on - Itemid.num is LID. */
+
+- vcdinfo_obj_t *obj = this->vcd;
++ vcdinfo_obj_t *p_vcdinfo = p_vcdplayer->vcd;
+
+- if (obj == NULL) return;
++ if (p_vcdinfo == NULL) return;
+
+- this->cur_lid = itemid.num;
+- vcdinfo_lid_get_pxd(obj, &(this->pxd), itemid.num);
++ p_vcdplayer->i_lid = itemid.num;
++ vcdinfo_lid_get_pxd(p_vcdinfo, &(p_vcdplayer->pxd), itemid.num);
+
+- switch (this->pxd.descriptor_type) {
++ switch (p_vcdplayer->pxd.descriptor_type) {
+
+ case PSD_TYPE_SELECTION_LIST:
+ case PSD_TYPE_EXT_SELECTION_LIST: {
+ vcdinfo_itemid_t trans_itemid;
+ uint16_t trans_itemid_num;
+
+- if (this->pxd.psd == NULL) return;
+- trans_itemid_num = vcdinf_psd_get_itemid(this->pxd.psd);
++ if (p_vcdplayer->pxd.psd == NULL) return;
++ trans_itemid_num = vcdinf_psd_get_itemid(p_vcdplayer->pxd.psd);
+ vcdinfo_classify_itemid(trans_itemid_num, &trans_itemid);
+- this->loop_count = 1;
+- this->loop_item = trans_itemid;
+- vcdplayer_play_single_item(this, trans_itemid);
++ p_vcdplayer->i_loop = 1;
++ p_vcdplayer->loop_item = trans_itemid;
++ vcdplayer_play_single_item(p_vcdplayer, trans_itemid);
+ break;
+ }
+
+ case PSD_TYPE_PLAY_LIST: {
+- if (this->pxd.pld == NULL) return;
+- this->pdi = -1;
+- _vcdplayer_inc_play_item(this);
++ if (p_vcdplayer->pxd.pld == NULL) return;
++ p_vcdplayer->pdi = -1;
++ _vcdplayer_inc_play_item(p_vcdplayer);
+ break;
+ }
+
+@@ -665,117 +682,96 @@
+
+ /*
+ Set's start origin and size for subsequent seeks.
+- input: this->cur_lsn, this->play_item
+- changed: this->origin_lsn, this->end_lsn
++ input: p_vcdplayer->i_lsn, p_vcdplayer->play_item
++ changed: p_vcdplayer->origin_lsn, p_vcdplayer->end_lsn
+ */
+ static void
+-_vcdplayer_set_origin(vcdplayer_input_t *this)
++_vcdplayer_set_origin(vcdplayer_t *p_vcdplayer)
+ {
+- size_t size = _vcdplayer_get_item_size(this, this->play_item);
++ size_t size = _vcdplayer_get_item_size(p_vcdplayer, p_vcdplayer->play_item);
+
+- this->end_lsn = this->cur_lsn + size;
+- this->origin_lsn = this->cur_lsn;
++ p_vcdplayer->end_lsn = p_vcdplayer->i_lsn + size;
++ p_vcdplayer->origin_lsn = p_vcdplayer->i_lsn;
+
+- dbg_print((INPUT_DBG_CALL|INPUT_DBG_LSN), "end LSN: %u\n", this->end_lsn);
++ dbg_print((INPUT_DBG_CALL|INPUT_DBG_LSN), "end LSN: %u\n",
++ p_vcdplayer->end_lsn);
+ }
+
+-#define RETURN_NULL_BLOCK \
+- memset (buf, 0, M2F2_SECTOR_SIZE); \
+- buf[0] = 0; buf[1] = 0; buf[2] = 0x01; \
+- return READ_BLOCK
+-
+-#define RETURN_NULL_STILL \
+- memset (buf, 0, M2F2_SECTOR_SIZE); \
+- buf[0] = 0; buf[1] = 0; buf[2] = 0x01; \
++#define RETURN_NULL_STILL \
++ p_vcdplayer->i_still = 127; \
++ memset (p_buf, 0, M2F2_SECTOR_SIZE); \
++ p_buf[0] = 0; p_buf[1] = 0; p_buf[2] = 0x01; \
+ return READ_STILL_FRAME
+
+-#define SLEEP_1_SEC_AND_HANDLE_EVENTS \
+- if (this->handle_events()) goto skip_next_play; \
+- this->sleep(250000); \
+- if (this->handle_events()) goto skip_next_play; \
+- this->sleep(250000); \
+- if (this->handle_events()) goto skip_next_play; \
+- this->sleep(250000); \
+- if (this->handle_events()) goto skip_next_play; \
+- this->sleep(250000);
+-/* if (this->in_still) this->force_redisplay(); */
+-
+-
+ /* Handles PBC navigation when reaching the end of a play item. */
+ static vcdplayer_read_status_t
+-vcdplayer_pbc_nav (vcdplayer_input_t *this, uint8_t *buf)
++vcdplayer_pbc_nav (vcdplayer_t *p_vcdplayer, uint8_t *p_buf)
+ {
+ /* We are in playback control. */
+ vcdinfo_itemid_t itemid;
+
+- if (0 != this->in_still && this->in_still != -5) {
+- SLEEP_1_SEC_AND_HANDLE_EVENTS;
+- if (this->in_still > 0) this->in_still--;
+- return READ_STILL_FRAME;
+- }
+-
+ /* The end of an entry is really the end of the associated
+ sequence (or track). */
+
+- if ( (VCDINFO_ITEM_TYPE_ENTRY == this->play_item.type) &&
+- (this->cur_lsn < this->track_end_lsn) ) {
++ if ( (VCDINFO_ITEM_TYPE_ENTRY == p_vcdplayer->play_item.type) &&
++ (p_vcdplayer->i_lsn < p_vcdplayer->track_end_lsn) ) {
+ /* Set up to just continue to the next entry */
+- this->play_item.num++;
++ p_vcdplayer->play_item.num++;
+ dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
+- "continuing into next entry: %u\n", this->play_item.num);
+- vcdplayer_play_single_item(this, this->play_item);
+- this->update_title();
+- goto skip_next_play;
++ "continuing into next entry: %u\n", p_vcdplayer->play_item.num);
++ vcdplayer_play_single_item(p_vcdplayer, p_vcdplayer->play_item);
++ p_vcdplayer->update_title();
++ return READ_BLOCK;
+ }
+
+- switch (this->pxd.descriptor_type) {
++ switch (p_vcdplayer->pxd.descriptor_type) {
+ case PSD_TYPE_END_LIST:
+ return READ_END;
+ break;
+ case PSD_TYPE_PLAY_LIST: {
+- int wait_time = vcdinf_get_wait_time(this->pxd.pld);
++ int wait_time = vcdinf_get_wait_time(p_vcdplayer->pxd.pld);
+
+ dbg_print(INPUT_DBG_PBC, "playlist wait_time: %d\n", wait_time);
+
+- if (_vcdplayer_inc_play_item(this))
+- goto skip_next_play;
++ if (_vcdplayer_inc_play_item(p_vcdplayer))
++ return READ_BLOCK;
+
+- /* Handle any wait time given. */
+- if (-5 == this->in_still) {
+- if (wait_time != 0) {
+- this->in_still = wait_time - 1;
+- SLEEP_1_SEC_AND_HANDLE_EVENTS ;
+- return READ_STILL_FRAME;
+- }
++ /* This needs to be improved in libvcdinfo when I get around to it.
++ */
++ if (-1 == wait_time) wait_time = STILL_INDEFINITE_WAIT;
++
++ /* Set caller to handle wait time given. */
++ if (STILL_READING == p_vcdplayer->i_still && wait_time > 0) {
++ p_vcdplayer->i_still = wait_time;
++ return READ_STILL_FRAME;
+ }
+ break;
+ }
+ case PSD_TYPE_SELECTION_LIST: /* Selection List (+Ext. for SVCD) */
+ case PSD_TYPE_EXT_SELECTION_LIST: /* Extended Selection List (VCD2.0) */
+ {
+- int wait_time = vcdinf_get_timeout_time(this->pxd.psd);
+- uint16_t timeout_offs = vcdinf_get_timeout_offset(this->pxd.psd);
+- uint16_t max_loop = vcdinf_get_loop_count(this->pxd.psd);
++ int wait_time = vcdinf_get_timeout_time(p_vcdplayer->pxd.psd);
++ uint16_t timeout_offs = vcdinf_get_timeout_offset(p_vcdplayer->pxd.psd);
++ uint16_t max_loop = vcdinf_get_loop_count(p_vcdplayer->pxd.psd);
+ vcdinfo_offset_t *offset_timeout_LID =
+- vcdinfo_get_offset_t(this->vcd, timeout_offs);
++ vcdinfo_get_offset_t(p_vcdplayer->vcd, timeout_offs);
+
+ dbg_print(INPUT_DBG_PBC, "wait_time: %d, looped: %d, max_loop %d\n",
+- wait_time, this->loop_count, max_loop);
++ wait_time, p_vcdplayer->i_loop, max_loop);
+
+- /* Handle any wait time given */
+- if (-5 == this->in_still) {
+- this->in_still = wait_time - 1;
+- SLEEP_1_SEC_AND_HANDLE_EVENTS ;
++ /* Set caller to handle wait time given. */
++ if (STILL_READING == p_vcdplayer->i_still && wait_time > 0) {
++ p_vcdplayer->i_still = wait_time;
+ return READ_STILL_FRAME;
+ }
+
+ /* Handle any looping given. */
+- if ( max_loop == 0 || this->loop_count < max_loop ) {
+- this->loop_count++;
+- if (this->loop_count == 0x7f) this->loop_count = 0;
+- vcdplayer_play_single_item(this, this->loop_item);
+- if (this->in_still) this->force_redisplay();
+- goto skip_next_play;
++ if ( max_loop == 0 || p_vcdplayer->i_loop < max_loop ) {
++ p_vcdplayer->i_loop++;
++ if (p_vcdplayer->i_loop == 0x7f) p_vcdplayer->i_loop = 0;
++ vcdplayer_play_single_item(p_vcdplayer, p_vcdplayer->loop_item);
++ if (p_vcdplayer->i_still) p_vcdplayer->force_redisplay();
++ return READ_BLOCK;
+ }
+
+ /* Looping finished and wait finished. Move to timeout
+@@ -786,33 +782,26 @@
+ itemid.num = offset_timeout_LID->lid;
+ itemid.type = VCDINFO_ITEM_TYPE_LID;
+ dbg_print(INPUT_DBG_PBC, "timeout to: %d\n", itemid.num);
+- vcdplayer_play(this, itemid);
+- goto skip_next_play;
++ vcdplayer_play(p_vcdplayer, itemid);
++ return READ_BLOCK;
+ } else {
+- int num_selections = vcdinf_get_num_selections(this->pxd.psd);
+- if (num_selections > 0) {
++ int i_selections = vcdinf_get_num_selections(p_vcdplayer->pxd.psd);
++ if (i_selections > 0) {
+ /* Pick a random selection. */
+- unsigned int bsn=vcdinf_get_bsn(this->pxd.psd);
++ unsigned int bsn=vcdinf_get_bsn(p_vcdplayer->pxd.psd);
+ int rand_selection=bsn +
+- (int) ((num_selections+0.0)*rand()/(RAND_MAX+1.0));
+-
+-#if defined(LIBVCD_VERSION)
+- /* version 0.7.21 or greater */
+- lid_t rand_lid=vcdinfo_selection_get_lid(this->vcd, this->cur_lid,
++ (int) ((i_selections+0.0)*rand()/(RAND_MAX+1.0));
++ lid_t rand_lid=vcdinfo_selection_get_lid(p_vcdplayer->vcd,
++ p_vcdplayer->i_lid,
+ rand_selection);
+-#else
+- lid_t rand_lid=vcdplayer_selection2lid (this, rand_selection);
+-#endif /* LIBVCD_VERSION */
+-
+ itemid.num = rand_lid;
+ itemid.type = VCDINFO_ITEM_TYPE_LID;
+ dbg_print(INPUT_DBG_PBC, "random selection %d, lid: %d\n",
+ rand_selection - bsn, rand_lid);
+- vcdplayer_play(this, itemid);
+- goto skip_next_play;
+- } else if (this->in_still) {
++ vcdplayer_play(p_vcdplayer, itemid);
++ return READ_BLOCK;
++ } else if (p_vcdplayer->i_still > 0) {
+ /* Hack: Just go back and do still again */
+- SLEEP_1_SEC_AND_HANDLE_EVENTS ;
+ RETURN_NULL_STILL ;
+ }
+ }
+@@ -820,23 +809,22 @@
+ break;
+ }
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+- LOG_ERR(this, "NOTFOUND in PBC -- not supposed to happen\n");
++ LOG_ERR(p_vcdplayer, "NOTFOUND in PBC -- not supposed to happen\n");
+ break;
+ case VCDINFO_ITEM_TYPE_SPAREID2:
+- LOG_ERR(this, "SPAREID2 in PBC -- not supposed to happen\n");
++ LOG_ERR(p_vcdplayer, "SPAREID2 in PBC -- not supposed to happen\n");
+ break;
+ case VCDINFO_ITEM_TYPE_LID:
+- LOG_ERR(this, "LID in PBC -- not supposed to happen\n");
++ LOG_ERR(p_vcdplayer, "LID in PBC -- not supposed to happen\n");
+ break;
+
+ default:
+ ;
+ }
+ /* FIXME: Should handle autowait ... */
+- itemid.num = this->next_entry;
++ itemid.num = p_vcdplayer->next_entry;
+ itemid.type = VCDINFO_ITEM_TYPE_LID;
+- vcdplayer_play(this, itemid);
+- skip_next_play: ;
++ vcdplayer_play(p_vcdplayer, itemid);
+ return READ_BLOCK;
+ }
+
+@@ -845,56 +833,35 @@
+ is to do something that's probably right or helpful.
+ */
+ static vcdplayer_read_status_t
+-vcdplayer_non_pbc_nav (vcdplayer_input_t *this, uint8_t *buf)
++vcdplayer_non_pbc_nav (vcdplayer_t *p_vcdplayer, uint8_t *p_buf)
+ {
+ /* Not in playback control. Do we advance automatically or stop? */
+- switch (this->play_item.type) {
++ switch (p_vcdplayer->play_item.type) {
+ case VCDINFO_ITEM_TYPE_TRACK:
+ case VCDINFO_ITEM_TYPE_ENTRY:
+- if (this->autoadvance && this->next_entry != VCDINFO_INVALID_ENTRY) {
+- this->play_item.num=this->next_entry;
+- vcdplayer_update_nav(this);
++ if (p_vcdplayer->autoadvance
++ && p_vcdplayer->next_entry != VCDINFO_INVALID_ENTRY) {
++ p_vcdplayer->play_item.num=p_vcdplayer->next_entry;
++ vcdplayer_update_nav(p_vcdplayer);
+ } else
+ return READ_END;
+ break;
+ case VCDINFO_ITEM_TYPE_SPAREID2:
+- /* printf("SPAREID2\n"); */
+- if (this->in_still) {
+- RETURN_NULL_STILL ;
+- /* Hack: Just go back and do still again */
+- /*this->force_redisplay();
+- this->cur_lsn = this->origin_lsn;*/
+- }
+- return READ_END;
++ RETURN_NULL_STILL ;
+
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+- LOG_ERR(this, "NOTFOUND outside PBC -- not supposed to happen\n");
+- if (this->in_still) {
+- RETURN_NULL_STILL ;
+- /* Hack: Just go back and do still again */
+- /*this->force_redisplay();
+- this->cur_lsn = this->origin_lsn;*/
+- } else
+- return READ_END;
++ LOG_ERR(p_vcdplayer, "NOTFOUND outside PBC -- not supposed to happen\n");
++ return READ_END;
+ break;
+
+ case VCDINFO_ITEM_TYPE_LID:
+- LOG_ERR(this, "LID outside PBC -- not supposed to happen\n");
+- if (this->in_still) {
+- RETURN_NULL_STILL ;
+- /* Hack: Just go back and do still again */
+- /* this->force_redisplay();
+- this->cur_lsn = this->origin_lsn; */
+- } else
+- return READ_END;
++ LOG_ERR(p_vcdplayer, "LID outside PBC -- not supposed to happen\n");
++ return READ_END;
+ break;
+
+ case VCDINFO_ITEM_TYPE_SEGMENT:
+- if (this->in_still) {
+- /* Hack: Just go back and do still again */
+- RETURN_NULL_STILL ;
+- }
+- return READ_END;
++ /* Hack: Just go back and do still again */
++ RETURN_NULL_STILL ;
+ }
+ return READ_BLOCK;
+ }
+@@ -908,23 +875,27 @@
+ interpret the next item in the playback-control list.
+ */
+ vcdplayer_read_status_t
+-vcdplayer_read (vcdplayer_input_t *this, uint8_t *buf, const off_t nlen)
++vcdplayer_read (vcdplayer_t *p_vcdplayer, uint8_t *p_buf,
++ const off_t nlen)
+ {
+
+- this->handle_events ();
+-
+- if ( this->cur_lsn >= this->end_lsn ) {
++ if ( p_vcdplayer->i_lsn >= p_vcdplayer->end_lsn ) {
+ vcdplayer_read_status_t read_status;
+-
++
+ /* We've run off of the end of this entry. Do we continue or stop? */
+ dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
+- "end reached, cur: %u, end: %u\n", this->cur_lsn, this->end_lsn);
++ "end reached, cur: %u, end: %u\n",
++ p_vcdplayer->i_lsn, p_vcdplayer->end_lsn);
+
+ handle_item_continuation:
+- read_status = vcdplayer_pbc_is_on(this)
+- ? vcdplayer_pbc_nav(this, buf)
+- : vcdplayer_non_pbc_nav(this, buf);
++ read_status = vcdplayer_pbc_is_on(p_vcdplayer)
++ ? vcdplayer_pbc_nav(p_vcdplayer, p_buf)
++ : vcdplayer_non_pbc_nav(p_vcdplayer, p_buf);
+
++ if (READ_STILL_FRAME == read_status) {
++ *p_buf = p_vcdplayer->i_still;
++ return READ_STILL_FRAME;
++ }
+ if (READ_BLOCK != read_status) return read_status;
+ }
+
+@@ -938,27 +909,28 @@
+ */
+
+ {
+- CdIo *img = vcdinfo_get_cd_image(this->vcd);
++ CdIo *p_img = vcdinfo_get_cd_image(p_vcdplayer->vcd);
+ typedef struct {
+- uint8_t subheader [8];
++ uint8_t subheader [CDIO_CD_SUBHEADER_SIZE];
+ uint8_t data [M2F2_SECTOR_SIZE];
+ uint8_t spare [4];
+ } vcdsector_t;
+ vcdsector_t vcd_sector;
+
+ do {
+- dbg_print(INPUT_DBG_LSN, "LSN: %u\n", this->cur_lsn);
+- if (cdio_read_mode2_sector(img, &vcd_sector, this->cur_lsn, true)!=0) {
++ if (cdio_read_mode2_sector(p_img, &vcd_sector,
++ p_vcdplayer->i_lsn, true)!=0) {
+ dbg_print(INPUT_DBG_LSN, "read error\n");
++ p_vcdplayer->i_lsn++;
+ return READ_ERROR;
+ }
+- this->cur_lsn++;
++ p_vcdplayer->i_lsn++;
+
+- if ( this->cur_lsn >= this->end_lsn ) {
++ if ( p_vcdplayer->i_lsn >= p_vcdplayer->end_lsn ) {
+ /* We've run off of the end of this entry. Do we continue or stop? */
+ dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC),
+ "end reached in reading, cur: %u, end: %u\n",
+- this->cur_lsn, this->end_lsn);
++ p_vcdplayer->i_lsn, p_vcdplayer->end_lsn);
+ break;
+ }
+
+@@ -968,82 +940,23 @@
+ */
+ } while((vcd_sector.subheader[2]&~0x01)==0x60);
+
+- if ( this->cur_lsn >= this->end_lsn )
++ if ( p_vcdplayer->i_lsn >= p_vcdplayer->end_lsn )
+ /* We've run off of the end of this entry. Do we continue or stop? */
+ goto handle_item_continuation;
+
+- memcpy (buf, vcd_sector.data, M2F2_SECTOR_SIZE);
++ memcpy (p_buf, vcd_sector.data, M2F2_SECTOR_SIZE);
+ return READ_BLOCK;
+ }
+ }
+
+ /* Do if needed */
+ void
+-vcdplayer_send_button_update(vcdplayer_input_t *this, const int mode)
++vcdplayer_send_button_update(vcdplayer_t *p_vcdplayer, const int mode)
+ {
+ /* dbg_print(INPUT_DBG_CALL, "Called\n"); */
+ return;
+ }
+
+-#ifndef LIBVCD_VERSION
+-/* Older version of vcdimager. You really should consider using 0.7.21
+- or later as that has bug and memory leak fixes. */
+-lid_t
+-vcdplayer_selection2lid (vcdplayer_input_t *this, int entry_num)
+-{
+- /* FIXME: Some of this probably gets moved to vcdinfo. */
+- /* Convert selection number to lid and then entry number...*/
+- unsigned int offset;
+- unsigned int bsn=vcdinf_get_bsn(this->pxd.psd);
+- vcdinfo_obj_t *obj = this->vcd;
+-
+- dbg_print( (INPUT_DBG_CALL|INPUT_DBG_PBC),
+- "Called lid %u, entry_num %d bsn %d\n", this->cur_lid,
+- entry_num, bsn);
+-
+- if ( (entry_num - bsn + 1) > 0) {
+- offset = vcdinfo_lid_get_offset(obj, this->cur_lid, entry_num-bsn+1);
+- } else {
+- LOG_ERR(this, "Selection number %u too small. bsn %u\n",
+- entry_num, bsn);
+- return VCDINFO_INVALID_LID;
+- }
+-
+- if (offset != VCDINFO_INVALID_OFFSET) {
+- vcdinfo_offset_t *ofs;
+- int old = entry_num;
+-
+- switch (offset) {
+- case PSD_OFS_DISABLED:
+- LOG_ERR(this, "Selection %u disabled\n", entry_num);
+- return VCDINFO_INVALID_LID;
+- case PSD_OFS_MULTI_DEF:
+- LOG_ERR(this, "Selection %u multi_def\n", entry_num);
+- return VCDINFO_INVALID_LID;
+- case PSD_OFS_MULTI_DEF_NO_NUM:
+- LOG_ERR(this, "Selection %u multi_def_no_num\n", entry_num);
+- return VCDINFO_INVALID_LID;
+- default: ;
+- }
+-
+- ofs = vcdinfo_get_offset_t(obj, offset);
+-
+- if (NULL == ofs) {
+- LOG_ERR(this, "error in vcdinfo_get_offset\n");
+- return -1;
+- }
+- dbg_print(INPUT_DBG_PBC,
+- "entry %u turned into selection lid %u\n",
+- old, ofs->lid);
+- return ofs->lid;
+-
+- } else {
+- LOG_ERR(this, "invalid or unset entry %u\n", entry_num);
+- return VCDINFO_INVALID_LID;
+- }
+-}
+-#endif /* LIBVCD_VERSION */
+-
+ /*
+ * Local variables:
+ * c-file-style: "gnu"
+--- ./src/input/vcd/vcdplayer.h 13 Oct 2003 11:47:11 -0000 1.1
++++ ./src/input/vcd/vcdplayer.h 15 Jan 2005 17:51:41 -0000 1.1.2.2
+@@ -1,7 +1,7 @@
+ /*
+- $Id: vcdplayer.h,v 1.1 2003/10/13 11:47:11 f1rmb Exp $
++ $Id: vcdplayer.h,v 1.1.2.2 2005/01/15 17:51:41 mroi Exp $
+
+- Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -48,7 +48,7 @@
+
+ #define INPUT_DBG_META 1 /* Meta information */
+ #define INPUT_DBG_EVENT 2 /* input (keyboard/mouse) events */
+-#define INPUT_DBG_MRL 4
++#define INPUT_DBG_MRL 4 /* MRL parsing */
+ #define INPUT_DBG_EXT 8 /* Calls from external routines */
+ #define INPUT_DBG_CALL 16 /* routine calls */
+ #define INPUT_DBG_LSN 32 /* LSN changes */
+@@ -93,18 +93,29 @@
+ typedef struct {
+ lsn_t start_LSN; /* LSN where play item starts */
+ size_t size; /* size in sector units of play item. */
+-} vcdplayer_play_item_info;
++} vcdplayer_play_item_info_t;
+
+ typedef int (*generic_fn)();
+
+-typedef struct vcdplayer_input_struct {
++/* The maximim wait time that can be encoded in a VCD still frame is
++ 2,000 seconds (33.33 minutes). We'll use a number larger than this
++ to signal indefinite wait.
++*/
++#define STILL_INDEFINITE_WAIT 3000
++
++/* Value when we have yet to finish reading blocks of a frame. */
++#define STILL_READING -5
++
++typedef struct vcdplayer_input_s {
+ void *user_data; /* environment. Passed to called routines. */
+ int32_t buttonN;
+ vcdinfo_obj_t *vcd; /* Pointer to libvcd structures. */
+- int in_still; /* 0 if not in still,
+- -2 if in infinite loop
+- -5 if a still but haven't read wait time yet
+- >0 number of seconds yet to wait */
++
++ /*------------------------------------------------------------------
++ User-settable options
++ --------------------------------------------------------------*/
++ unsigned int i_debug; /* Debugging mask */
++ unsigned int i_blocks_per_read; /* number of blocks per read */
+
+ /*------------------------------------------------------------------
+ Callback functions - players and higher-level routines can use
+@@ -119,35 +130,34 @@
+ /* Function to flush any audio or video buffers */
+ void (*flush_buffers) (void);
+
+- /* Function to flush sleep for a number of milliseconds. */
+- void (*sleep) (unsigned int usecs);
+-
+- /* Function to flush sleep for a number of milliseconds. */
++ /* Function to force a redisplay. */
+ void (*force_redisplay) (void);
+
+- /* Function to handle player events. Returns true if play item changed. */
+- bool (*handle_events) (void);
+-
+ /* Function to update title of selection. */
+ void (*update_title) ();
+
+ /*-------------------------------------------------------------
+ Playback control fields
+ --------------------------------------------------------------*/
+- int cur_lid; /* LID that play item is in. Implies PBC is.
++ int i_still; /* 0 if not in still,
++ STILL_INDEFINITE_WAIT if indefinite time,
++ STILL_READING if don't have full picture,
++ else number of seconds yet to wait */
++
++ int i_lid; /* LID that play item is in. Implies PBC is.
+ on. VCDPLAYER_BAD_ENTRY if not none or
+ not in PBC */
+- PsdListDescriptor pxd; /* If PBC is on, the relevant PSD/PLD */
+- int pdi; /* current pld index of pxd. -1 if
++ PsdListDescriptor pxd; /* If PBC is on, the relevant PSD/PLD */
++ int pdi; /* current pld index of pxd. -1 if
+ no index*/
+
+ vcdinfo_itemid_t play_item; /* play-item, VCDPLAYER_BAD_ENTRY if none */
+ vcdinfo_itemid_t loop_item; /* Where do we loop back to? Meaningful only
+ in a selection list */
+- int loop_count; /* # of times play-item has been played.
++ int i_loop; /* # of times play-item has been played.
+ Meaningful only in a selection list.
+ */
+- track_t cur_track; /* current track number. */
++ track_t i_track; /* current track number */
+
+ /*-----------------------------------
+ Navigation and location fields
+@@ -159,29 +169,35 @@
+ uint16_t return_entry; /* Entry index to use if return is pressed */
+ uint16_t default_entry; /* Default selection entry. */
+
+- lsn_t cur_lsn; /* LSN of where we are right now */
+- lsn_t end_lsn; /* LSN of end of current entry/segment/track. */
+- lsn_t origin_lsn; /* LSN of start of slider position. */
++ lsn_t i_lsn; /* LSN of where we are right now */
++ lsn_t end_lsn; /* LSN of end of current entry/segment/track.
++ entry/segment/track. This block can be read
++ (and is not one after the "end"). */
++
++ lsn_t origin_lsn; /* LSN of start of seek/slider position. */
+ lsn_t track_lsn; /* LSN of start track origin of track we are in. */
+ lsn_t track_end_lsn; /* LSN of end of current track (if entry). */
+
+ /*--------------------------------------------------------------
+- Medium information
++ (S)VCD Medium information
+ ---------------------------------------------------------------*/
++ char *psz_source; /* VCD device currently open */
++ bool opened; /* true if initialized */
+
+- char *current_vcd_device; /* VCD device currently open */
+- bool opened; /* true if initialized */
+-
+- track_t num_tracks; /* Number of tracks in medium */
+- segnum_t num_segments; /* Number of segments in medium */
+- unsigned int num_entries; /* Number of entries in medium */
+- lid_t num_LIDs; /* Number of LIDs in medium */
++ track_t i_tracks; /* # of playable MPEG tracks. This is
++ generally one less than the number
++ of CD tracks as the first CD track
++ is an ISO-9660 track and is not
++ playable. */
++ segnum_t i_segments; /* Number of segments in medium */
++ unsigned int i_entries; /* Number of entries in medium */
++ lid_t i_lids; /* Number of LIDs in medium */
+
+ /* Tracks, segment, and entry information. The number of entries for
+- each is given by the corresponding num_* field above. */
+- vcdplayer_play_item_info *track;
+- vcdplayer_play_item_info *segment;
+- vcdplayer_play_item_info *entry;
++ each is given by the corresponding i_* field above. */
++ vcdplayer_play_item_info_t *track;
++ vcdplayer_play_item_info_t *segment;
++ vcdplayer_play_item_info_t *entry;
+
+ /*--------------------------------------------------------------
+ Configuration variables
+@@ -203,7 +219,7 @@
+ /* Whether GUI slider is track size or entry size. */
+ vcdplayer_slider_length_t slider_length;
+
+-} vcdplayer_input_t;
++} vcdplayer_t;
+
+ /* vcdplayer_read return status */
+ typedef enum {
+@@ -221,8 +237,7 @@
+ /*!
+ Return true if playback control (PBC) is on
+ */
+-bool
+-vcdplayer_pbc_is_on(const vcdplayer_input_t *this);
++bool vcdplayer_pbc_is_on(const vcdplayer_t *p_vcdplayer);
+
+ /*!
+ Take a format string and expand escape sequences, that is sequences that
+@@ -244,30 +259,30 @@
+ %% : a %
+ */
+ char *
+-vcdplayer_format_str(vcdplayer_input_t *this, const char format_str[]);
++vcdplayer_format_str(vcdplayer_t *p_vcdplayer, const char format_str[]);
+
+ /*!
+ Update next/prev/return/default navigation buttons.
+ */
+ void
+-vcdplayer_update_nav(vcdplayer_input_t *this);
++vcdplayer_update_nav(vcdplayer_t *p_vcdplayer);
+
+ /*! Update the player title text. */
+ void
+-vcdplayer_update_title_display(vcdplayer_input_t *this);
++vcdplayer_update_title_display(vcdplayer_t *p_vcdplayer);
+
+ /*! Play title part. If part is -1, use the first title. */
+ void
+-vcdplayer_play(vcdplayer_input_t *this, vcdinfo_itemid_t itemid);
++vcdplayer_play(vcdplayer_t *p_vcdplayer, vcdinfo_itemid_t itemid);
+
+ bool
+-vcdplayer_open(vcdplayer_input_t *this, char *intended_vcd_device);
++vcdplayer_open(vcdplayer_t *p_vcdplayer, char *intended_vcd_device);
+
+ /*!
+ Read nlen bytes into buf and return the status back.
+ */
+ vcdplayer_read_status_t
+-vcdplayer_read (vcdplayer_input_t *this, uint8_t *buf, const off_t nlen);
++vcdplayer_read (vcdplayer_t *p_vcdplayer, uint8_t *p_buf, const off_t nlen);
+
+ /*!
+ seek position, return new position
+@@ -275,17 +290,14 @@
+ if seeking failed, -1 is returned
+ */
+ off_t
+-vcdplayer_seek (vcdplayer_input_t *this, off_t offset, int origin);
++vcdplayer_seek (vcdplayer_t *p_vcdplayer, off_t offset, int origin);
+
+ /*!
+ Get the number of tracks or titles of the VCD. The result is stored
+ in "titles".
+ */
+ void
+-vcdplayer_send_button_update(vcdplayer_input_t *this, int mode);
+-
+-lid_t
+-vcdplayer_selection2lid (vcdplayer_input_t *this, int entry_num);
++vcdplayer_send_button_update(vcdplayer_t *p_vcdplayer, int mode);
+
+ #endif /* _VCDPLAYER_H_ */
+ /*
+--- ./src/input/vcd/xineplug_inp_vcd.c 12 Dec 2004 22:01:07 -0000 1.26
++++ ./src/input/vcd/xineplug_inp_vcd.c 15 Jan 2005 17:51:41 -0000 1.26.2.2
+@@ -1,9 +1,9 @@
+ /*
+- $Id: xineplug_inp_vcd.c,v 1.26 2004/12/12 22:01:07 mroi Exp $
++ $Id: xineplug_inp_vcd.c,v 1.26.2.2 2005/01/15 17:51:41 mroi Exp $
+
+- Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+
+- Program is free software; you can redistribute it and/or modify
++ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+@@ -121,9 +121,9 @@
+ into "mrls" array
+ ---------------------------------------------------------------*/
+ int mrl_track_offset; /* perhaps -1 for tracks staring with 1*/
+- int mrl_entry_offset; /* num_tracks for entries starting with 0 */
+- int mrl_play_offset; /* num_tracks for entries starting with 0 */
+- int mrl_segment_offset; /* num_tracks + num_entries if segs start 1*/
++ int mrl_entry_offset; /* i_tracks for entries starting with 0 */
++ int mrl_play_offset; /* i_tracks for entries starting with 0 */
++ int mrl_segment_offset; /* i_tracks + i_entries if segs start 1*/
+
+
+ } vcd_input_class_t;
+@@ -139,13 +139,20 @@
+ xine_stream_t *stream;
+ xine_event_queue_t *event_queue;
+
++ time_t pause_end_time;
++ int i_old_still; /* Value of player-i_still before next read.
++ See also i_still in vcdplayer structure.
++ */
++ int i_old_deinterlace; /* value of deinterlace before
++ entering a still. */
++
+ vcd_input_class_t *class;
+ vcd_config_t v_config; /* Config stuff initially inherited */
+ bool jumped; /* True if we changed tracks or any
+ sort of discontinuity in playing */
+ char *mrl;
+
+- vcdplayer_input_t player ;
++ vcdplayer_t player ;
+ };
+
+ vcd_input_plugin_t my_vcd;
+@@ -197,16 +204,16 @@
+ static void
+ vcd_set_meta_info (vcd_input_plugin_t *xine_vcd)
+ {
+- vcdinfo_obj_t *obj= xine_vcd->player.vcd;
++ vcdinfo_obj_t *p_vcdinfo= xine_vcd->player.vcd;
+ meta_info_assign(XINE_META_INFO_ALBUM, xine_vcd->stream,
+- vcdinfo_get_album_id(obj));
++ vcdinfo_get_album_id(p_vcdinfo));
+ meta_info_assign(XINE_META_INFO_ARTIST, xine_vcd->stream,
+- vcdinfo_get_preparer_id(obj));
++ vcdinfo_get_preparer_id(p_vcdinfo));
+ meta_info_assign(XINE_META_INFO_COMMENT, xine_vcd->stream,
+ vcdplayer_format_str(&xine_vcd->player,
+ xine_vcd->v_config.comment_format));
+ meta_info_assign(XINE_META_INFO_GENRE, xine_vcd->stream,
+- vcdinfo_get_format_version_str(obj));
++ vcdinfo_get_format_version_str(p_vcdinfo));
+ }
+
+ static void
+@@ -274,7 +281,7 @@
+ return inp->class->mrl_track_offset;
+ case VCDINFO_ITEM_TYPE_LID:
+ /* Play list number (LID) */
+- *size = (inp->player.num_LIDs > 0) ? 1 : 0;
++ *size = (inp->player.i_lids > 0) ? 1 : 0;
+ return inp->class->mrl_play_offset;
+ case VCDINFO_ITEM_TYPE_NOTFOUND:
+ case VCDINFO_ITEM_TYPE_SPAREID2:
+@@ -291,20 +298,20 @@
+ {
+
+ char mrl[MRL_PREFIX_LEN+MAX_DEVICE_LEN+(sizeof("@E")-1)+12];
+- vcdplayer_input_t *player;
++ vcdplayer_t *vcdplayer;
+ unsigned int n, i=0;
+- unsigned int num_entries;
+- vcdinfo_obj_t *obj;
++ unsigned int i_entries;
++ vcdinfo_obj_t *p_vcdinfo;
+
+ if (NULL == class) {
+ LOG_MSG("%s", _("was passed a null class parameter"));
+ return false;
+ }
+
+- player = &(my_vcd.player);
++ vcdplayer = &(my_vcd.player);
+
+ /* If VCD already open, we gotta close and stop it. */
+- if (player->opened) {
++ if (vcdplayer->opened) {
+ vcd_close(class);
+ }
+
+@@ -313,16 +320,16 @@
+ vcd_device = class->vcd_device;
+ }
+
+- if (!vcdio_open(player, vcd_device)) {
++ if (!vcdio_open(vcdplayer, vcd_device)) {
+ /* Error should have been logged in vcdio_open. If not do the below:
+- LOG_ERR(player, "%s: %s.\n", _("unable to open"),
++ LOG_ERR(vcdplayer, "%s: %s.\n", _("unable to open"),
+ class->vcd_device, strerror(errno));
+ */
+ return false;
+ }
+
+- obj = player->vcd;
+- num_entries = player->num_entries;
++ p_vcdinfo = vcdplayer->vcd;
++ i_entries = vcdplayer->i_entries;
+ class->mrl_track_offset = -1;
+
+ xine_free_mrls(&(class->num_mrls), class->mrls);
+@@ -331,13 +338,13 @@
+ didn't have to possibly remove rejected LIDs from list done in the
+ loop below.
+ */
+- class->num_mrls = player->num_tracks + player->num_entries
+- + player->num_segments + player->num_LIDs;
++ class->num_mrls = vcdplayer->i_tracks + vcdplayer->i_entries
++ + vcdplayer->i_segments + vcdplayer->i_lids;
+
+- if (!player->show_rejected && vcdinfo_get_lot(player->vcd)) {
++ if (!vcdplayer->show_rejected && vcdinfo_get_lot(vcdplayer->vcd)) {
+ /* Remove rejected LIDs from count. */
+- for (n=0; n<player->num_LIDs; n++) {
+- if ( vcdinf_get_lot_offset(vcdinfo_get_lot(player->vcd), n)
++ for (n=0; n<vcdplayer->i_lids; n++) {
++ if ( vcdinf_get_lot_offset(vcdinfo_get_lot(vcdplayer->vcd), n)
+ == PSD_OFS_DISABLED )
+ class->num_mrls--;
+ }
+@@ -351,32 +358,32 @@
+ }
+
+ /* Record MRL's for tracks */
+- for (n=1; n<=player->num_tracks; n++) {
++ for (n=1; n<=vcdplayer->i_tracks; n++) {
+ memset(&mrl, 0, sizeof (mrl));
+- sprintf(mrl, "%s%s@T%2u", MRL_PREFIX, vcd_device, n);
+- vcd_add_mrl_slot(class, mrl, player->track[n-1].size, &i);
++ snprintf(mrl, sizeof(mrl), "%s%s@T%u", MRL_PREFIX, vcd_device, n);
++ vcd_add_mrl_slot(class, mrl, vcdplayer->track[n-1].size, &i);
+ }
+
+- class->mrl_entry_offset = player->num_tracks;
+- class->mrl_play_offset = class->mrl_entry_offset + num_entries - 1;
++ class->mrl_entry_offset = vcdplayer->i_tracks;
++ class->mrl_play_offset = class->mrl_entry_offset + i_entries - 1;
+
+ /* Record MRL's for entries */
+- if (num_entries > 0) {
+- for (n=0; n<num_entries; n++) {
++ if (i_entries > 0) {
++ for (n=0; n<i_entries; n++) {
+ memset(&mrl, 0, sizeof (mrl));
+- sprintf(mrl, "%s%s@E%4u", MRL_PREFIX, vcd_device, n);
+- vcd_add_mrl_slot(class, mrl, player->entry[n].size, &i);
++ snprintf(mrl, sizeof(mrl), "%s%s@E%u", MRL_PREFIX, vcd_device, n);
++ vcd_add_mrl_slot(class, mrl, vcdplayer->entry[n].size, &i);
+ }
+ }
+
+ /* Record MRL's for LID entries or selection entries*/
+ class->mrl_segment_offset = class->mrl_play_offset;
+- if (vcdinfo_get_lot(player->vcd)) {
+- for (n=0; n<player->num_LIDs; n++) {
+- uint16_t ofs = vcdinf_get_lot_offset(vcdinfo_get_lot(player->vcd), n);
+- if (ofs != PSD_OFS_DISABLED || player->show_rejected) {
++ if (vcdinfo_get_lot(vcdplayer->vcd)) {
++ for (n=0; n<vcdplayer->i_lids; n++) {
++ uint16_t ofs = vcdinf_get_lot_offset(vcdinfo_get_lot(vcdplayer->vcd), n);
++ if (ofs != PSD_OFS_DISABLED || vcdplayer->show_rejected) {
+ memset(&mrl, 0, sizeof (mrl));
+- sprintf(mrl, "%s%s@P%4u%s", MRL_PREFIX, vcd_device, n+1,
++ snprintf(mrl, sizeof(mrl), "%s%s@P%u%s", MRL_PREFIX, vcd_device, n+1,
+ ofs == PSD_OFS_DISABLED ? "*" : "");
+ vcd_add_mrl_slot(class, mrl, 0, &i);
+ class->mrl_segment_offset++;
+@@ -386,10 +393,10 @@
+
+ /* Record MRL's for segments */
+ {
+- segnum_t num_segments = player->num_segments;
+- for (n=0; n<num_segments; n++) {
++ segnum_t i_segments = vcdplayer->i_segments;
++ for (n=0; n<i_segments; n++) {
+ vcdinfo_video_segment_type_t segtype
+- = vcdinfo_get_video_type(obj, n);
++ = vcdinfo_get_video_type(p_vcdinfo, n);
+ char c='S';
+ switch (segtype) {
+ {
+@@ -408,8 +415,8 @@
+ }
+
+ memset(&mrl, 0, sizeof (mrl));
+- sprintf(mrl, "%s%s@%c%4u", MRL_PREFIX, vcd_device, c, n);
+- vcd_add_mrl_slot(class, mrl, player->segment[n].size, &i);
++ snprintf(mrl, sizeof(mrl), "%s%s@%c%u", MRL_PREFIX, vcd_device, c, n);
++ vcd_add_mrl_slot(class, mrl, vcdplayer->segment[n].size, &i);
+ }
+ }
+
+@@ -569,7 +576,7 @@
+ uint32_t ret =
+ INPUT_CAP_AUDIOLANG | INPUT_CAP_BLOCK |
+ INPUT_CAP_CHAPTERS | INPUT_CAP_PREVIEW |
+- (my_vcd.player.in_still ? 0: INPUT_CAP_SEEKABLE) |
++ (my_vcd.player.i_still ? 0: INPUT_CAP_SEEKABLE) |
+ INPUT_CAP_SPULANG;
+
+ dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "returning %d\n", ret);
+@@ -612,6 +619,23 @@
+ return (off_t) 1;
+ }
+
++/* Allocate and return a no-op buffer. This signals the outside
++ to do nothing, but in contrast to returning NULL, it doesn't
++ mean the stream has ended. We use this say for still frames.
++ */
++#define RETURN_NOOP_BUF \
++ p_buf = fifo->buffer_pool_alloc (fifo); \
++ p_buf->type = BUF_CONTROL_NOP; \
++ return p_buf
++
++/* Handle keyboard events and if there were non which might affect
++ playback, then sleep a little bit and return;
++ */
++#define SLEEP_AND_HANDLE_EVENTS \
++ xine_usec_sleep(50000); \
++ if (vcd_handle_events()) goto read_block; \
++ RETURN_NOOP_BUF
++
+ /*!
+ From xine plugin spec:
+
+@@ -622,11 +646,12 @@
+ */
+ static buf_element_t *
+ vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo,
+- const off_t nlen)
++ const off_t nlen)
+ {
+- vcdplayer_input_t *this = &my_vcd.player;
+- buf_element_t *buf;
+- uint8_t data[M2F2_SECTOR_SIZE];
++ vcd_input_plugin_t *vcd_input_plugin= (vcd_input_plugin_t *) this_gen;
++ vcdplayer_t *p_vcdplayer = &my_vcd.player;
++ buf_element_t *p_buf;
++ uint8_t data[M2F2_SECTOR_SIZE] = {0};
+
+ if (fifo == NULL) {
+ dbg_print(INPUT_DBG_CALL, "NULL fifo");
+@@ -638,7 +663,26 @@
+ /* Should we change this to <= instead of !=? */
+ if (nlen != M2F2_SECTOR_SIZE) return NULL;
+
+- switch (vcdplayer_read(this, data, nlen)) {
++ if (vcd_handle_events()) goto read_block;
++
++ if (p_vcdplayer->i_still > 0) {
++ if ( time(NULL) >= vcd_input_plugin->pause_end_time ) {
++ if (STILL_INDEFINITE_WAIT == p_vcdplayer->i_still) {
++ dbg_print(INPUT_DBG_STILL, "Continuing still indefinite wait time\n");
++ vcd_input_plugin->pause_end_time = time(NULL) + p_vcdplayer->i_still;
++ SLEEP_AND_HANDLE_EVENTS;
++ } else {
++ dbg_print(INPUT_DBG_STILL, "Still time ended\n");
++ p_vcdplayer->i_still = 0;
++ }
++ } else {
++ SLEEP_AND_HANDLE_EVENTS;
++ }
++ }
++
++
++ read_block:
++ switch (vcdplayer_read(p_vcdplayer, data, nlen)) {
+ case READ_END:
+ /* End reached. Return NULL to indicated this. */
+ return NULL;
+@@ -647,25 +691,39 @@
+ return NULL;
+ case READ_STILL_FRAME:
+ {
+- dbg_print(INPUT_DBG_STILL, "Handled still event\n");
+- buf = fifo->buffer_pool_alloc (fifo);
+- buf->type = BUF_CONTROL_NOP;
+- break;
++ dbg_print(INPUT_DBG_STILL, "Handled still event wait time %u\n",
++ p_vcdplayer->i_still);
++ vcd_input_plugin->pause_end_time = time(NULL) + p_vcdplayer->i_still;
++ RETURN_NOOP_BUF;
+ }
+
+ default:
+ case READ_BLOCK:
+ /* Read buffer */
+- buf = fifo->buffer_pool_alloc (fifo);
+- buf->type = BUF_DEMUX_BLOCK;
++ p_buf = fifo->buffer_pool_alloc (fifo);
++ p_buf->type = BUF_DEMUX_BLOCK;
+ }
+
+- buf->content = buf->mem;
++ p_buf->content = p_buf->mem;
+
++ if (STILL_READING == p_vcdplayer->i_still && 0 == my_vcd.i_old_still) {
++ my_vcd.i_old_deinterlace = xine_get_param(my_vcd.stream,
++ XINE_PARAM_VO_DEINTERLACE);
++ xine_set_param(my_vcd.stream, XINE_PARAM_VO_DEINTERLACE, 0);
++ dbg_print(INPUT_DBG_STILL, "going into still, saving deinterlace %d\n",
++ my_vcd.i_old_deinterlace);
++ } else if (0 == p_vcdplayer->i_still && 0 != my_vcd.i_old_still) {
++ dbg_print(INPUT_DBG_STILL,
++ "going out of still, restoring deinterlace\n");
++ xine_set_param(my_vcd.stream, XINE_PARAM_VO_DEINTERLACE,
++ my_vcd.i_old_deinterlace);
++ }
++ my_vcd.i_old_still = p_vcdplayer->i_still;
++
+ /* Ideally this should probably be nlen. */
+- memcpy (buf->mem, data, M2F2_SECTOR_SIZE);
++ memcpy (p_buf->mem, data, M2F2_SECTOR_SIZE);
+
+- return buf;
++ return p_buf;
+ }
+
+ /*!
+@@ -699,27 +757,27 @@
+ vcd_plugin_get_length (input_plugin_t *this_gen) {
+
+ vcd_input_plugin_t *ip= (vcd_input_plugin_t *) this_gen;
+- vcdplayer_input_t *this = &(ip->player);
++ vcdplayer_t *vcdplayer = &(ip->player);
+
+- int n = this->play_item.num;
++ int n = vcdplayer->play_item.num;
+
+- if (this->play_item.num == old_play_item.num
+- && this->play_item.type == old_play_item.type
+- && this->slider_length == old_slider_length)
++ if (vcdplayer->play_item.num == old_play_item.num
++ && vcdplayer->play_item.type == old_play_item.type
++ && vcdplayer->slider_length == old_slider_length)
+ return old_get_length;
+
+- old_slider_length = this->slider_length;
+- old_play_item = this->play_item;
++ old_slider_length = vcdplayer->slider_length;
++ old_play_item = vcdplayer->play_item;
+
+- switch (this->play_item.type) {
++ switch (vcdplayer->play_item.type) {
+ case VCDINFO_ITEM_TYPE_ENTRY:
+- switch (this->slider_length) {
++ switch (vcdplayer->slider_length) {
+ case VCDPLAYER_SLIDER_LENGTH_AUTO:
+ case VCDPLAYER_SLIDER_LENGTH_ENTRY:
+ n += ip->class->mrl_entry_offset;
+ break;
+ case VCDPLAYER_SLIDER_LENGTH_TRACK:
+- n = vcdinfo_get_track(this->vcd, n) + ip->class->mrl_track_offset;
++ n = vcdinfo_get_track(vcdplayer->vcd, n) + ip->class->mrl_track_offset;
+ break;
+ default:
+ /* FIXME? */
+@@ -736,7 +794,7 @@
+ /* This is the only situation where the size of the current play item
+ is not static. It depends what the current play-item is.
+ */
+- old_get_length = (this->end_lsn - this->origin_lsn) *
++ old_get_length = (vcdplayer->end_lsn - vcdplayer->origin_lsn) *
+ M2F2_SECTOR_SIZE;
+ return old_get_length;
+ break;
+@@ -750,7 +808,7 @@
+ if (n >= 0 && n < ip->class->num_mrls) {
+ old_get_length = ip->class->mrls[n]->size;
+ dbg_print(INPUT_DBG_MRL, "item: %u, slot %u, size %ld\n",
+- this->play_item.num,
++ vcdplayer->play_item.num,
+ (unsigned int) n, (long int) old_get_length);
+ }
+ return old_get_length;
+@@ -795,7 +853,7 @@
+ vcdinfo_itemid_t itemid;
+
+ vcd_input_class_t *class = (vcd_input_class_t *) this_gen;
+- vcdplayer_input_t *player = &my_vcd.player;
++ vcdplayer_t *vcdplayer= &my_vcd.player;
+
+ bool used_default;
+
+@@ -804,7 +862,7 @@
+ "called with NULL\n");
+ if ( class->mrls != NULL && NULL != class->mrls[0] ) goto have_mrls;
+
+- if ( !vcd_build_mrl_list(class, player->current_vcd_device) ) {
++ if ( !vcd_build_mrl_list(class, vcdplayer->psz_source) ) {
+ goto no_mrls;
+ }
+ } else {
+@@ -814,7 +872,7 @@
+ if (!vcd_get_default_device(class, true)) goto no_mrls;
+ if (!vcd_parse_mrl(class->vcd_device, mrl,
+ intended_vcd_device, &itemid,
+- player->default_autoplay, &used_default)) {
++ vcdplayer->default_autoplay, &used_default)) {
+ free (mrl);
+ goto no_mrls;
+ }
+@@ -870,24 +928,24 @@
+ static char *
+ vcd_plugin_get_mrl (input_plugin_t *this_gen)
+ {
+- vcd_input_plugin_t *t = (vcd_input_plugin_t *) this_gen;
+- vcdplayer_input_t *this = &my_vcd.player;
++ vcd_input_plugin_t *t = (vcd_input_plugin_t *) this_gen;
++ vcdplayer_t *vcdplayer = &my_vcd.player;
+ unsigned int n;
+ int size; /* need something to feed get_mrl_type_offset */
+ int offset;
+
+- if (vcdplayer_pbc_is_on(this)) {
+- n = this->cur_lid;
++ if (vcdplayer_pbc_is_on(vcdplayer)) {
++ n = vcdplayer->i_lid;
+ offset = vcd_get_mrl_type_offset(t, VCDINFO_ITEM_TYPE_LID, &size);
+ } else {
+- n = this->play_item.num;
+- offset = vcd_get_mrl_type_offset(t, this->play_item.type, &size);
++ n = vcdplayer->play_item.num;
++ offset = vcd_get_mrl_type_offset(t, vcdplayer->play_item.type, &size);
+ }
+
+ if (-2 == offset) {
+ /* Bad type. */
+ LOG_ERR("%s %d", _("Invalid current entry type"),
+- this->play_item.type);
++ vcdplayer->play_item.type);
+ return strdup("");
+ } else {
+ n += offset;
+@@ -934,7 +992,7 @@
+ static bool
+ vcd_handle_events (void)
+ {
+- vcdplayer_input_t *this = &my_vcd.player;
++ vcdplayer_t *this = &my_vcd.player;
+ xine_event_t *event;
+ int digit_entered=0;
+
+@@ -1023,10 +1081,9 @@
+ num = 0;
+ break;
+ case XINE_EVENT_INPUT_MENU2:
+-#if defined(LIBVCD_VERSION)
+ if (vcdplayer_pbc_is_on(this)) {
+- lid_t lid=vcdinfo_get_multi_default_lid(this->vcd, this->cur_lid,
+- this->cur_lsn);
++ lid_t lid=vcdinfo_get_multi_default_lid(this->vcd, this->i_lid,
++ this->i_lsn);
+ if (VCDINFO_INVALID_LID != lid) {
+ itemid.num = lid;
+ dbg_print((INPUT_DBG_PBC|INPUT_DBG_EVENT),
+@@ -1034,7 +1091,7 @@
+ } else {
+ dbg_print((INPUT_DBG_PBC|INPUT_DBG_EVENT),
+ "no DEFAULT for LID %d\n",
+- this->cur_lid);
++ this->i_lid);
+ }
+
+ /* Don't loop around -- doesn't make sense to loop a return*/
+@@ -1042,20 +1099,8 @@
+ } else {
+ /* PBC is not on. "default" selection beginning of current
+ selection . Alternative: */
+- LOG_MSG("%s\n", _("DEFAULT selected but PBC is not on."));
+- ;
++ LOG_MSG("%s\n", _("DEFAULT selected, but PBC is not on."));
+ }
+-#else
+- if (this->default_entry == VCDINFO_INVALID_ENTRY) {
+- LOG_MSG("%s\n", _("selection has no DEFAULT entry"));
+- return false;
+- }
+- itemid.num = this->default_entry;
+- dbg_print((INPUT_DBG_PBC|INPUT_DBG_EVENT),
+- "DEFAULT to %d\n", itemid.num);
+- /* Don't loop around -- doesn't make sense to loop a return*/
+- num = 0;
+-#endif /* LIBVCD_VERSION */
+ break;
+ case XINE_EVENT_INPUT_NEXT:
+ if (this->next_entry == VCDINFO_INVALID_ENTRY) {
+@@ -1092,13 +1137,8 @@
+ number_addend = 0;
+
+ if (vcdplayer_pbc_is_on(this)) {
+-#if defined(LIBVCD_VERSION)
+- /* version 0.7.21 or greater */
+- lid_t next_num=vcdinfo_selection_get_lid(this->vcd, this->cur_lid,
++ lid_t next_num=vcdinfo_selection_get_lid(this->vcd, this->i_lid,
+ itemid.num);
+-#else
+- lid_t next_num=vcdplayer_selection2lid(this, itemid.num);
+-#endif /* LIBVCD_VERSION */
+ if (VCDINFO_INVALID_LID != next_num) {
+ itemid.num = next_num;
+ _x_demux_flush_engine(my_vcd.stream);
+@@ -1167,12 +1207,12 @@
+ if (-1 == channel) {
+ sprintf(data, " %s", "auto");
+ } else {
+- const vcdinfo_obj_t *obj= my_vcd.player.vcd;
++ const vcdinfo_obj_t *p_vcdinfo= my_vcd.player.vcd;
+ unsigned int audio_type;
+ unsigned int num_channels;
+- unsigned int track_num = my_vcd.player.cur_track;
+- audio_type = vcdinfo_get_track_audio_type(obj, track_num);
+- num_channels = vcdinfo_audio_type_num_channels(obj, audio_type);
++ unsigned int track_num = my_vcd.player.i_track;
++ audio_type = vcdinfo_get_track_audio_type(p_vcdinfo, track_num);
++ num_channels = vcdinfo_audio_type_num_channels(p_vcdinfo, audio_type);
+
+ if (channel >= num_channels) {
+ sprintf(data, "%d ERR", channel);
+@@ -1224,7 +1264,7 @@
+
+ dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
+
+- if ( !vcd_build_mrl_list(class, my_vcd.player.current_vcd_device) ) {
++ if ( !vcd_build_mrl_list(class, my_vcd.player.psz_source) ) {
+ *num_files = 0;
+ return NULL;
+ } else {
+@@ -1279,8 +1319,8 @@
+ my_vcd.stream = NULL;
+
+ #if 0
+- vcd_input_plugin_t *t= (vcd_input_plugin_t *) this_gen;
+- vcdplayer_input_t *this = t->v;
++ vcd_input_plugin_t *t= (vcd_input_plugin_t *) this_gen;
++ vcdplayer_t *this = t->v;
+
+ if (NULL==this) return;
+ #endif
+@@ -1375,7 +1415,8 @@
+ vcd_input_class_t *class = (vcd_input_class_t *) this_gen;
+
+ gl_default_vcd_log_handler = vcd_log_set_handler (uninit_log_handler);
+- gl_default_cdio_log_handler = cdio_log_set_handler (uninit_log_handler);
++ gl_default_cdio_log_handler =
++ cdio_log_set_handler ((cdio_log_handler_t) uninit_log_handler);
+
+ dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
+
+@@ -1399,7 +1440,7 @@
+ vcdplayer_format_str(&my_vcd.player,
+ my_vcd.v_config.comment_format));
+ stream_info_assign(XINE_STREAM_INFO_VIDEO_HAS_STILL, my_vcd.stream,
+- my_vcd.player.in_still);
++ my_vcd.player.i_still);
+
+ /* Set_str title/chapter display */
+ dbg_print((INPUT_DBG_MRL|INPUT_DBG_CALL),
+@@ -1416,7 +1457,7 @@
+ }
+
+ /*
+- No special initialization needed here. All of the initialization
++ Not much special initialization needed here. All of the initialization
+ is either done in the class or when we have an actual MRL we want
+ to deal with.
+ */
+@@ -1429,7 +1470,8 @@
+
+ /* actually, this is also done by class initialization. But just in
+ case... */
+- class->ip = &my_vcd;
++ class->ip = &my_vcd;
++ my_vcd.i_old_still = 0;
+
+ return 1;
+ }
+@@ -1491,9 +1533,9 @@
+ my_vcd.player.user_data = (void *) class;
+
+ /* Do we set PBC (via LID) on? */
+- my_vcd.player.cur_lid =
++ my_vcd.player.i_lid =
+ ( VCDINFO_ITEM_TYPE_LID == itemid.type
+- && my_vcd.player.num_LIDs > itemid.num )
++ && my_vcd.player.i_lids > itemid.num )
+ ? itemid.num
+ : VCDINFO_INVALID_ENTRY;
+
+@@ -1614,15 +1656,13 @@
+ my_vcd.player.update_title = &vcd_update_title;
+ my_vcd.player.log_err = (generic_fn) &xine_log_err;
+ my_vcd.player.log_msg = (generic_fn) &xine_log_msg;
+- my_vcd.player.sleep = &xine_usec_sleep;
+ my_vcd.player.force_redisplay = &vcd_force_redisplay;
+- my_vcd.player.handle_events = &vcd_handle_events;
+
+ /*-------------------------------------------------------------
+ Playback control-specific fields
+ --------------------------------------------------------------*/
+
+- my_vcd.player.cur_lid = VCDINFO_INVALID_ENTRY;
++ my_vcd.player.i_lid = VCDINFO_INVALID_ENTRY;
+ my_vcd.player.end_lsn = VCDINFO_NULL_LSN;
+
+ my_vcd.player.pdi = -1;
+@@ -1754,7 +1794,8 @@
+ }
+
+ gl_default_vcd_log_handler = vcd_log_set_handler (uninit_log_handler);
+- gl_default_cdio_log_handler = cdio_log_set_handler (uninit_log_handler);
++ gl_default_cdio_log_handler =
++ cdio_log_set_handler ((cdio_log_handler_t) uninit_log_handler);
+
+ my_vcd.input_plugin.open = vcd_plugin_open;
+ my_vcd.input_plugin.get_capabilities = vcd_plugin_get_capabilities;
+@@ -1773,7 +1814,7 @@
+ my_vcd.class = class;
+
+ my_vcd.player.buttonN = 0;
+- my_vcd.player.current_vcd_device = NULL;
++ my_vcd.player.psz_source = NULL;
+
+ my_vcd.player.opened = false;
+ my_vcd.player.play_item.num = VCDINFO_INVALID_ENTRY;
+@@ -1782,6 +1823,25 @@
+ return class;
+ }
+
++/*
++ Exported plugin catalog entries.
++
++ All plugins listing only the current API number break when the API
++ number is increased. This is by design.
++
++ Sometimes in the rush to get out a buggy release, the API number is
++ increased without communication let alone a concern for whether it
++ is necessary or how many plugins it might break. And that is
++ precisely when what happened between API release 12 and API
++ 13. Input plugin API numbers 12 and 13 are functionally identical.
++
++ Because of problems like this, we'll just put in a future API
++ release. If the number was increased for a reason that doesn't
++ affect us (such as for nor reason at all), then this plugin will
++ work unmodified that future APIs. If on the other hand there was
++ incompatible change, we are no worse off than if we hadn't entered
++ the next API number since in both cases the plugin is broken.
++ */
+
+ const plugin_info_t xine_plugin_info[] = {
+ /* type, API, "name", version, special_info, init_function */
+--- ./src/input/vcd/libcdio/Makefile.am 20 Sep 2004 19:30:04 -0000 1.5
++++ ./src/input/vcd/libcdio/Makefile.am 9 Feb 2005 19:39:26 -0000 1.5.2.2
+@@ -5,29 +5,45 @@
+ INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+
+ libcdio_SRCS = \
+- image/bincue.c \
+- image/nrg.c \
+- MSWindows/aspi32.c \
+- MSWindows/aspi32.h \
+- MSWindows/ioctl.c \
+- MSWindows/win32.c \
+- MSWindows/win32.h \
+ _cdio_bsdi.c \
+- _cdio_freebsd.c \
+ _cdio_generic.c \
+ _cdio_linux.c \
+ _cdio_osx.c \
+ _cdio_stdio.c \
++ _cdio_stdio.h \
+ _cdio_stream.c \
++ _cdio_stream.h \
+ _cdio_sunos.c \
+- cdio.c \
+ cd_types.c \
++ cdio.c \
++ cdtext.c \
++ cdtext_private.h \
+ ds.c \
++ FreeBSD/freebsd.c \
++ FreeBSD/freebsd.h \
++ FreeBSD/freebsd_cam.c \
++ FreeBSD/freebsd_ioctl.c \
++ generic.h \
++ image.h \
++ image/bincue.c \
++ image/cdrdao.c \
++ image_common.h \
++ image/nrg.c \
++ image/nrg.h \
++ MSWindows/aspi32.c \
++ MSWindows/aspi32.h \
++ MSWindows/win32_ioctl.c \
++ MSWindows/win32.c \
++ MSWindows/win32.h \
+ logging.c \
++ scsi_mmc.c \
++ scsi_mmc_private.h \
+ sector.c \
+ util.c
++
+ libiso9660_SRCS = \
+ iso9660.c \
++ iso9660_private.h \
+ iso9660_fs.c \
+ xa.c
+
+@@ -45,12 +61,10 @@
+ endif
+
+ noinst_HEADERS = \
+- bytesex_asm.h \
+ cdio_assert.h \
+ _cdio_stdio.h \
+- ds.h \
+ scsi_mmc.h \
+- bytesex.h \
+ cdio_private.h \
+ _cdio_stream.h \
+- iso9660_private.h
++ iso9660_private.h \
++ portable.h
+--- ./src/input/vcd/libcdio/_cdio_bsdi.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/_cdio_bsdi.c 3 Jan 2005 21:13:56 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: _cdio_bsdi.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: _cdio_bsdi.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -27,8 +27,9 @@
+ # include "config.h"
+ #endif
+
+-static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $";
+
++#include <cdio/logging.h>
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
+ #include "cdio_assert.h"
+@@ -54,31 +55,109 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+-
+-#define TOTAL_TRACKS (_obj->tochdr.cdth_trk1)
+-#define FIRST_TRACK_NUM (_obj->tochdr.cdth_trk0)
++#include </sys/dev/scsi/scsi.h>
++#include </sys/dev/scsi/scsi_ioctl.h>
++#include "cdtext_private.h"
++
++typedef enum {
++ _AM_NONE,
++ _AM_IOCTL,
++} access_mode_t;
+
+ typedef struct {
+ /* Things common to all drivers like this.
+ This must be first. */
+ generic_img_private_t gen;
+
+- enum {
+- _AM_NONE,
+- _AM_IOCTL,
+- } access_mode;
+-
+- char *source_name;
+-
+- bool init;
++ access_mode_t access_mode;
+
++ /* Some of the more OS specific things. */
+ /* Track information */
+- bool toc_init; /* if true, info below is valid. */
+ struct cdrom_tochdr tochdr;
+- struct cdrom_tocentry tocent[100]; /* entry info for each track */
++ struct cdrom_tocentry tocent[CDIO_CD_MAX_TRACKS+1];
+
+ } _img_private_t;
+
++/* Define the Cdrom Generic Command structure */
++typedef struct cgc
++{
++ scsi_mmc_cdb_t cdb;
++ u_char *buf;
++ int buflen;
++ int rw;
++ unsigned int timeout;
++ scsi_user_sense_t *sus;
++} cgc_t;
++
++
++/*
++ This code adapted from Steven M. Schultz's libdvd
++*/
++static int
++run_scsi_cmd_bsdi(const void *p_user_data, unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
++{
++ const _img_private_t *p_env = p_user_data;
++ int i_status, i_asc;
++ struct scsi_user_cdb suc;
++ struct scsi_sense *sp;
++
++ again:
++ suc.suc_flags = SCSI_MMC_DATA_READ == e_direction ?
++ SUC_READ : SUC_WRITE;
++ suc.suc_cdblen = i_cdb;
++ memcpy(suc.suc_cdb, p_cdb, i_cdb);
++ suc.suc_data = p_buf;
++ suc.suc_datalen = i_buf;
++ suc.suc_timeout = msecs2secs(i_timeout_ms);
++ if (ioctl(p_env->gen.fd, SCSIRAWCDB, &suc) == -1)
++ return(errno);
++ i_status = suc.suc_sus.sus_status;
++
++#if 0
++ /*
++ * If the device returns a scsi sense error and debugging is enabled print
++ * some hopefully useful information on stderr.
++ */
++ if (i_status && debug)
++ {
++ unsigned char *cp;
++ int i;
++ cp = suc.suc_sus.sus_sense;
++ fprintf(stderr,"i_status = %x cdb =",
++ i_status);
++ for (i = 0; i < cdblen; i++)
++ fprintf(stderr, " %x", cgc->cdb[i]);
++ fprintf(stderr, "\nsense =");
++ for (i = 0; i < 16; i++)
++ fprintf(stderr, " %x", cp[i]);
++ fprintf(stderr, "\n");
++ }
++#endif
++
++ /*
++ * HACK! Some drives return a silly "medium changed" on the first
++ * command AND a non-zero i_status which gets turned into a fatal
++ * (EIO) error even though the operation was a success. Retrying
++ * the operation clears the media changed status and gets the
++ * answer. */
++
++ sp = (struct scsi_sense *)&suc.suc_sus.sus_sense;
++ i_asc = XSENSE_ASC(sp);
++ if (i_status == STS_CHECKCOND && i_asc == 0x28)
++ goto again;
++#if 0
++ if (cgc->sus)
++ memcpy(cgc->sus, &suc.suc_sus, sizeof (struct scsi_user_sense));
++#endif
++
++ return(i_status);
++}
++
++
++
+ /* Check a drive to see if it is a CD-ROM
+ Return 1 if a CD-ROM. 0 if it exists but isn't a CD-ROM drive
+ and -1 if no device exists .
+@@ -119,68 +198,68 @@
+ Initialize CD device.
+ */
+ static bool
+-_cdio_init (_img_private_t *_obj)
++_cdio_init (_img_private_t *p_env)
+ {
+- if (_obj->gen.init) {
+- cdio_error ("init called more than once");
++ if (p_env->gen.init) {
++ cdio_warn ("init called more than once");
+ return false;
+ }
+
+- _obj->gen.fd = open (_obj->source_name, O_RDONLY, 0);
++ p_env->gen.fd = open (p_env->gen.source_name, O_RDONLY, 0);
+
+- if (_obj->gen.fd < 0)
++ if (p_env->gen.fd < 0)
+ {
+- cdio_error ("open (%s): %s", _obj->source_name, strerror (errno));
++ cdio_warn ("open (%s): %s", p_env->gen.source_name, strerror (errno));
+ return false;
+ }
+
+- _obj->gen.init = true;
+- _obj->toc_init = false;
++ p_env->gen.init = true;
++ p_env->gen.toc_init = false;
+ return true;
+ }
+
+ /* Read audio sectors
+ */
+ static int
+-_read_audio_sectors (void *env, void *data, lsn_t lsn,
+- unsigned int nblocks)
++_read_audio_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
++ unsigned int nblocks)
+ {
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+ struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
+ msf_t _msf;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ msf->cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ msf->cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ msf->cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+- if (_obj->gen.ioctls_debugged == 75)
++ if (p_env->gen.ioctls_debugged == 75)
+ cdio_debug ("only displaying every 75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged == 30 * 75)
++ if (p_env->gen.ioctls_debugged == 30 * 75)
+ cdio_debug ("only displaying every 30*75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged < 75
+- || (_obj->gen.ioctls_debugged < (30 * 75)
+- && _obj->gen.ioctls_debugged % 75 == 0)
+- || _obj->gen.ioctls_debugged % (30 * 75) == 0)
++ if (p_env->gen.ioctls_debugged < 75
++ || (p_env->gen.ioctls_debugged < (30 * 75)
++ && p_env->gen.ioctls_debugged % 75 == 0)
++ || p_env->gen.ioctls_debugged % (30 * 75) == 0)
+ cdio_debug ("reading %2.2d:%2.2d:%2.2d",
+ msf->cdmsf_min0, msf->cdmsf_sec0, msf->cdmsf_frame0);
+
+- _obj->gen.ioctls_debugged++;
++ p_env->gen.ioctls_debugged++;
+
+- switch (_obj->access_mode) {
++ switch (p_env->access_mode) {
+ case _AM_NONE:
+- cdio_error ("no way to read audio");
++ cdio_warn ("no way to read audio");
+ return 1;
+ break;
+
+ case _AM_IOCTL: {
+ unsigned int i;
+ for (i=0; i < nblocks; i++) {
+- if (ioctl (_obj->gen.fd, CDROMREADRAW, &buf) == -1) {
++ if (ioctl (p_env->gen.fd, CDROMREADRAW, &buf) == -1) {
+ perror ("ioctl()");
+ return 1;
+ /* exit (EXIT_FAILURE); */
+@@ -200,19 +279,15 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
++_read_mode1_sector_bsdi (void *user_data, void *data, lsn_t lsn,
+ bool b_form2)
+ {
+
+- char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ #if FIXED
++ char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ do something here.
+ #else
+- if (0 > cdio_generic_lseek(env, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
+- return -1;
+- if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
+- return -1;
+- memcpy (data, buf, b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
++ return cdio_generic_read_form1_sector(user_data, data, lsn);
+ #endif
+ return 0;
+ }
+@@ -223,16 +298,16 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
++_read_mode1_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
+ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ unsigned int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode1_sector (_obj,
++ if ( (retval = _read_mode1_sector_bsdi (p_env,
+ ((char *)data) + (blocksize * i),
+ lsn + i, b_form2)) )
+ return retval;
+@@ -245,44 +320,44 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
++_read_mode2_sector_bsdi (void *user_data, void *data, lsn_t lsn,
+ bool b_form2)
+ {
+ char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
+ msf_t _msf;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ msf->cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ msf->cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ msf->cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+- if (_obj->gen.ioctls_debugged == 75)
++ if (p_env->gen.ioctls_debugged == 75)
+ cdio_debug ("only displaying every 75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged == 30 * 75)
++ if (p_env->gen.ioctls_debugged == 30 * 75)
+ cdio_debug ("only displaying every 30*75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged < 75
+- || (_obj->gen.ioctls_debugged < (30 * 75)
+- && _obj->gen.ioctls_debugged % 75 == 0)
+- || _obj->gen.ioctls_debugged % (30 * 75) == 0)
++ if (p_env->gen.ioctls_debugged < 75
++ || (p_env->gen.ioctls_debugged < (30 * 75)
++ && p_env->gen.ioctls_debugged % 75 == 0)
++ || p_env->gen.ioctls_debugged % (30 * 75) == 0)
+ cdio_debug ("reading %2.2d:%2.2d:%2.2d",
+ msf->cdmsf_min0, msf->cdmsf_sec0, msf->cdmsf_frame0);
+
+- _obj->gen.ioctls_debugged++;
++ p_env->gen.ioctls_debugged++;
+
+- switch (_obj->access_mode)
++ switch (p_env->access_mode)
+ {
+ case _AM_NONE:
+- cdio_error ("no way to read mode2");
++ cdio_warn ("no way to read mode2");
+ return 1;
+ break;
+
+ case _AM_IOCTL:
+- if (ioctl (_obj->gen.fd, CDROMREADMODE2, &buf) == -1)
++ if (ioctl (p_env->gen.fd, CDROMREADMODE2, &buf) == -1)
+ {
+ perror ("ioctl()");
+ return 1;
+@@ -305,27 +380,20 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
++_read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
+ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
+- int i;
+- int retval;
++ _img_private_t *p_env = user_data;
++ unsigned int i;
++ unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
++ /* For each frame, pick out the data part we need */
+ for (i = 0; i < nblocks; i++) {
+- if (b_form2) {
+- if ( (retval = _cdio_read_mode2_sector (_obj,
+- ((char *)data) + (M2RAW_SECTOR_SIZE * i),
+- lsn + i, true)) )
+- return retval;
+- } else {
+- char buf[M2RAW_SECTOR_SIZE] = { 0, };
+- if ( (retval = _cdio_read_mode2_sector (_obj, buf, lsn + i, true)) )
+- return retval;
+-
+- memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i),
+- buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
+- }
++ int retval = _read_mode2_sector_bsdi(p_env,
++ ((char *)data) +
++ (i_blocksize * i),
++ lsn + i, b_form2);
++ if (retval) return retval;
+ }
+ return 0;
+ }
+@@ -334,16 +402,16 @@
+ Return the size of the CD in logical block address (LBA) units.
+ */
+ static uint32_t
+-_cdio_stat_size (void *env)
++_stat_size_bsdi (void *user_data)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ struct cdrom_tocentry tocent;
+ uint32_t size;
+
+ tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+ tocent.cdte_format = CDROM_LBA;
+- if (ioctl (_obj->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
++ if (ioctl (p_env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
+ {
+ perror ("ioctl(CDROMREADTOCENTRY)");
+ exit (EXIT_FAILURE);
+@@ -358,25 +426,25 @@
+ Set the key "arg" to "value" in source device.
+ */
+ static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
++_set_arg_bsdi (void *user_data, const char key[], const char value[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ if (!strcmp (key, "source"))
+ {
+ if (!value)
+ return -2;
+
+- free (_obj->source_name);
++ free (p_env->gen.source_name);
+
+- _obj->source_name = strdup (value);
++ p_env->gen.source_name = strdup (value);
+ }
+ else if (!strcmp (key, "access-mode"))
+ {
+ if (!strcmp(value, "IOCTL"))
+- _obj->access_mode = _AM_IOCTL;
++ p_env->access_mode = _AM_IOCTL;
+ else
+- cdio_error ("unknown access type: %s. ignored.", value);
++ cdio_warn ("unknown access type: %s. ignored.", value);
+ }
+ else
+ return -1;
+@@ -389,29 +457,33 @@
+ Return false if successful or true if an error.
+ */
+ static bool
+-_cdio_read_toc (_img_private_t *_obj)
++read_toc_bsdi (void *p_user_data)
+ {
++ _img_private_t *p_env = p_user_data;
+ int i;
+
+ /* read TOC header */
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCHDR, &_obj->tochdr) == -1 ) {
+- cdio_error("%s: %s\n",
++ if ( ioctl(p_env->gen.fd, CDROMREADTOCHDR, &p_env->tochdr) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCHDR", strerror(errno));
+ return false;
+ }
+
++ p_env->gen.i_first_track = p_env->tochdr.cdth_trk0;
++ p_env->gen.i_tracks = p_env->tochdr.cdth_trk1;
++
+ /* read individual tracks */
+- for (i= FIRST_TRACK_NUM; i<=TOTAL_TRACKS; i++) {
+- _obj->tocent[i-1].cdte_track = i;
+- _obj->tocent[i-1].cdte_format = CDROM_MSF;
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCENTRY, &_obj->tocent[i-1]) == -1 ) {
+- cdio_error("%s %d: %s\n",
++ for (i= p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++) {
++ p_env->tocent[i-1].cdte_track = i;
++ p_env->tocent[i-1].cdte_format = CDROM_MSF;
++ if (ioctl(p_env->gen.fd, CDROMREADTOCENTRY, &p_env->tocent[i-1]) == -1) {
++ cdio_warn("%s %d: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for track",
+ i, strerror(errno));
+ return false;
+ }
+ /****
+- struct cdrom_msf0 *msf= &_obj->tocent[i-1].cdte_addr.msf;
++ struct cdrom_msf0 *msf= &p_env->tocent[i-1].cdte_addr.msf;
+
+ fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
+ i, msf->minute, msf->second, msf->frame);
+@@ -420,24 +492,25 @@
+ }
+
+ /* read the lead-out track */
+- _obj->tocent[TOTAL_TRACKS].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+- _obj->tocent[TOTAL_TRACKS].cdte_format = CDROM_MSF;
++ p_env->tocent[p_env->gen.i_tracks].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
++ p_env->tocent[p_env->gen.i_tracks].cdte_format = CDROM_MSF;
+
+- if (ioctl(_obj->gen.fd, CDROMREADTOCENTRY,
+- &_obj->tocent[TOTAL_TRACKS]) == -1 ) {
+- cdio_error("%s: %s\n",
++ if (ioctl(p_env->gen.fd, CDROMREADTOCENTRY,
++ &p_env->tocent[p_env->gen.i_tracks]) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for lead-out",
+ strerror(errno));
+ return false;
+ }
+
+ /*
+- struct cdrom_msf0 *msf= &_obj->tocent[TOTAL_TRACKS].cdte_addr.msf;
++ struct cdrom_msf0 *msf= &p_env->tocent[p_env->gen.i_tracks].cdte_addr.msf;
+
+ fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
+ i, msf->minute, msf->second, msf->frame);
+ */
+
++ p_env->gen.toc_init = true;
+ return true;
+ }
+
+@@ -446,32 +519,32 @@
+ also free obj.
+ */
+ static int
+-_cdio_eject_media (void *env) {
++_eject_media_bsdi (void *user_data) {
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ int ret=2;
+ int status;
+ int fd;
+
+- close(_obj->gen.fd);
+- _obj->gen.fd = -1;
+- if ((fd = open (_obj->source_name, O_RDONLY|O_NONBLOCK)) > -1) {
++ close(p_env->gen.fd);
++ p_env->gen.fd = -1;
++ if ((fd = open (p_env->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
+ if((status = ioctl(fd, CDROM_DRIVE_STATUS, (void *) CDSL_CURRENT)) > 0) {
+ switch(status) {
+ case CDS_TRAY_OPEN:
+ if((ret = ioctl(fd, CDROMCLOSETRAY, 0)) != 0) {
+- cdio_error ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
++ cdio_warn ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
+ }
+ break;
+ case CDS_DISC_OK:
+ if((ret = ioctl(fd, CDROMEJECT, 0)) != 0) {
+- cdio_error("ioctl CDROMEJECT failed: %s\n", strerror(errno));
++ cdio_warn("ioctl CDROMEJECT failed: %s\n", strerror(errno));
+ }
+ break;
+ }
+ ret=0;
+ } else {
+- cdio_error ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
++ cdio_warn ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
+ ret=1;
+ }
+ close(fd);
+@@ -483,14 +556,14 @@
+ Return the value associated with the key "arg".
+ */
+ static const char *
+-_cdio_get_arg (void *env, const char key[])
++_get_arg_bsdi (void *user_data, const char key[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ if (!strcmp (key, "source")) {
+- return _obj->source_name;
++ return p_env->gen.source_name;
+ } else if (!strcmp (key, "access-mode")) {
+- switch (_obj->access_mode) {
++ switch (p_env->access_mode) {
+ case _AM_IOCTL:
+ return "ioctl";
+ case _AM_NONE:
+@@ -501,68 +574,42 @@
+ }
+
+ /*!
+- Return the number of of the first track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_first_track_num(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+-
+- return FIRST_TRACK_NUM;
+-}
+-
+-/*!
+ Return the media catalog number MCN.
+ Note: string is malloc'd so caller should free() then returned
+ string when done with it.
+ */
+ static char *
+-_cdio_get_mcn (void *env) {
++_get_mcn_bsdi (const void *user_data) {
+
+ struct cdrom_mcn mcn;
+- _img_private_t *_obj = env;
+- if (ioctl(_obj->gen.fd, CDROM_GET_MCN, &mcn) != 0)
++ const _img_private_t *p_env = user_data;
++ if (ioctl(p_env->gen.fd, CDROM_GET_MCN, &mcn) != 0)
+ return NULL;
+ return strdup(mcn.medium_catalog_number);
+ }
+
+-/*!
+- Return the number of tracks in the current medium.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+-
+- return TOTAL_TRACKS;
+-}
+-
+ /*!
+ Get format of track.
+ */
+ static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
++get_track_format_bsdi(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
++ if (!p_env->gen.toc_init) read_toc_bsdi (p_env) ;
+
+- if (track_num > TOTAL_TRACKS || track_num == 0)
++ if (i_track > p_env->gen.i_tracks || i_track == 0)
+ return TRACK_FORMAT_ERROR;
+
++ i_track -= p_env->gen.i_first_track;
++
+ /* This is pretty much copied from the "badly broken" cdrom_count_tracks
+ in linux/cdrom.c.
+ */
+- if (_obj->tocent[track_num-1].cdte_ctrl & CDROM_DATA_TRACK) {
+- if (_obj->tocent[track_num-1].cdte_format == 0x10)
++ if (p_env->tocent[i_track].cdte_ctrl & CDROM_DATA_TRACK) {
++ if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_CDI_TRACK)
+ return TRACK_FORMAT_CDI;
+- else if (_obj->tocent[track_num-1].cdte_format == 0x20)
++ else if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_XA_TRACK)
+ return TRACK_FORMAT_XA;
+ else
+ return TRACK_FORMAT_DATA;
+@@ -580,48 +627,52 @@
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+ static bool
+-_cdio_get_track_green(void *env, track_t track_num)
++_get_track_green_bsdi(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
++ if (!p_env->gen.toc_init) read_toc_bsdi (p_env) ;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = p_env->gen.i_tracks+1;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0)
++ if (i_track > p_env->gen.i_tracks+1 || i_track == 0)
+ return false;
+
+ /* FIXME: Dunno if this is the right way, but it's what
+ I was using in cdinfo for a while.
+ */
+- return ((_obj->tocent[track_num-1].cdte_ctrl & 2) != 0);
++ return ((p_env->tocent[i_track-1].cdte_ctrl & 2) != 0);
+ }
+
+ /*!
+ Return the starting MSF (minutes/secs/frames) for track number
+- track_num in obj. Track numbers start at 1.
++ i_track in obj. Track numbers start at 1.
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
++ using i_track LEADOUT_TRACK or the total tracks+1.
+ False is returned if there is no track entry.
+ */
+ static bool
+-_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
++_get_track_msf_bsdi(void *user_data, track_t i_track, msf_t *msf)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ if (NULL == msf) return false;
+
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
++ if (!p_env->gen.toc_init) read_toc_bsdi (p_env) ;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = p_env->gen.i_tracks+1;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
++ if (i_track > p_env->gen.i_tracks+1 || i_track == 0) {
+ return false;
+- } else {
+- struct cdrom_msf0 *msf0= &_obj->tocent[track_num-1].cdte_addr.msf;
+- msf->m = to_bcd8(msf0->minute);
+- msf->s = to_bcd8(msf0->second);
+- msf->f = to_bcd8(msf0->frame);
++ }
++
++ i_track -= p_env->gen.i_first_track;
++
++ {
++ struct cdrom_msf0 *msf0= &p_env->tocent[i_track].cdte_addr.msf;
++ msf->m = cdio_to_bcd8(msf0->minute);
++ msf->s = cdio_to_bcd8(msf0->second);
++ msf->f = cdio_to_bcd8(msf0->frame);
+ return true;
+ }
+ }
+@@ -690,46 +741,85 @@
+ ones to set that up.
+ */
+ CdIo *
+-cdio_open_bsdi (const char *source_name)
++cdio_open_am_bsdi (const char *psz_source_name, const char *psz_access_mode)
++{
++ if (psz_access_mode != NULL)
++ cdio_warn ("there is only one access mode for bsdi. Arg %s ignored",
++ psz_access_mode);
++ return cdio_open_bsdi(psz_source_name);
++}
++
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_bsdi (const char *psz_orig_source)
+ {
+
+ #ifdef HAVE_BSDI_CDROM
+ CdIo *ret;
+ _img_private_t *_data;
++ char *psz_source;
+
+ cdio_funcs _funcs = {
+- .eject_media = _cdio_eject_media,
++ .eject_media = _eject_media_bsdi,
+ .free = cdio_generic_free,
+- .get_arg = _cdio_get_arg,
++ .get_arg = _get_arg_bsdi,
++ .get_cdtext = get_cdtext_generic,
+ .get_default_device = cdio_get_default_device_bsdi,
+ .get_devices = cdio_get_devices_bsdi,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_mcn = _cdio_get_mcn,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
++ .get_drive_cap = scsi_mmc_get_drive_cap_generic,
++ .get_discmode = get_discmode_generic,
++ .get_first_track_num= get_first_track_num_generic,
++ .get_hwinfo = NULL,
++ .get_mcn = _get_mcn_bsdi,
++ .get_num_tracks = get_num_tracks_generic,
++ .get_track_format = get_track_format_bsdi,
++ .get_track_green = _get_track_green_bsdi,
+ .get_track_lba = NULL, /* This could be implemented if need be. */
+- .get_track_msf = _cdio_get_track_msf,
++ .get_track_msf = _get_track_msf_bsdi,
+ .lseek = cdio_generic_lseek,
+ .read = cdio_generic_read,
+- .read_audio_sectors = _read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .set_arg = _cdio_set_arg,
+- .stat_size = _cdio_stat_size
++ .read_audio_sectors = _read_audio_sectors_bsdi,
++ .read_mode1_sector = _read_mode1_sector_bsdi,
++ .read_mode1_sectors = _read_mode1_sectors_bsdi,
++ .read_mode2_sector = _read_mode2_sector_bsdi,
++ .read_mode2_sectors = _read_mode2_sectors_bsdi,
++ .read_toc = &read_toc_bsdi,
++ .run_scsi_mmc_cmd = &run_scsi_cmd_bsdi,
++ .set_arg = _set_arg_bsdi,
++ .stat_size = _stat_size_bsdi
+ };
+
+ _data = _cdio_malloc (sizeof (_img_private_t));
+ _data->access_mode = _AM_IOCTL;
+ _data->gen.init = false;
+ _data->gen.fd = -1;
++ _data->gen.toc_init = false;
++ _data->gen.b_cdtext_init = false;
++ _data->gen.b_cdtext_error = false;
++
++ if (NULL == psz_orig_source) {
++ psz_source=cdio_get_default_device_linux();
++ if (NULL == psz_source) return NULL;
++ _set_arg_bsdi(_data, "source", psz_source);
++ free(psz_source);
++ } else {
++ if (cdio_is_device_generic(psz_orig_source))
++ _set_arg_bsdi(_data, "source", psz_orig_source);
++ else {
++ /* The below would be okay if all device drivers worked this way. */
++#if 0
++ cdio_info ("source %s is not a device", psz_orig_source);
++#endif
++ return NULL;
++ }
++ }
+
+- _cdio_set_arg(_data, "source", (NULL == source_name)
+- ? DEFAULT_CDIO_DEVICE: source_name);
+-
+- ret = cdio_new (_data, &_funcs);
++ ret = cdio_new ( (void *) _data, &_funcs);
+ if (ret == NULL) return NULL;
+
+ if (_cdio_init(_data))
+@@ -754,4 +844,3 @@
+ return false;
+ #endif /* HAVE_BSDI_CDROM */
+ }
+-
+--- ./src/input/vcd/libcdio/_cdio_generic.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/_cdio_generic.c 3 Jan 2005 21:13:56 -0000 1.2.2.1
+@@ -1,8 +1,7 @@
+ /*
+- $Id: _cdio_generic.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: _cdio_generic.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $
+
+- Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+- Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -19,21 +18,24 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-/* This file contains Linux-specific code and implements low-level
+- control of the CD drive.
++/* This file contains generic implementations of device-dirver routines.
+ */
+
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+
+-static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $";
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <unistd.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif /*HAVE_UNISTD_H*/
++
+ #include <fcntl.h>
+
+ #include <sys/stat.h>
+@@ -41,9 +43,11 @@
+
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/logging.h>
+ #include "cdio_assert.h"
+ #include "cdio_private.h"
+ #include "_cdio_stdio.h"
++#include "portable.h"
+
+ /*!
+ Eject media -- there's nothing to do here. We always return 2.
+@@ -60,17 +64,22 @@
+ Release and free resources associated with cd.
+ */
+ void
+-cdio_generic_free (void *user_data)
++cdio_generic_free (void *p_user_data)
+ {
+- generic_img_private_t *_obj = user_data;
++ generic_img_private_t *p_env = p_user_data;
++ track_t i_track;
+
+- if (NULL == _obj) return;
+- free (_obj->source_name);
++ if (NULL == p_env) return;
++ free (p_env->source_name);
+
+- if (_obj->fd >= 0)
+- close (_obj->fd);
++ for (i_track=0; i_track < p_env->i_tracks; i_track++) {
++ cdtext_destroy(&(p_env->cdtext_track[i_track]));
++ }
+
+- free (_obj);
++ if (p_env->fd >= 0)
++ close (p_env->fd);
++
++ free (p_env);
+ }
+
+ /*!
+@@ -79,35 +88,52 @@
+ bool
+ cdio_generic_init (void *user_data)
+ {
+- generic_img_private_t *_obj = user_data;
+- if (_obj->init) {
+- cdio_error ("init called more than once");
++ generic_img_private_t *p_env = user_data;
++ if (p_env->init) {
++ cdio_warn ("init called more than once");
+ return false;
+ }
+
+- _obj->fd = open (_obj->source_name, O_RDONLY, 0);
++ p_env->fd = open (p_env->source_name, O_RDONLY, 0);
+
+- if (_obj->fd < 0)
++ if (p_env->fd < 0)
+ {
+- cdio_warn ("open (%s): %s", _obj->source_name, strerror (errno));
++ cdio_warn ("open (%s): %s", p_env->source_name, strerror (errno));
+ return false;
+ }
+
+- _obj->init = true;
+- _obj->toc_init = false;
++ p_env->init = true;
++ p_env->toc_init = false;
++ p_env->b_cdtext_init = false;
++ p_env->b_cdtext_error = false;
++ p_env->i_joliet_level = 0; /* Assume no Joliet extensions initally */
+ return true;
+ }
+
+ /*!
++ Reads a single form1 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++int
++cdio_generic_read_form1_sector (void * user_data, void *data, lsn_t lsn)
++{
++ if (0 > cdio_generic_lseek(user_data, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
++ return -1;
++ if (0 > cdio_generic_read(user_data, data, CDIO_CD_FRAMESIZE))
++ return -1;
++ return 0;
++}
++
++/*!
+ Reads into buf the next size bytes.
+ Returns -1 on error.
+- Is in fact libc's read().
++ Is in fact libc's lseek().
+ */
+ off_t
+ cdio_generic_lseek (void *user_data, off_t offset, int whence)
+ {
+- generic_img_private_t *_obj = user_data;
+- return lseek(_obj->fd, offset, whence);
++ generic_img_private_t *p_env = user_data;
++ return lseek(p_env->fd, offset, whence);
+ }
+
+ /*!
+@@ -118,8 +144,8 @@
+ ssize_t
+ cdio_generic_read (void *user_data, void *buf, size_t size)
+ {
+- generic_img_private_t *_obj = user_data;
+- return read(_obj->fd, buf, size);
++ generic_img_private_t *p_env = user_data;
++ return read(p_env->fd, buf, size);
+ }
+
+ /*!
+@@ -128,13 +154,14 @@
+ void
+ cdio_generic_stdio_free (void *user_data)
+ {
+- generic_img_private_t *_obj = user_data;
++ generic_img_private_t *p_env = user_data;
+
+- if (NULL == _obj) return;
+- free (_obj->source_name);
++ if (NULL == p_env) return;
++ if (NULL != p_env->source_name)
++ free (p_env->source_name);
+
+- if (_obj->data_source)
+- cdio_stdio_destroy (_obj->data_source);
++ if (p_env->data_source)
++ cdio_stdio_destroy (p_env->data_source);
+ }
+
+
+@@ -171,7 +198,8 @@
+ Use cdio_free_device_list() to free this device_list.
+ */
+ void
+-cdio_add_device_list(char **device_list[], const char *drive, int *num_drives)
++cdio_add_device_list(char **device_list[], const char *drive,
++ unsigned int *num_drives)
+ {
+ if (NULL != drive) {
+ unsigned int j;
+@@ -205,3 +233,194 @@
+ }
+
+
++/*!
++ Get cdtext information for a CdIo object .
++
++ @param obj the CD object that may contain CD-TEXT information.
++ @return the CD-TEXT object or NULL if obj is NULL
++ or CD-TEXT information does not exist.
++*/
++const cdtext_t *
++get_cdtext_generic (void *p_user_data, track_t i_track)
++{
++ generic_img_private_t *p_env = p_user_data;
++
++ if ( NULL == p_env ||
++ (0 != i_track
++ && i_track >= p_env->i_tracks+p_env->i_first_track ) )
++ return NULL;
++
++ if (!p_env->b_cdtext_init)
++ init_cdtext_generic(p_env);
++ if (!p_env->b_cdtext_init) return NULL;
++
++ if (0 == i_track)
++ return &(p_env->cdtext);
++ else
++ return &(p_env->cdtext_track[i_track-p_env->i_first_track]);
++
++}
++
++/*!
++ Get disc type associated with cd object.
++*/
++discmode_t
++get_discmode_generic (void *p_user_data )
++{
++ generic_img_private_t *p_env = p_user_data;
++
++ /* See if this is a DVD. */
++ cdio_dvd_struct_t dvd; /* DVD READ STRUCT for layer 0. */
++
++ dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
++ dvd.physical.layer_num = 0;
++ if (0 == scsi_mmc_get_dvd_struct_physical (p_env->cdio, &dvd)) {
++ switch(dvd.physical.layer[0].book_type) {
++ case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM;
++ case CDIO_DVD_BOOK_DVD_RAM: return CDIO_DISC_MODE_DVD_RAM;
++ case CDIO_DVD_BOOK_DVD_R: return CDIO_DISC_MODE_DVD_R;
++ case CDIO_DVD_BOOK_DVD_RW: return CDIO_DISC_MODE_DVD_RW;
++ case CDIO_DVD_BOOK_DVD_PR: return CDIO_DISC_MODE_DVD_PR;
++ case CDIO_DVD_BOOK_DVD_PRW: return CDIO_DISC_MODE_DVD_PRW;
++ default: return CDIO_DISC_MODE_DVD_OTHER;
++ }
++ }
++
++ return get_discmode_cd_generic(p_user_data);
++}
++
++/*!
++ Get disc type associated with cd object.
++*/
++discmode_t
++get_discmode_cd_generic (void *p_user_data )
++{
++ generic_img_private_t *p_env = p_user_data;
++ track_t i_track;
++ discmode_t discmode=CDIO_DISC_MODE_NO_INFO;
++
++ if (!p_env->toc_init)
++ p_env->cdio->op.read_toc (p_user_data);
++
++ if (!p_env->toc_init)
++ return CDIO_DISC_MODE_NO_INFO;
++
++ for (i_track = p_env->i_first_track;
++ i_track < p_env->i_first_track + p_env->i_tracks ;
++ i_track ++) {
++ track_format_t track_fmt =
++ p_env->cdio->op.get_track_format(p_env, i_track);
++
++ switch(track_fmt) {
++ case TRACK_FORMAT_AUDIO:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_DA;
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_XA:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_DATA:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_ERROR:
++ default:
++ discmode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ return discmode;
++}
++
++/*!
++ Return the number of of the first track.
++ CDIO_INVALID_TRACK is returned on error.
++*/
++track_t
++get_first_track_num_generic(void *p_user_data)
++{
++ generic_img_private_t *p_env = p_user_data;
++
++ if (!p_env->toc_init)
++ p_env->cdio->op.read_toc (p_user_data);
++
++ return p_env->toc_init ? p_env->i_first_track : CDIO_INVALID_TRACK;
++}
++
++
++/*!
++ Return the number of tracks in the current medium.
++*/
++ track_t
++get_num_tracks_generic(void *p_user_data)
++{
++ generic_img_private_t *p_env = p_user_data;
++
++ if (!p_env->toc_init)
++ p_env->cdio->op.read_toc (p_user_data);
++
++ return p_env->toc_init ? p_env->i_tracks : CDIO_INVALID_TRACK;
++}
++
++void
++set_cdtext_field_generic(void *user_data, track_t i_track,
++ track_t i_first_track,
++ cdtext_field_t e_field, const char *psz_value)
++{
++ char **pp_field;
++ generic_img_private_t *env = user_data;
++
++ if( i_track == 0 )
++ pp_field = &(env->cdtext.field[e_field]);
++
++ else
++ pp_field = &(env->cdtext_track[i_track-i_first_track].field[e_field]);
++
++ *pp_field = strdup(psz_value);
++}
++
++/*!
++ Read CD-Text information for a CdIo object .
++
++ return true on success, false on error or CD-TEXT information does
++ not exist.
++*/
++bool
++init_cdtext_generic (generic_img_private_t *p_env)
++{
++ return scsi_mmc_init_cdtext_private( p_env,
++ p_env->cdio->op.run_scsi_mmc_cmd,
++ set_cdtext_field_generic
++ );
++}
++
+--- ./src/input/vcd/libcdio/_cdio_linux.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/_cdio_linux.c 3 Jan 2005 21:13:56 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: _cdio_linux.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: _cdio_linux.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -27,15 +27,18 @@
+ # include "config.h"
+ #endif
+
+-static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $";
+
+ #include <string.h>
+
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/types.h>
++#include <cdio/scsi_mmc.h>
++#include <cdio/cdtext.h>
++#include "cdtext_private.h"
+ #include "cdio_assert.h"
+ #include "cdio_private.h"
+-#include "scsi_mmc.h"
+
+ #ifdef HAVE_LINUX_CDROM
+
+@@ -67,24 +70,25 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+
+-#define TOTAL_TRACKS (_obj->tochdr.cdth_trk1)
+-#define FIRST_TRACK_NUM (_obj->tochdr.cdth_trk0)
++typedef enum {
++ _AM_NONE,
++ _AM_IOCTL,
++ _AM_READ_CD,
++ _AM_READ_10
++} access_mode_t;
+
+ typedef struct {
+ /* Things common to all drivers like this.
+ This must be first. */
+ generic_img_private_t gen;
+
+- enum {
+- _AM_NONE,
+- _AM_IOCTL,
+- _AM_READ_CD,
+- _AM_READ_10
+- } access_mode;
++ access_mode_t access_mode;
++
++ /* Some of the more OS specific things. */
++ /* Entry info for each track, add 1 for leadout. */
++ struct cdrom_tocentry tocent[CDIO_CD_MAX_TRACKS+1];
+
+- /* Track information */
+ struct cdrom_tochdr tochdr;
+- struct cdrom_tocentry tocent[100]; /* entry info for each track */
+
+ } _img_private_t;
+
+@@ -92,40 +96,39 @@
+ #define ERRNO_TRAYEMPTY(errno) \
+ ((errno == EIO) || (errno == ENOENT) || (errno == EINVAL))
+
+-
+-/* Check a drive to see if it is a CD-ROM
+- Return 1 if a CD-ROM. 0 if it exists but isn't a CD-ROM drive
+- and -1 if no device exists .
+-*/
+-static bool
+-cdio_is_cdrom(char *drive, char *mnttype)
+-{
+- bool is_cd=false;
+- int cdfd;
+- struct cdrom_tochdr tochdr;
+-
+- /* If it doesn't exist, return -1 */
+- if ( !cdio_is_device_quiet_generic(drive) ) {
+- return(false);
+- }
+-
+- /* If it does exist, verify that it's an available CD-ROM */
+- cdfd = open(drive, (O_RDONLY|O_NONBLOCK), 0);
+- if ( cdfd >= 0 ) {
+- if ( ioctl(cdfd, CDROMREADTOCHDR, &tochdr) != -1 ) {
+- is_cd = true;
+- }
+- close(cdfd);
+- }
+- /* Even if we can't read it, it might be mounted */
+- else if ( mnttype && (strcmp(mnttype, "iso9660") == 0) ) {
+- is_cd = true;
++/**** prototypes for static functions ****/
++static bool is_cdrom_linux(const char *drive, char *mnttype);
++static bool read_toc_linux (void *p_user_data);
++static int run_scsi_cmd_linux( const void *p_user_data,
++ unsigned int i_timeout,
++ unsigned int i_cdb,
++ const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf,
++ /*in/out*/ void *p_buf );
++static access_mode_t
++
++str_to_access_mode_linux(const char *psz_access_mode)
++{
++ const access_mode_t default_access_mode = _AM_IOCTL;
++
++ if (NULL==psz_access_mode) return default_access_mode;
++
++ if (!strcmp(psz_access_mode, "IOCTL"))
++ return _AM_IOCTL;
++ else if (!strcmp(psz_access_mode, "READ_CD"))
++ return _AM_READ_CD;
++ else if (!strcmp(psz_access_mode, "READ_10"))
++ return _AM_READ_10;
++ else {
++ cdio_warn ("unknown access type: %s. Default IOCTL used.",
++ psz_access_mode);
++ return default_access_mode;
+ }
+- return(is_cd);
+ }
+
+ static char *
+-cdio_check_mounts(const char *mtab)
++check_mounts_linux(const char *mtab)
+ {
+ FILE *mntfp;
+ struct mntent *mntent;
+@@ -176,7 +179,7 @@
+ }
+ }
+ if ( strcmp(mnt_type, "iso9660") == 0 ) {
+- if (cdio_is_cdrom(mnt_dev, mnt_type) > 0) {
++ if (is_cdrom_linux(mnt_dev, mnt_type) > 0) {
+ free(mnt_type);
+ endmntent(mntfp);
+ return mnt_dev;
+@@ -190,146 +193,408 @@
+ return NULL;
+ }
+
+-static int
+-_set_bsize (int fd, unsigned int bsize)
++/*!
++ Return the value associated with the key "arg".
++*/
++static const char *
++get_arg_linux (void *env, const char key[])
+ {
+- struct cdrom_generic_command cgc;
++ _img_private_t *_obj = env;
+
+- struct
+- {
+- uint8_t reserved1;
+- uint8_t medium;
+- uint8_t reserved2;
+- uint8_t block_desc_length;
+- uint8_t density;
+- uint8_t number_of_blocks_hi;
+- uint8_t number_of_blocks_med;
+- uint8_t number_of_blocks_lo;
+- uint8_t reserved3;
+- uint8_t block_length_hi;
+- uint8_t block_length_med;
+- uint8_t block_length_lo;
+- } mh;
++ if (!strcmp (key, "source")) {
++ return _obj->gen.source_name;
++ } else if (!strcmp (key, "access-mode")) {
++ switch (_obj->access_mode) {
++ case _AM_IOCTL:
++ return "ioctl";
++ case _AM_READ_CD:
++ return "READ_CD";
++ case _AM_READ_10:
++ return "READ_10";
++ case _AM_NONE:
++ return "no access method";
++ }
++ }
++ return NULL;
++}
+
+- memset (&mh, 0, sizeof (mh));
+- memset (&cgc, 0, sizeof (struct cdrom_generic_command));
+-
+- cgc.cmd[0] = 0x15;
+- cgc.cmd[1] = 1 << 4;
+- cgc.cmd[4] = 12;
++#undef USE_LINUX_CAP
++#ifdef USE_LINUX_CAP
++/*!
++ Return the the kind of drive capabilities of device.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++static void
++get_drive_cap_linux (const void *p_user_data,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ const _img_private_t *p_env = p_user_data;
++ int32_t i_drivetype;
++
++ i_drivetype = ioctl (p_env->gen.fd, CDROM_GET_CAPABILITY, CDSL_CURRENT);
++
++ if (i_drivetype < 0) {
++ *p_read_cap = CDIO_DRIVE_CAP_ERROR;
++ *p_write_cap = CDIO_DRIVE_CAP_ERROR;
++ *p_misc_cap = CDIO_DRIVE_CAP_ERROR;
++ return;
++ }
+
+- cgc.buflen = sizeof (mh);
+- cgc.buffer = (void *) &mh;
++ *p_read_cap = 0;
++ *p_write_cap = 0;
++ *p_misc_cap = 0;
++
++ /* Reader */
++ if (i_drivetype & CDC_PLAY_AUDIO)
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_AUDIO;
++ if (i_drivetype & CDC_CD_R)
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_R;
++ if (i_drivetype & CDC_CD_RW)
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_RW;
++ if (i_drivetype & CDC_DVD)
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_DVD_ROM;
++
++ /* Writer */
++ if (i_drivetype & CDC_CD_RW)
++ *p_read_cap |= CDIO_DRIVE_CAP_WRITE_CD_RW;
++ if (i_drivetype & CDC_DVD_R)
++ *p_read_cap |= CDIO_DRIVE_CAP_WRITE_DVD_R;
++ if (i_drivetype & CDC_DVD_RAM)
++ *p_read_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RAM;
++
++ /* Misc */
++ if (i_drivetype & CDC_CLOSE_TRAY)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_CLOSE_TRAY;
++ if (i_drivetype & CDC_OPEN_TRAY)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_EJECT;
++ if (i_drivetype & CDC_LOCK)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_LOCK;
++ if (i_drivetype & CDC_SELECT_SPEED)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_SELECT_SPEED;
++ if (i_drivetype & CDC_SELECT_DISC)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_SELECT_DISC;
++ if (i_drivetype & CDC_MULTI_SESSION)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_MULTI_SESSION;
++ if (i_drivetype & CDC_MEDIA_CHANGED)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED;
++ if (i_drivetype & CDC_RESET)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_RESET;
++}
++#endif
++
++/*!
++ Return the media catalog number MCN.
+
+- cgc.data_direction = CGC_DATA_WRITE;
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
+
+- mh.block_desc_length = 0x08;
+- mh.block_length_hi = (bsize >> 16) & 0xff;
+- mh.block_length_med = (bsize >> 8) & 0xff;
+- mh.block_length_lo = (bsize >> 0) & 0xff;
++ */
++static char *
++get_mcn_linux (const void *p_user_data) {
+
+- return ioctl (fd, CDROM_SEND_PACKET, &cgc);
++ struct cdrom_mcn mcn;
++ const _img_private_t *p_env = p_user_data;
++ memset(&mcn, 0, sizeof(mcn));
++ if (ioctl(p_env->gen.fd, CDROM_GET_MCN, &mcn) != 0)
++ return NULL;
++ return strdup(mcn.medium_catalog_number);
+ }
+
+-/* Packet driver to read mode2 sectors.
+- Can read only up to 25 blocks.
++/*!
++ Get format of track.
+ */
+-static int
+-_cdio_mmc_read_sectors (int fd, void *buf, lba_t lba, int sector_type,
+- unsigned int nblocks)
++static track_format_t
++get_track_format_linux(void *p_user_data, track_t i_track)
+ {
+- typedef struct cdrom_generic_command cgc_t;
+- cgc_t cgc;
++ _img_private_t *p_env = p_user_data;
++
++ if ( !p_env ) return TRACK_FORMAT_ERROR;
+
+- memset (&cgc, 0, sizeof (cgc_t));
++ if (!p_env->gen.toc_init) read_toc_linux (p_user_data) ;
+
+- cgc.cmd[0] = CDIO_MMC_GPCMD_READ_CD;
+- CDIO_MMC_SET_READ_TYPE (cgc.cmd, sector_type);
+- CDIO_MMC_SET_READ_LBA (cgc.cmd, lba);
+- CDIO_MMC_SET_READ_LENGTH(cgc.cmd, nblocks);
+- CDIO_MMC_SET_MAIN_CHANNEL_SELECTION_BITS(cgc.cmd, CDIO_MMC_MCSB_ALL_HEADERS);
++ if (i_track > (p_env->gen.i_tracks+p_env->gen.i_first_track)
++ || i_track < p_env->gen.i_first_track)
++ return TRACK_FORMAT_ERROR;
+
+- cgc.buflen = CDIO_CD_FRAMESIZE_RAW * nblocks;
+- cgc.buffer = buf;
++ i_track -= p_env->gen.i_first_track;
+
+-#ifdef HAVE_LINUX_CDROM_TIMEOUT
+- cgc.timeout = 500;
+-#endif
+- cgc.data_direction = CGC_DATA_READ;
++ /* This is pretty much copied from the "badly broken" cdrom_count_tracks
++ in linux/cdrom.c.
++ */
++ if (p_env->tocent[i_track].cdte_ctrl & CDIO_CDROM_DATA_TRACK) {
++ if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_CDI_TRACK)
++ return TRACK_FORMAT_CDI;
++ else if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_XA_TRACK)
++ return TRACK_FORMAT_XA;
++ else
++ return TRACK_FORMAT_DATA;
++ } else
++ return TRACK_FORMAT_AUDIO;
++
++}
++
++/*!
++ Return true if we have XA data (green, mode2 form1) or
++ XA data (green, mode2 form2). That is track begins:
++ sync - header - subheader
++ 12 4 - 8
+
+- return ioctl (fd, CDROM_SEND_PACKET, &cgc);
++ FIXME: there's gotta be a better design for this and get_track_format?
++*/
++static bool
++get_track_green_linux(void *p_user_data, track_t i_track)
++{
++ _img_private_t *p_env = p_user_data;
++
++ if (!p_env->gen.toc_init) read_toc_linux (p_user_data) ;
+
+- return 0;
++ if (i_track >= (p_env->gen.i_tracks+p_env->gen.i_first_track)
++ || i_track < p_env->gen.i_first_track)
++ return false;
++
++ i_track -= p_env->gen.i_first_track;
++
++ /* FIXME: Dunno if this is the right way, but it's what
++ I was using in cd-info for a while.
++ */
++ return ((p_env->tocent[i_track].cdte_ctrl & 2) != 0);
+ }
+
+-/* MMC driver to read audio sectors.
+- Can read only up to 25 blocks.
++/*!
++ Return the starting MSF (minutes/secs/frames) for track number
++ track_num in obj. Track numbers usually start at something
++ greater than 0, usually 1.
++
++ The "leadout" track is specified either by
++ using i_track LEADOUT_TRACK or the total tracks+1.
++ False is returned if there is no track entry.
+ */
+-static int
+-_cdio_read_audio_sectors (void *env, void *buf, lsn_t lsn,
+- unsigned int nblocks)
++static bool
++get_track_msf_linux(void *p_user_data, track_t i_track, msf_t *msf)
+ {
+- _img_private_t *_obj = env;
+- return _cdio_mmc_read_sectors( _obj->gen.fd, buf, lsn,
+- CDIO_MMC_READ_TYPE_CDDA, nblocks);
++ _img_private_t *p_env = p_user_data;
++
++ if (NULL == msf) return false;
++
++ if (!p_env->gen.toc_init) read_toc_linux (p_user_data) ;
++
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK)
++ i_track = p_env->gen.i_tracks + p_env->gen.i_first_track;
++
++ if (i_track > (p_env->gen.i_tracks+p_env->gen.i_first_track)
++ || i_track < p_env->gen.i_first_track) {
++ return false;
++ } else {
++ struct cdrom_msf0 *msf0=
++ &p_env->tocent[i_track-p_env->gen.i_first_track].cdte_addr.msf;
++ msf->m = cdio_to_bcd8(msf0->minute);
++ msf->s = cdio_to_bcd8(msf0->second);
++ msf->f = cdio_to_bcd8(msf0->frame);
++ return true;
++ }
+ }
+
+-/* Packet driver to read mode2 sectors.
+- Can read only up to 25 blocks.
++/*!
++ Eject media in CD drive.
++ Return 0 if success and 1 for failure, and 2 if no routine.
++ */
++static int
++eject_media_linux (void *p_user_data) {
++
++ _img_private_t *p_env = p_user_data;
++ int ret=2;
++ int status;
++ int fd;
++
++ if ((fd = open (p_env->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
++ if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
++ switch(status) {
++ case CDS_TRAY_OPEN:
++ if((ret = ioctl(fd, CDROMCLOSETRAY)) != 0) {
++ cdio_warn ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
++ ret = 1;
++ }
++ break;
++ case CDS_DISC_OK:
++ if((ret = ioctl(fd, CDROMEJECT)) != 0) {
++ int eject_error = errno;
++ /* Try ejecting the MMC way... */
++ ret = scsi_mmc_eject_media(p_env->gen.cdio);
++ if (0 != ret) {
++ cdio_warn("ioctl CDROMEJECT failed: %s\n",
++ strerror(eject_error));
++ ret = 1;
++ }
++ }
++ /* force kernel to reread partition table when new disc inserted */
++ ret = ioctl(p_env->gen.fd, BLKRRPART);
++ break;
++ default:
++ cdio_warn ("Unknown CD-ROM (%d)\n", status);
++ ret = 1;
++ }
++ } else {
++ cdio_warn ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
++ ret=1;
++ }
++ close(fd);
++ } else
++ ret = 2;
++ close(p_env->gen.fd);
++ p_env->gen.fd = -1;
++ return ret;
++}
++
++/*!
++ Get disc type associated with the cd object.
+ */
+-static int
+-__read_packet_mode2_sectors (int fd, void *buf, lba_t lba,
+- unsigned int nblocks, bool use_read_10)
++static discmode_t
++get_discmode_linux (void *p_user_data)
+ {
+- struct cdrom_generic_command cgc;
++ _img_private_t *p_env = p_user_data;
+
+- memset (&cgc, 0, sizeof (struct cdrom_generic_command));
++ int32_t i_discmode;
+
+- cgc.cmd[0] = use_read_10 ? GPCMD_READ_10 : CDIO_MMC_GPCMD_READ_CD;
++ /* See if this is a DVD. */
++ cdio_dvd_struct_t dvd; /* DVD READ STRUCT for layer 0. */
++
++ dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
++ dvd.physical.layer_num = 0;
++ if (0 == ioctl (p_env->gen.fd, DVD_READ_STRUCT, &dvd)) {
++ switch(dvd.physical.layer[0].book_type) {
++ case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM;
++ case CDIO_DVD_BOOK_DVD_RAM: return CDIO_DISC_MODE_DVD_RAM;
++ case CDIO_DVD_BOOK_DVD_R: return CDIO_DISC_MODE_DVD_R;
++ case CDIO_DVD_BOOK_DVD_RW: return CDIO_DISC_MODE_DVD_RW;
++ case CDIO_DVD_BOOK_DVD_PR: return CDIO_DISC_MODE_DVD_PR;
++ case CDIO_DVD_BOOK_DVD_PRW: return CDIO_DISC_MODE_DVD_PRW;
++ default: return CDIO_DISC_MODE_DVD_OTHER;
++ }
++ }
+
+- CDIO_MMC_SET_READ_LBA(cgc.cmd, lba);
+- CDIO_MMC_SET_READ_LENGTH(cgc.cmd, nblocks);
++ i_discmode = ioctl (p_env->gen.fd, CDROM_DISC_STATUS);
++
++ if (i_discmode < 0) return CDIO_DISC_MODE_ERROR;
+
+- if (!use_read_10)
+- {
+- cgc.cmd[1] = 0; /* sector size mode2 */
++ /* FIXME Need to add getting DVD types. */
++ switch(i_discmode) {
++ case CDS_AUDIO:
++ return CDIO_DISC_MODE_CD_DA;
++ case CDS_DATA_1:
++ case CDS_DATA_2:
++ return CDIO_DISC_MODE_CD_DATA;
++ case CDS_MIXED:
++ return CDIO_DISC_MODE_CD_MIXED;
++ case CDS_XA_2_1:
++ case CDS_XA_2_2:
++ return CDIO_DISC_MODE_CD_XA;
++ case CDS_NO_INFO:
++ return CDIO_DISC_MODE_NO_INFO;
++ default:
++ return CDIO_DISC_MODE_ERROR;
++ }
++}
+
+- cgc.cmd[9] = 0x58; /* 2336 mode2 */
++/* Check a drive to see if it is a CD-ROM
++ Return 1 if a CD-ROM. 0 if it exists but isn't a CD-ROM drive
++ and -1 if no device exists .
++*/
++static bool
++is_cdrom_linux(const char *drive, char *mnttype)
++{
++ bool is_cd=false;
++ int cdfd;
++ struct cdrom_tochdr tochdr;
++
++ /* If it doesn't exist, return -1 */
++ if ( !cdio_is_device_quiet_generic(drive) ) {
++ return(false);
++ }
++
++ /* If it does exist, verify that it's an available CD-ROM */
++ cdfd = open(drive, (O_RDONLY|O_NONBLOCK), 0);
++ if ( cdfd >= 0 ) {
++ if ( ioctl(cdfd, CDROMREADTOCHDR, &tochdr) != -1 ) {
++ is_cd = true;
++ }
++ close(cdfd);
+ }
++ /* Even if we can't read it, it might be mounted */
++ else if ( mnttype && (strcmp(mnttype, "iso9660") == 0) ) {
++ is_cd = true;
++ }
++ return(is_cd);
++}
+
+- cgc.buflen = 2336 * nblocks;
+- cgc.buffer = buf;
++/* MMC driver to read audio sectors.
++ Can read only up to 25 blocks.
++*/
++static int
++_read_audio_sectors_linux (void *p_user_data, void *buf, lsn_t lsn,
++ unsigned int nblocks)
++{
++ _img_private_t *p_env = p_user_data;
++ return scsi_mmc_read_sectors( p_env->gen.cdio, buf, lsn,
++ CDIO_MMC_READ_TYPE_CDDA, nblocks);
++}
+
+-#ifdef HAVE_LINUX_CDROM_TIMEOUT
+- cgc.timeout = 500;
+-#endif
+- cgc.data_direction = CGC_DATA_READ;
++/* Packet driver to read mode2 sectors.
++ Can read only up to 25 blocks.
++*/
++static int
++_read_mode2_sectors_mmc (_img_private_t *p_env, void *p_buf, lba_t lba,
++ unsigned int nblocks, bool b_read_10)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
+
+- if (use_read_10)
+- {
+- int retval;
++ CDIO_MMC_SET_READ_LBA(cdb.field, lba);
+
+- if ((retval = _set_bsize (fd, 2336)))
++ if (b_read_10) {
++ int retval;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_10);
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, nblocks);
++
++ if ((retval = scsi_mmc_set_blocksize (p_env->gen.cdio, M2RAW_SECTOR_SIZE)))
++ return retval;
++
++ if ((retval = run_scsi_cmd_linux (p_env, 0,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb,
++ SCSI_MMC_DATA_READ,
++ M2RAW_SECTOR_SIZE * nblocks,
++ p_buf)))
++ {
++ scsi_mmc_set_blocksize (p_env->gen.cdio, CDIO_CD_FRAMESIZE);
+ return retval;
++ }
++
++ if ((retval = scsi_mmc_set_blocksize (p_env->gen.cdio, CDIO_CD_FRAMESIZE)))
++ return retval;
++ } else
+
+- if ((retval = ioctl (fd, CDROM_SEND_PACKET, &cgc)))
+- {
+- _set_bsize (fd, 2048);
+- return retval;
+- }
++ cdb.field[1] = 0; /* sector size mode2 */
++ cdb.field[9] = 0x58; /* 2336 mode2 */
+
+- if ((retval = _set_bsize (fd, 2048)))
+- return retval;
+- }
+- else
+- return ioctl (fd, CDROM_SEND_PACKET, &cgc);
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_CD);
++ CDIO_MMC_SET_READ_LENGTH24(cdb.field, nblocks);
+
++ return run_scsi_cmd_linux (p_env, 0,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_READ,
++ M2RAW_SECTOR_SIZE * nblocks, p_buf);
++
+ return 0;
+ }
+
+ static int
+-_read_packet_mode2_sectors (int fd, void *buf, lba_t lba,
+- unsigned int nblocks, bool use_read_10)
++_read_mode2_sectors (_img_private_t *p_env, void *p_buf, lba_t lba,
++ unsigned int nblocks, bool b_read_10)
+ {
+ unsigned int l = 0;
+ int retval = 0;
+@@ -337,10 +602,10 @@
+ while (nblocks > 0)
+ {
+ const unsigned nblocks2 = (nblocks > 25) ? 25 : nblocks;
+- void *buf2 = ((char *)buf ) + (l * 2336);
++ void *p_buf2 = ((char *)p_buf ) + (l * M2RAW_SECTOR_SIZE);
+
+- retval |= __read_packet_mode2_sectors (fd, buf2, lba + l, nblocks2,
+- use_read_10);
++ retval |= _read_mode2_sectors_mmc (p_env, p_buf2, lba + l,
++ nblocks2, b_read_10);
+
+ if (retval)
+ break;
+@@ -357,32 +622,32 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
++_read_mode1_sector_linux (void *p_user_data, void *p_data, lsn_t lsn,
+ bool b_form2)
+ {
+
+- char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ #if FIXED
+- struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
++ char buf[M2RAW_SECTOR_SIZE] = { 0, };
++ struct cdrom_msf *p_msf = (struct cdrom_msf *) &buf;
+ msf_t _msf;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ msf->cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ msf->cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ msf->cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+ retry:
+- switch (_obj->access_mode)
++ switch (p_env->access_mode)
+ {
+ case _AM_NONE:
+- cdio_error ("no way to read mode1");
++ cdio_warn ("no way to read mode1");
+ return 1;
+ break;
+
+ case _AM_IOCTL:
+- if (ioctl (_obj->gen.fd, CDROMREADMODE1, &buf) == -1)
++ if (ioctl (p_env->gen.fd, CDROMREADMODE1, &buf) == -1)
+ {
+ perror ("ioctl()");
+ return 1;
+@@ -392,20 +657,20 @@
+
+ case _AM_READ_CD:
+ case _AM_READ_10:
+- if (_read_packet_mode2_sectors (_obj->gen.fd, buf, lsn, 1,
+- (_obj->access_mode == _AM_READ_10)))
++ if (_read_mode2_sectors (p_env->gen.fd, buf, lsn, 1,
++ (p_env->access_mode == _AM_READ_10)))
+ {
+ perror ("ioctl()");
+- if (_obj->access_mode == _AM_READ_CD)
++ if (p_env->access_mode == _AM_READ_CD)
+ {
+ cdio_info ("READ_CD failed; switching to READ_10 mode...");
+- _obj->access_mode = _AM_READ_10;
++ p_env->access_mode = _AM_READ_10;
+ goto retry;
+ }
+ else
+ {
+ cdio_info ("READ_10 failed; switching to ioctl(CDROMREADMODE2) mode...");
+- _obj->access_mode = _AM_IOCTL;
++ p_env->access_mode = _AM_IOCTL;
+ goto retry;
+ }
+ return 1;
+@@ -417,11 +682,7 @@
+ b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
+
+ #else
+- if (0 > cdio_generic_lseek(env, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
+- return -1;
+- if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
+- return -1;
+- memcpy (data, buf, b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
++ return cdio_generic_read_form1_sector(p_user_data, p_data, lsn);
+ #endif
+ return 0;
+ }
+@@ -432,17 +693,17 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
++_read_mode1_sectors_linux (void *p_user_data, void *p_data, lsn_t lsn,
+ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+ unsigned int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode1_sector (_obj,
+- ((char *)data) + (blocksize * i),
++ if ( (retval = _read_mode1_sector_linux (p_env,
++ ((char *)p_data) + (blocksize*i),
+ lsn + i, b_form2)) )
+ return retval;
+ }
+@@ -454,30 +715,30 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
+- bool b_form2)
++_read_mode2_sector_linux (void *p_user_data, void *p_data, lsn_t lsn,
++ bool b_form2)
+ {
+ char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
+ msf_t _msf;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ msf->cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ msf->cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ msf->cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+ retry:
+- switch (_obj->access_mode)
++ switch (p_env->access_mode)
+ {
+ case _AM_NONE:
+- cdio_error ("no way to read mode2");
++ cdio_warn ("no way to read mode2");
+ return 1;
+ break;
+
+ case _AM_IOCTL:
+- if (ioctl (_obj->gen.fd, CDROMREADMODE2, &buf) == -1)
++ if (ioctl (p_env->gen.fd, CDROMREADMODE2, &buf) == -1)
+ {
+ perror ("ioctl()");
+ return 1;
+@@ -487,20 +748,20 @@
+
+ case _AM_READ_CD:
+ case _AM_READ_10:
+- if (_read_packet_mode2_sectors (_obj->gen.fd, buf, lsn, 1,
+- (_obj->access_mode == _AM_READ_10)))
++ if (_read_mode2_sectors (p_env, buf, lsn, 1,
++ (p_env->access_mode == _AM_READ_10)))
+ {
+ perror ("ioctl()");
+- if (_obj->access_mode == _AM_READ_CD)
++ if (p_env->access_mode == _AM_READ_CD)
+ {
+ cdio_info ("READ_CD failed; switching to READ_10 mode...");
+- _obj->access_mode = _AM_READ_10;
++ p_env->access_mode = _AM_READ_10;
+ goto retry;
+ }
+ else
+ {
+ cdio_info ("READ_10 failed; switching to ioctl(CDROMREADMODE2) mode...");
+- _obj->access_mode = _AM_IOCTL;
++ p_env->access_mode = _AM_IOCTL;
+ goto retry;
+ }
+ return 1;
+@@ -509,9 +770,9 @@
+ }
+
+ if (b_form2)
+- memcpy (data, buf, M2RAW_SECTOR_SIZE);
++ memcpy (p_data, buf, M2RAW_SECTOR_SIZE);
+ else
+- memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
++ memcpy (((char *)p_data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
+
+ return 0;
+ }
+@@ -522,115 +783,57 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
++_read_mode2_sectors_linux (void *p_user_data, void *data, lsn_t lsn,
+ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+ unsigned int i;
+- int retval;
+- unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
++ unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
++ /* For each frame, pick out the data part we need */
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode2_sector (_obj,
+- ((char *)data) + (blocksize * i),
++ int retval;
++ if ( (retval = _read_mode2_sector_linux (p_env,
++ ((char *)data) + (i_blocksize*i),
+ lsn + i, b_form2)) )
+ return retval;
+ }
+ return 0;
+ }
+
+-/*!
+- Return the size of the CD in logical block address (LBA) units.
+- */
+-static uint32_t
+-_cdio_stat_size (void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- struct cdrom_tocentry tocent;
+- uint32_t size;
+-
+- tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+- tocent.cdte_format = CDROM_LBA;
+- if (ioctl (_obj->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
+- {
+- perror ("ioctl(CDROMREADTOCENTRY)");
+- exit (EXIT_FAILURE);
+- }
+-
+- size = tocent.cdte_addr.lba;
+-
+- return size;
+-}
+-
+-/*!
+- Set the arg "key" with "value" in the source device.
+- Currently "source" and "access-mode" are valid keys.
+- "source" sets the source device in I/O operations
+- "access-mode" sets the the method of CD access
+-
+- 0 is returned if no error was found, and nonzero if there as an error.
+-*/
+-static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
+-{
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source"))
+- {
+- if (!value)
+- return -2;
+-
+- free (_obj->gen.source_name);
+-
+- _obj->gen.source_name = strdup (value);
+- }
+- else if (!strcmp (key, "access-mode"))
+- {
+- if (!strcmp(value, "IOCTL"))
+- _obj->access_mode = _AM_IOCTL;
+- else if (!strcmp(value, "READ_CD"))
+- _obj->access_mode = _AM_READ_CD;
+- else if (!strcmp(value, "READ_10"))
+- _obj->access_mode = _AM_READ_10;
+- else {
+- cdio_warn ("unknown access type: %s. ignored.", value);
+- }
+- }
+- else
+- return -1;
+-
+- return 0;
+-}
+-
+ /*!
+ Read and cache the CD's Track Table of Contents and track info.
+ Return false if successful or true if an error.
+ */
+ static bool
+-_cdio_read_toc (_img_private_t *_obj)
++read_toc_linux (void *p_user_data)
+ {
++ _img_private_t *p_env = p_user_data;
+ int i;
+
+ /* read TOC header */
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCHDR, &_obj->tochdr) == -1 ) {
+- cdio_error("%s: %s\n",
++ if ( ioctl(p_env->gen.fd, CDROMREADTOCHDR, &p_env->tochdr) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCHDR", strerror(errno));
+ return false;
+ }
+
++ p_env->gen.i_first_track = p_env->tochdr.cdth_trk0;
++ p_env->gen.i_tracks = p_env->tochdr.cdth_trk1;
++
+ /* read individual tracks */
+- for (i= FIRST_TRACK_NUM; i<=TOTAL_TRACKS; i++) {
+- _obj->tocent[i-1].cdte_track = i;
+- _obj->tocent[i-1].cdte_format = CDROM_MSF;
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCENTRY, &_obj->tocent[i-1]) == -1 ) {
+- cdio_error("%s %d: %s\n",
++ for (i= p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++) {
++ p_env->tocent[i-p_env->gen.i_first_track].cdte_track = i;
++ p_env->tocent[i-p_env->gen.i_first_track].cdte_format = CDROM_MSF;
++ if ( ioctl(p_env->gen.fd, CDROMREADTOCENTRY,
++ &p_env->tocent[i-p_env->gen.i_first_track]) == -1 ) {
++ cdio_warn("%s %d: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for track",
+ i, strerror(errno));
+ return false;
+ }
+ /****
+- struct cdrom_msf0 *msf= &_obj->tocent[i-1].cdte_addr.msf;
++ struct cdrom_msf0 *msf= &env->tocent[i-1].cdte_addr.msf;
+
+ fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
+ i, msf->minute, msf->second, msf->frame);
+@@ -639,282 +842,120 @@
+ }
+
+ /* read the lead-out track */
+- _obj->tocent[TOTAL_TRACKS].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+- _obj->tocent[TOTAL_TRACKS].cdte_format = CDROM_MSF;
++ p_env->tocent[p_env->gen.i_tracks].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
++ p_env->tocent[p_env->gen.i_tracks].cdte_format = CDROM_MSF;
+
+- if (ioctl(_obj->gen.fd, CDROMREADTOCENTRY,
+- &_obj->tocent[TOTAL_TRACKS]) == -1 ) {
+- cdio_error("%s: %s\n",
++ if (ioctl(p_env->gen.fd, CDROMREADTOCENTRY,
++ &p_env->tocent[p_env->gen.i_tracks]) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for lead-out",
+ strerror(errno));
+ return false;
+ }
+
+ /*
+- struct cdrom_msf0 *msf= &_obj->tocent[TOTAL_TRACKS].cdte_addr.msf;
++ struct cdrom_msf0 *msf= &env->tocent[p_env->gen.i_tracks].cdte_addr.msf;
+
+ fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
+ i, msf->minute, msf->second, msf->frame);
+ */
+
+- _obj->gen.toc_init = true;
++ p_env->gen.toc_init = true;
+ return true;
+ }
+
+-/*
+- * Eject using SCSI commands. Return 1 if successful, 0 otherwise.
+- */
+-static int
+-_cdio_eject_scsi(int fd)
+-{
+- int status;
+- struct sdata {
+- int inlen;
+- int outlen;
+- char cmd[256];
+- } scsi_cmd;
+-
+- scsi_cmd.inlen = 0;
+- scsi_cmd.outlen = 0;
+- scsi_cmd.cmd[0] = ALLOW_MEDIUM_REMOVAL;
+- scsi_cmd.cmd[1] = 0;
+- scsi_cmd.cmd[2] = 0;
+- scsi_cmd.cmd[3] = 0;
+- scsi_cmd.cmd[4] = 0;
+- scsi_cmd.cmd[5] = 0;
+- status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
+- if (status != 0)
+- return 0;
+-
+- scsi_cmd.inlen = 0;
+- scsi_cmd.outlen = 0;
+- scsi_cmd.cmd[0] = START_STOP;
+- scsi_cmd.cmd[1] = 0;
+- scsi_cmd.cmd[2] = 0;
+- scsi_cmd.cmd[3] = 0;
+- scsi_cmd.cmd[4] = 1;
+- scsi_cmd.cmd[5] = 0;
+- status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
+- if (status != 0)
+- return 0;
+-
+- scsi_cmd.inlen = 0;
+- scsi_cmd.outlen = 0;
+- scsi_cmd.cmd[0] = START_STOP;
+- scsi_cmd.cmd[1] = 0;
+- scsi_cmd.cmd[2] = 0;
+- scsi_cmd.cmd[3] = 0;
+- scsi_cmd.cmd[4] = 2;
+- scsi_cmd.cmd[5] = 0;
+- status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
+- if (status != 0)
+- return 0;
+-
+- /* force kernel to reread partition table when new disc inserted */
+- status = ioctl(fd, BLKRRPART);
+- return (status == 0);
+-}
+-
+ /*!
+- Eject media in CD drive.
+- Return 0 if success and 1 for failure, and 2 if no routine.
+- */
+-static int
+-_cdio_eject_media (void *env) {
+-
+- _img_private_t *_obj = env;
+- int ret=2;
+- int status;
+- int fd;
+-
+- close(_obj->gen.fd);
+- _obj->gen.fd = -1;
+- if ((fd = open (_obj->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
+- if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
+- switch(status) {
+- case CDS_TRAY_OPEN:
+- if((ret = ioctl(fd, CDROMCLOSETRAY)) != 0) {
+- cdio_error ("ioctl CDROMCLOSETRAY failed: %s\n", strerror(errno));
+- ret = 1;
+- }
+- break;
+- case CDS_DISC_OK:
+- if((ret = ioctl(fd, CDROMEJECT)) != 0) {
+- int eject_error = errno;
+- /* Try ejecting the SCSI way... */
+- ret = _cdio_eject_scsi(fd);
+- if (0 != ret) {
+- cdio_error("ioctl CDROMEJECT failed: %s\n", strerror(eject_error));
+- ret = 1;
+- }
+- }
+- break;
+- default:
+- cdio_error ("Unknown CD-ROM (%d)\n", status);
+- ret = 1;
+- }
+- } else {
+- cdio_error ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
+- ret=1;
+- }
+- close(fd);
+- return ret;
+- }
+- return 2;
+-}
++ Run a SCSI MMC command.
++
++ cdio CD structure set by cdio_open().
++ i_timeout time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ p_buf Buffer for data, both sending and receiving
++ i_buf Size of buffer
++ e_direction direction the transfer is to go.
++ cdb CDB bytes. All values that are needed should be set on
++ input. We'll figure out what the right CDB length should be.
+
+-/*!
+- Return the value associated with the key "arg".
+-*/
+-static const char *
+-_cdio_get_arg (void *env, const char key[])
++ We return true if command completed successfully and false if not.
++ */
++static int
++run_scsi_cmd_linux( const void *p_user_data,
++ unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
+ {
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source")) {
+- return _obj->gen.source_name;
+- } else if (!strcmp (key, "access-mode")) {
+- switch (_obj->access_mode) {
+- case _AM_IOCTL:
+- return "ioctl";
+- case _AM_READ_CD:
+- return "READ_CD";
+- case _AM_READ_10:
+- return "READ_10";
+- case _AM_NONE:
+- return "no access method";
+- }
+- }
+- return NULL;
+-}
++ const _img_private_t *p_env = p_user_data;
++ struct cdrom_generic_command cgc;
++ memset (&cgc, 0, sizeof (struct cdrom_generic_command));
++ memcpy(&cgc.cmd, p_cdb, i_cdb);
++ cgc.buflen = i_buf;
++ cgc.buffer = p_buf;
++ cgc.data_direction = (SCSI_MMC_DATA_READ == cgc.data_direction)
++ ? CGC_DATA_READ : CGC_DATA_WRITE;
+
+-/*!
+- Return the number of of the first track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_first_track_num(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++#ifdef HAVE_LINUX_CDROM_TIMEOUT
++ cgc.timeout = i_timeout_ms;
++#endif
+
+- return FIRST_TRACK_NUM;
++ return ioctl (p_env->gen.fd, CDROM_SEND_PACKET, &cgc);
+ }
+
+ /*!
+- Return the media catalog number MCN.
+-
+- Note: string is malloc'd so caller should free() then returned
+- string when done with it.
+-
++ Return the size of the CD in logical block address (LBA) units.
+ */
+-static char *
+-_cdio_get_mcn (void *env) {
+-
+- struct cdrom_mcn mcn;
+- _img_private_t *_obj = env;
+- memset(&mcn, 0, sizeof(mcn));
+- if (ioctl(_obj->gen.fd, CDROM_GET_MCN, &mcn) != 0)
+- return NULL;
+- return strdup(mcn.medium_catalog_number);
+-}
+-
+-/*!
+- Return the number of tracks in the current medium.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
++static uint32_t
++stat_size_linux (void *p_user_data)
+ {
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ _img_private_t *p_env = p_user_data;
+
+- return TOTAL_TRACKS;
+-}
++ struct cdrom_tocentry tocent;
++ uint32_t size;
+
+-/*!
+- Get format of track.
+-*/
+-static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
++ tocent.cdte_format = CDROM_LBA;
++ if (ioctl (p_env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
++ {
++ perror ("ioctl(CDROMREADTOCENTRY)");
++ exit (EXIT_FAILURE);
++ }
+
+- if (track_num > TOTAL_TRACKS || track_num == 0)
+- return TRACK_FORMAT_ERROR;
++ size = tocent.cdte_addr.lba;
+
+- /* This is pretty much copied from the "badly broken" cdrom_count_tracks
+- in linux/cdrom.c.
+- */
+- if (_obj->tocent[track_num-1].cdte_ctrl & CDROM_DATA_TRACK) {
+- if (_obj->tocent[track_num-1].cdte_format == 0x10)
+- return TRACK_FORMAT_CDI;
+- else if (_obj->tocent[track_num-1].cdte_format == 0x20)
+- return TRACK_FORMAT_XA;
+- else
+- return TRACK_FORMAT_DATA;
+- } else
+- return TRACK_FORMAT_AUDIO;
+-
++ return size;
+ }
+
+ /*!
+- Return true if we have XA data (green, mode2 form1) or
+- XA data (green, mode2 form2). That is track begins:
+- sync - header - subheader
+- 12 4 - 8
+-
+- FIXME: there's gotta be a better design for this and get_track_format?
+-*/
+-static bool
+-_cdio_get_track_green(void *env, track_t track_num)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
+-
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
+-
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0)
+- return false;
+-
+- /* FIXME: Dunno if this is the right way, but it's what
+- I was using in cdinfo for a while.
+- */
+- return ((_obj->tocent[track_num-1].cdte_ctrl & 2) != 0);
+-}
++ Set the arg "key" with "value" in the source device.
++ Currently "source" and "access-mode" are valid keys.
++ "source" sets the source device in I/O operations
++ "access-mode" sets the the method of CD access
+
+-/*!
+- Return the starting MSF (minutes/secs/frames) for track number
+- track_num in obj. Track numbers start at 1.
+- The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
+- False is returned if there is no track entry.
++ 0 is returned if no error was found, and nonzero if there as an error.
+ */
+-static bool
+-_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
++static int
++set_arg_linux (void *p_user_data, const char key[], const char value[])
+ {
+- _img_private_t *_obj = env;
+-
+- if (NULL == msf) return false;
++ _img_private_t *p_env = p_user_data;
+
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ if (!strcmp (key, "source"))
++ {
++ if (!value)
++ return -2;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ free (p_env->gen.source_name);
++
++ p_env->gen.source_name = strdup (value);
++ }
++ else if (!strcmp (key, "access-mode"))
++ {
++ return str_to_access_mode_linux(value);
++ }
++ else
++ return -1;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
+- return false;
+- } else {
+- struct cdrom_msf0 *msf0= &_obj->tocent[track_num-1].cdte_addr.msf;
+- msf->m = to_bcd8(msf0->minute);
+- msf->s = to_bcd8(msf0->second);
+- msf->f = to_bcd8(msf0->frame);
+- return true;
+- }
++ return 0;
+ }
+
+ /* checklist: /dev/cdrom, /dev/dvd /dev/hd?, /dev/scd? /dev/sr? */
+@@ -947,19 +988,19 @@
+ */
+ for ( i=0; strlen(checklist1[i]) > 0; ++i ) {
+ sprintf(drive, "/dev/%s", checklist1[i]);
+- if ( (exists=cdio_is_cdrom(drive, NULL)) > 0 ) {
++ if ( (exists=is_cdrom_linux(drive, NULL)) > 0 ) {
+ cdio_add_device_list(&drives, drive, &num_drives);
+ }
+ }
+
+ /* Now check the currently mounted CD drives */
+- if (NULL != (ret_drive = cdio_check_mounts("/etc/mtab"))) {
++ if (NULL != (ret_drive = check_mounts_linux("/etc/mtab"))) {
+ cdio_add_device_list(&drives, ret_drive, &num_drives);
+ free(ret_drive);
+ }
+
+ /* Finally check possible mountable drives in /etc/fstab */
+- if (NULL != (ret_drive = cdio_check_mounts("/etc/fstab"))) {
++ if (NULL != (ret_drive = check_mounts_linux("/etc/fstab"))) {
+ cdio_add_device_list(&drives, ret_drive, &num_drives);
+ free(ret_drive);
+ }
+@@ -977,7 +1018,7 @@
+ if ( insert != NULL ) {
+ *insert = j;
+ }
+- if ( (exists=cdio_is_cdrom(drive, NULL)) > 0 ) {
++ if ( (exists=is_cdrom_linux(drive, NULL)) > 0 ) {
+ cdio_add_device_list(&drives, drive, &num_drives);
+ }
+ }
+@@ -1006,17 +1047,17 @@
+ */
+ for ( i=0; strlen(checklist1[i]) > 0; ++i ) {
+ sprintf(drive, "/dev/%s", checklist1[i]);
+- if ( (exists=cdio_is_cdrom(drive, NULL)) > 0 ) {
++ if ( (exists=is_cdrom_linux(drive, NULL)) > 0 ) {
+ return strdup(drive);
+ }
+ }
+
+ /* Now check the currently mounted CD drives */
+- if (NULL != (ret_drive = cdio_check_mounts("/etc/mtab")))
++ if (NULL != (ret_drive = check_mounts_linux("/etc/mtab")))
+ return ret_drive;
+
+ /* Finally check possible mountable drives in /etc/fstab */
+- if (NULL != (ret_drive = cdio_check_mounts("/etc/fstab")))
++ if (NULL != (ret_drive = check_mounts_linux("/etc/fstab")))
+ return ret_drive;
+
+ /* Scan the system for CD-ROM drives.
+@@ -1032,7 +1073,7 @@
+ if ( insert != NULL ) {
+ *insert = j;
+ }
+- if ( (exists=cdio_is_cdrom(drive, NULL)) > 0 ) {
++ if ( (exists=is_cdrom_linux(drive, NULL)) > 0 ) {
+ return(strdup(drive));
+ }
+ }
+@@ -1046,57 +1087,91 @@
+ ones to set that up.
+ */
+ CdIo *
+-cdio_open_linux (const char *orig_source_name)
++cdio_open_linux (const char *psz_source_name)
++{
++ return cdio_open_am_linux(psz_source_name, NULL);
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_linux (const char *psz_orig_source, const char *access_mode)
+ {
+
+ #ifdef HAVE_LINUX_CDROM
+ CdIo *ret;
+ _img_private_t *_data;
+- char *source_name;
++ char *psz_source;
+
+ cdio_funcs _funcs = {
+- .eject_media = _cdio_eject_media,
++ .eject_media = eject_media_linux,
+ .free = cdio_generic_free,
+- .get_arg = _cdio_get_arg,
+- .get_devices = cdio_get_devices_linux,
++ .get_arg = get_arg_linux,
++ .get_cdtext = get_cdtext_generic,
+ .get_default_device = cdio_get_default_device_linux,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_mcn = _cdio_get_mcn,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
++ .get_devices = cdio_get_devices_linux,
++ .get_discmode = get_discmode_linux,
++#if USE_LINUX_CAP
++ .get_drive_cap = get_drive_cap_linux,
++#else
++ .get_drive_cap = scsi_mmc_get_drive_cap_generic,
++#endif
++ .get_first_track_num= get_first_track_num_generic,
++ .get_hwinfo = NULL,
++ .get_mcn = get_mcn_linux,
++ .get_num_tracks = get_num_tracks_generic,
++ .get_track_format = get_track_format_linux,
++ .get_track_green = get_track_green_linux,
+ .get_track_lba = NULL, /* This could be implemented if need be. */
+- .get_track_msf = _cdio_get_track_msf,
++ .get_track_msf = get_track_msf_linux,
+ .lseek = cdio_generic_lseek,
+ .read = cdio_generic_read,
+- .read_audio_sectors = _cdio_read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .set_arg = _cdio_set_arg,
+- .stat_size = _cdio_stat_size
++ .read_audio_sectors = _read_audio_sectors_linux,
++ .read_mode1_sector = _read_mode1_sector_linux,
++ .read_mode1_sectors = _read_mode1_sectors_linux,
++ .read_mode2_sector = _read_mode2_sector_linux,
++ .read_mode2_sectors = _read_mode2_sectors_linux,
++ .read_toc = read_toc_linux,
++ .run_scsi_mmc_cmd = run_scsi_cmd_linux,
++ .set_arg = set_arg_linux,
++ .stat_size = stat_size_linux
+ };
+
+ _data = _cdio_malloc (sizeof (_img_private_t));
+- _data->access_mode = _AM_READ_CD;
++
++ _data->access_mode = str_to_access_mode_linux(access_mode);
+ _data->gen.init = false;
++ _data->gen.toc_init = false;
+ _data->gen.fd = -1;
++ _data->gen.b_cdtext_init = false;
++ _data->gen.b_cdtext_error = false;
+
+- if (NULL == orig_source_name) {
+- source_name=cdio_get_default_device_linux();
+- if (NULL == source_name) return NULL;
+- _cdio_set_arg(_data, "source", source_name);
+- free(source_name);
+- } else
+- _cdio_set_arg(_data, "source", orig_source_name);
++ if (NULL == psz_orig_source) {
++ psz_source=cdio_get_default_device_linux();
++ if (NULL == psz_source) return NULL;
++ set_arg_linux(_data, "source", psz_source);
++ free(psz_source);
++ } else {
++ if (cdio_is_device_generic(psz_orig_source))
++ set_arg_linux(_data, "source", psz_orig_source);
++ else {
++ /* The below would be okay if all device drivers worked this way. */
++#if 0
++ cdio_info ("source %s is not a device", psz_orig_source);
++#endif
++ return NULL;
++ }
++ }
+
+- ret = cdio_new (_data, &_funcs);
++ ret = cdio_new ((void *)_data, &_funcs);
+ if (ret == NULL) return NULL;
+
+- if (cdio_generic_init(_data))
++ if (cdio_generic_init(_data)) {
+ return ret;
+- else {
++ } else {
+ cdio_generic_free (_data);
+ return NULL;
+ }
+@@ -1116,5 +1191,3 @@
+ return false;
+ #endif /* HAVE_LINUX_CDROM */
+ }
+-
+-
+--- ./src/input/vcd/libcdio/_cdio_osx.c 20 Oct 2004 05:04:00 -0000 1.3
++++ ./src/input/vcd/libcdio/_cdio_osx.c 3 Jan 2005 21:13:56 -0000 1.3.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: _cdio_osx.c,v 1.3 2004/10/20 05:04:00 athp Exp $
++ $Id: _cdio_osx.c,v 1.3.2.1 2005/01/03 21:13:56 mroi Exp $
+
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+ from vcdimager code:
+@@ -9,6 +9,7 @@
+ Gildas Bazin <gbazin@netcourrier.com>
+ Jon Lech Johansen <jon-vl@nanocrew.net>
+ Derk-Jan Hartman <hartman at videolan.org>
++ Justin F. Hallett <thesin@southofheaven.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -30,11 +31,12 @@
+ */
+
+ #ifdef HAVE_CONFIG_H
+-# include "config.h"
++#include "config.h"
+ #endif
+
+-static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.3 2004/10/20 05:04:00 athp Exp $";
++static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.3.2.1 2005/01/03 21:13:56 mroi Exp $";
+
++#include <cdio/logging.h>
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
+ #include "cdio_assert.h"
+@@ -43,6 +45,17 @@
+ #include <string.h>
+
+ #ifdef HAVE_DARWIN_CDROM
++#undef VERSION
++
++#include <CoreFoundation/CoreFoundation.h>
++#include <IOKit/IOKitLib.h>
++#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
++
++#include <mach/mach.h>
++#include <Carbon/Carbon.h>
++#include <IOKit/scsi-commands/SCSITaskLib.h>
++#include <IOKit/IOCFPlugIn.h>
++#include <mach/mach_error.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -54,72 +67,575 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+
++
+ #include <paths.h>
+-#include <CoreFoundation/CFBase.h>
+-#include <CoreFoundation/CFString.h>
+-#include <CoreFoundation/CFNumber.h>
++#include <CoreFoundation/CoreFoundation.h>
+ #include <IOKit/IOKitLib.h>
+ #include <IOKit/IOBSD.h>
++#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
+ #include <IOKit/storage/IOCDTypes.h>
++#include <IOKit/storage/IODVDTypes.h>
+ #include <IOKit/storage/IOMedia.h>
+ #include <IOKit/storage/IOCDMedia.h>
++#include <IOKit/storage/IODVDMedia.h>
+ #include <IOKit/storage/IOCDMediaBSDClient.h>
++#include <IOKit/storage/IODVDMediaBSDClient.h>
++#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
++
++#define kIOCDBlockStorageDeviceClassString "IOCDBlockStorageDevice"
++
++/* Note leadout is normally defined 0xAA, But on OSX 0xA0 is "lead in" while
++ 0xA2 is "lead out". Don't ask me why. */
++#define OSX_CDROM_LEADOUT_TRACK 0xA2
+
+-#define TOTAL_TRACKS (_obj->num_tracks)
++#define TOTAL_TRACKS (p_env->i_last_track - p_env->gen.i_first_track + 1)
+
++#define CDROM_CDI_TRACK 0x1
++#define CDROM_XA_TRACK 0x2
++
++typedef enum {
++ _AM_NONE,
++ _AM_OSX,
++} access_mode_t;
++
++#define MAX_SERVICE_NAME 1000
+ typedef struct {
+ /* Things common to all drivers like this.
+ This must be first. */
+ generic_img_private_t gen;
+
+- enum {
+- _AM_NONE,
+- _AM_OSX,
+- } access_mode;
++ access_mode_t access_mode;
+
+ /* Track information */
+- bool toc_init; /* if true, info below is valid. */
+ CDTOC *pTOC;
+ int i_descriptors;
+- track_t num_tracks;
++ track_t i_last_track; /* highest track number */
++ track_t i_last_session; /* highest session number */
++ track_t i_first_session; /* first session number */
+ lsn_t *pp_lba;
++ io_service_t MediaClass_service;
++ char psz_MediaClass_service[MAX_SERVICE_NAME];
++ SCSITaskDeviceInterface **pp_scsiTaskDeviceInterface;
+
+ } _img_private_t;
+
+-static void
+-_cdio_osx_free (void *env) {
+- _img_private_t *_obj = env;
+- if (NULL == _obj) return;
+- cdio_generic_free(_obj);
+- if (NULL != _obj->pp_lba) free((void *) _obj->pp_lba);
+- if (NULL != _obj->pTOC) free((void *) _obj->pTOC);
++static bool read_toc_osx (void *p_user_data);
++
++/****
++ * GetRegistryEntryProperties - Gets the registry entry properties for
++ * an io_service_t.
++ *****/
++
++static CFMutableDictionaryRef
++GetRegistryEntryProperties ( io_service_t service )
++{
++ IOReturn err = kIOReturnSuccess;
++ CFMutableDictionaryRef dict = 0;
++
++ err = IORegistryEntryCreateCFProperties (service, &dict, kCFAllocatorDefault, 0);
++ if ( err != kIOReturnSuccess )
++ cdio_warn( "IORegistryEntryCreateCFProperties: 0x%08x", err );
++
++ return dict;
+ }
+
+-/****************************************************************************
+- cdio_getNumberOfTracks: get number of tracks in TOC
+- This is an internal routine and is called once per CD open.
+- ****************************************************************************/
+-static track_t
+-_cdio_getNumberOfTracks( CDTOC *pTOC, int i_descriptors )
++
++static bool
++init_osx(_img_private_t *p_env) {
++ mach_port_t port;
++ char *psz_devname;
++ kern_return_t ret;
++ io_iterator_t iterator;
++
++ p_env->gen.fd = open( p_env->gen.source_name, O_RDONLY | O_NONBLOCK );
++ if (-1 == p_env->gen.fd) {
++ cdio_warn("Failed to open %s: %s", p_env->gen.source_name,
++ strerror(errno));
++ return false;
++ }
++
++ /* get the device name */
++ psz_devname = strrchr( p_env->gen.source_name, '/');
++ if( NULL != psz_devname )
++ ++psz_devname;
++ else
++ psz_devname = p_env->gen.source_name;
++
++ /* unraw the device name */
++ if( *psz_devname == 'r' )
++ ++psz_devname;
++
++ /* get port for IOKit communication */
++ ret = IOMasterPort( MACH_PORT_NULL, &port );
++
++ if( ret != KERN_SUCCESS )
++ {
++ cdio_warn( "IOMasterPort: 0x%08x", ret );
++ return false;
++ }
++
++ ret = IOServiceGetMatchingServices( port,
++ IOBSDNameMatching(port, 0, psz_devname),
++ &iterator );
++
++ /* get service iterator for the device */
++ if( ret != KERN_SUCCESS )
++ {
++ cdio_warn( "IOServiceGetMatchingServices: 0x%08x", ret );
++ return false;
++ }
++
++ /* first service */
++ p_env->MediaClass_service = IOIteratorNext( iterator );
++ IOObjectRelease( iterator );
++
++ /* search for kIOCDMediaClass or kIOCDVDMediaClass */
++ while( p_env->MediaClass_service &&
++ (!IOObjectConformsTo(p_env->MediaClass_service, kIOCDMediaClass)) &&
++ (!IOObjectConformsTo(p_env->MediaClass_service, kIODVDMediaClass)) )
++ {
++
++ ret = IORegistryEntryGetParentIterator( p_env->MediaClass_service,
++ kIOServicePlane,
++ &iterator );
++ if( ret != KERN_SUCCESS )
++ {
++ cdio_warn( "IORegistryEntryGetParentIterator: 0x%08x", ret );
++ IOObjectRelease( p_env->MediaClass_service );
++ return false;
++ }
++
++ IOObjectRelease( p_env->MediaClass_service );
++ p_env->MediaClass_service = IOIteratorNext( iterator );
++ IOObjectRelease( iterator );
++ }
++
++ if ( 0 == p_env->MediaClass_service ) {
++ cdio_warn( "search for kIOCDMediaClass/kIODVDMediaClass came up empty" );
++ return false;
++ }
++
++ /* Save the name so we can compare against this in case we have to do
++ another scan. FIXME: this is hoaky and there's got to be a better
++ variable to test or way to do.
++ */
++ IORegistryEntryGetPath(p_env->MediaClass_service, kIOServicePlane,
++ p_env->psz_MediaClass_service);
++ return true;
++}
++
++/*!
++ Run a SCSI MMC command.
++
++ cdio CD structure set by cdio_open().
++ i_timeout time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ p_buf Buffer for data, both sending and receiving
++ i_buf Size of buffer
++ e_direction direction the transfer is to go.
++ cdb CDB bytes. All values that are needed should be set on
++ input. We'll figure out what the right CDB length should be.
++
++ We return true if command completed successfully and false if not.
++ */
++static int
++run_scsi_cmd_osx( const void *p_user_data,
++ unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
+ {
+- track_t track = CDIO_INVALID_TRACK;
+- int i;
+- int i_tracks = 0;
+- CDTOCDescriptor *pTrackDescriptors;
+
+- pTrackDescriptors = pTOC->descriptors;
++#ifndef SCSI_MMC_FIXED
++ return 2;
++#else
++ const _img_private_t *p_env = p_user_data;
++ SCSITaskDeviceInterface **sc;
++ SCSITaskInterface **cmd = NULL;
++ IOVirtualRange iov;
++ SCSI_Sense_Data senseData;
++ SCSITaskStatus status;
++ UInt64 bytesTransferred;
++ IOReturn ioReturnValue;
++ int ret = 0;
++
++ if (NULL == p_user_data) return 2;
++
++ /* Make sure pp_scsiTaskDeviceInterface is initialized. FIXME: The code
++ should probably be reorganized better for this. */
++ if (!p_env->gen.toc_init) read_toc_osx (p_user_data) ;
++
++ sc = p_env->pp_scsiTaskDeviceInterface;
++
++ if (NULL == sc) return 3;
++
++ cmd = (*sc)->CreateSCSITask(sc);
++ if (cmd == NULL) {
++ cdio_warn("Failed to create SCSI task");
++ return -1;
++ }
++
++ iov.address = (IOVirtualAddress) p_buf;
++ iov.length = i_buf;
++
++ ioReturnValue = (*cmd)->SetCommandDescriptorBlock(cmd, (UInt8 *) p_cdb,
++ i_cdb);
++ if (ioReturnValue != kIOReturnSuccess) {
++ cdio_warn("SetCommandDescriptorBlock failed with status %x",
++ ioReturnValue);
++ return -1;
++ }
++
++ ioReturnValue = (*cmd)->SetScatterGatherEntries(cmd, &iov, 1, i_buf,
++ (SCSI_MMC_DATA_READ == e_direction ) ?
++ kSCSIDataTransfer_FromTargetToInitiator :
++ kSCSIDataTransfer_FromInitiatorToTarget);
++ if (ioReturnValue != kIOReturnSuccess) {
++ cdio_warn("SetScatterGatherEntries failed with status %x", ioReturnValue);
++ return -1;
++ }
++
++ ioReturnValue = (*cmd)->SetTimeoutDuration(cmd, i_timeout_ms );
++ if (ioReturnValue != kIOReturnSuccess) {
++ cdio_warn("SetTimeoutDuration failed with status %x", ioReturnValue);
++ return -1;
++ }
++
++ memset(&senseData, 0, sizeof(senseData));
++
++ ioReturnValue = (*cmd)->ExecuteTaskSync(cmd,&senseData, &status, &
++ bytesTransferred);
++
++ if (ioReturnValue != kIOReturnSuccess) {
++ cdio_warn("Command execution failed with status %x", ioReturnValue);
++ return -1;
++ }
++
++ if (cmd != NULL) {
++ (*cmd)->Release(cmd);
++ }
++
++ return (ret);
++#endif
++}
++
++/***************************************************************************
++ * GetDeviceIterator - Gets an io_iterator_t for our class type
++ ***************************************************************************/
++
++static io_iterator_t
++GetDeviceIterator ( const char * deviceClass )
++{
++
++ IOReturn err = kIOReturnSuccess;
++ io_iterator_t iterator = MACH_PORT_NULL;
++
++ err = IOServiceGetMatchingServices ( kIOMasterPortDefault,
++ IOServiceMatching ( deviceClass ),
++ &iterator );
++ check ( err == kIOReturnSuccess );
++
++ return iterator;
++
++}
++
++/***************************************************************************
++ * GetFeaturesFlagsForDrive -Gets the bitfield which represents the
++ * features flags.
++ ***************************************************************************/
++
++static bool
++GetFeaturesFlagsForDrive ( CFDictionaryRef dict,
++ uint32_t *i_cdFlags,
++ uint32_t *i_dvdFlags )
++{
++ CFDictionaryRef propertiesDict = 0;
++ CFNumberRef flagsNumberRef = 0;
++
++ *i_cdFlags = 0;
++ *i_dvdFlags= 0;
++
++ propertiesDict = ( CFDictionaryRef )
++ CFDictionaryGetValue ( dict,
++ CFSTR ( kIOPropertyDeviceCharacteristicsKey ) );
++
++ if ( propertiesDict == 0 ) return false;
++
++ /* Get the CD features */
++ flagsNumberRef = ( CFNumberRef )
++ CFDictionaryGetValue ( propertiesDict,
++ CFSTR ( kIOPropertySupportedCDFeatures ) );
++ if ( flagsNumberRef != 0 ) {
++ CFNumberGetValue ( flagsNumberRef, kCFNumberLongType, i_cdFlags );
++ }
++
++ /* Get the DVD features */
++ flagsNumberRef = ( CFNumberRef )
++ CFDictionaryGetValue ( propertiesDict,
++ CFSTR ( kIOPropertySupportedDVDFeatures ) );
++ if ( flagsNumberRef != 0 ) {
++ CFNumberGetValue ( flagsNumberRef, kCFNumberLongType, i_dvdFlags );
++ }
++
++ return true;
++}
++
++/*!
++ Get disc type associated with the cd object.
++*/
++static discmode_t
++get_discmode_osx (void *p_user_data)
++{
++ _img_private_t *p_env = p_user_data;
++ char str[10];
++ int32_t i_discmode = CDIO_DISC_MODE_ERROR;
++ CFDictionaryRef propertiesDict = 0;
++ CFStringRef data;
++
++ propertiesDict = GetRegistryEntryProperties ( p_env->MediaClass_service );
++
++ if ( propertiesDict == 0 ) return i_discmode;
++
++ data = ( CFStringRef )
++ CFDictionaryGetValue ( propertiesDict, CFSTR ( kIODVDMediaTypeKey ) );
++
++ if( CFStringGetCString( data, str, sizeof(str),
++ kCFStringEncodingASCII ) ) {
++ if (0 == strncmp(str, "DVD+R", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_PR;
++ else if (0 == strncmp(str, "DVD+RW", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_PRW;
++ else if (0 == strncmp(str, "DVD-R", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_R;
++ else if (0 == strncmp(str, "DVD-RW", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_RW;
++ else if (0 == strncmp(str, "DVD-ROM", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_ROM;
++ else if (0 == strncmp(str, "DVD-RAM", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_DVD_RAM;
++ else if (0 == strncmp(str, "CD-ROM", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_CD_DATA;
++ else if (0 == strncmp(str, "CDR", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_CD_DATA;
++ else if (0 == strncmp(str, "CDRW", strlen(str)) )
++ i_discmode = CDIO_DISC_MODE_CD_DATA;
++ //?? Handled by below? CFRelease( data );
++ }
++ CFRelease( propertiesDict );
++ if (CDIO_DISC_MODE_CD_DATA == i_discmode) {
++ /* Need to do more classification */
++ return get_discmode_cd_generic(p_user_data);
++ }
++ return i_discmode;
+
+- for( i = i_descriptors; i >= 0; i-- )
++}
++
++static io_service_t
++get_drive_service_osx(const _img_private_t *p_env)
++{
++ io_service_t service;
++ io_iterator_t service_iterator;
++
++ service_iterator = GetDeviceIterator ( kIOCDBlockStorageDeviceClassString );
++
++ if( service_iterator == MACH_PORT_NULL ) return 0;
++
++ service = IOIteratorNext( service_iterator );
++ if( service == 0 ) return 0;
++
++ do
+ {
+- track = pTrackDescriptors[i].point;
++ char psz_service[MAX_SERVICE_NAME];
++ IORegistryEntryGetPath(service, kIOServicePlane, psz_service);
++ psz_service[MAX_SERVICE_NAME-1] = '\0';
++
++ /* FIXME: This is all hoaky. Here we need info from a parent class,
++ psz_service of what we opened above. We are relying on the
++ fact that the name will be a substring of the name we
++ openned with.
++ */
++ if (0 == strncmp(psz_service, p_env->psz_MediaClass_service,
++ strlen(psz_service))) {
++ /* Found our device */
++ IOObjectRelease( service_iterator );
++ return service;
++ }
++
++ IOObjectRelease( service );
++
++ } while( ( service = IOIteratorNext( service_iterator ) ) != 0 );
++
++ IOObjectRelease( service_iterator );
++ return service;
++}
+
+- if( track > CDIO_CD_MAX_TRACKS || track < CDIO_CD_MIN_TRACK_NO )
+- continue;
++static void
++get_drive_cap_osx(const void *p_user_data,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ const _img_private_t *p_env = p_user_data;
++ uint32_t i_cdFlags;
++ uint32_t i_dvdFlags;
++
++ io_service_t service = get_drive_service_osx(p_env);
++
++ if( service == 0 ) goto err_exit;
+
+- i_tracks++;
++ /* Found our device */
++ {
++ CFDictionaryRef properties = GetRegistryEntryProperties ( service );
++
++ if (! GetFeaturesFlagsForDrive ( properties, &i_cdFlags,
++ &i_dvdFlags ) ) {
++ IOObjectRelease( service );
++ goto err_exit;
+ }
++
++ /* Reader */
++
++ if ( 0 != (i_cdFlags & kCDFeaturesAnalogAudioMask) )
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_AUDIO;
++
++ if ( 0 != (i_cdFlags & kCDFeaturesWriteOnceMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_R;
++
++ if ( 0 != (i_cdFlags & kCDFeaturesCDDAStreamAccurateMask) )
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_DA;
++
++ if ( 0 != (i_dvdFlags & kDVDFeaturesReadStructuresMask) )
++ *p_read_cap |= CDIO_DRIVE_CAP_READ_DVD_ROM;
++
++ if ( 0 != (i_cdFlags & kCDFeaturesReWriteableMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_RW;
++
++ if ( 0 != (i_dvdFlags & kDVDFeaturesWriteOnceMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_R;
++
++ if ( 0 != (i_dvdFlags & kDVDFeaturesRandomWriteableMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RAM;
++
++ if ( 0 != (i_dvdFlags & kDVDFeaturesReWriteableMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RW;
++
++ /***
++ if ( 0 != (i_dvdFlags & kDVDFeaturesPlusRMask) )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_PR;
++
++ if ( 0 != (i_dvdFlags & kDVDFeaturesPlusRWMask )
++ *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_PRW;
++ ***/
++
++ /* FIXME: fill out. For now assume CD-ROM is relatively modern. */
++ *p_misc_cap = (
++ CDIO_DRIVE_CAP_MISC_CLOSE_TRAY
++ | CDIO_DRIVE_CAP_MISC_EJECT
++ | CDIO_DRIVE_CAP_MISC_LOCK
++ | CDIO_DRIVE_CAP_MISC_SELECT_SPEED
++ | CDIO_DRIVE_CAP_MISC_MULTI_SESSION
++ | CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED
++ | CDIO_DRIVE_CAP_MISC_RESET
++ | CDIO_DRIVE_CAP_MCN
++ | CDIO_DRIVE_CAP_ISRC
++ );
++
++ IOObjectRelease( service );
++ }
++
++ return;
++
++ err_exit:
++ *p_misc_cap = *p_write_cap = *p_read_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ return;
++}
++
++#if 1
++/****************************************************************************
++ * GetDriveDescription - Gets drive description.
++ ****************************************************************************/
++
++static bool
++get_hwinfo_osx ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
++{
++ _img_private_t *p_env = (_img_private_t *) p_cdio->env;
++ io_service_t service = get_drive_service_osx(p_env);
++
++ if ( service == 0 ) return false;
++
++ /* Found our device */
++ {
++ CFStringRef vendor = NULL;
++ CFStringRef product = NULL;
++ CFStringRef revision = NULL;
++
++ CFDictionaryRef properties = GetRegistryEntryProperties ( service );
++ CFDictionaryRef deviceDict = ( CFDictionaryRef )
++ CFDictionaryGetValue ( properties,
++ CFSTR ( kIOPropertyDeviceCharacteristicsKey ) );
++
++ if ( deviceDict == 0 ) return false;
++
++ vendor = ( CFStringRef )
++ CFDictionaryGetValue ( deviceDict, CFSTR ( kIOPropertyVendorNameKey ) );
++
++ if ( CFStringGetCString( vendor,
++ (char *) &(hw_info->psz_vendor),
++ sizeof(hw_info->psz_vendor),
++ kCFStringEncodingASCII ) )
++ CFRelease( vendor );
++
++ product = ( CFStringRef )
++ CFDictionaryGetValue ( deviceDict, CFSTR ( kIOPropertyProductNameKey ) );
++
++ if ( CFStringGetCString( product,
++ (char *) &(hw_info->psz_model),
++ sizeof(hw_info->psz_model),
++ kCFStringEncodingASCII ) )
++ CFRelease( product );
++
++ revision = ( CFStringRef )
++ CFDictionaryGetValue ( deviceDict,
++ CFSTR ( kIOPropertyProductRevisionLevelKey ) );
++
++ if ( CFStringGetCString( product,
++ (char *) &(hw_info->psz_revision),
++ sizeof(hw_info->psz_revision),
++ kCFStringEncodingASCII ) )
++ CFRelease( revision );
++ }
++ return true;
++
++}
++#endif
++
++/*!
++ Return the media catalog number MCN.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++static const cdtext_t *
++get_cdtext_osx (void *p_user_data, track_t i_track)
++{
++ return NULL;
++}
++
++static void
++_free_osx (void *p_user_data) {
++ _img_private_t *p_env = p_user_data;
++ if (NULL == p_env) return;
++ cdio_generic_free(p_env);
++ if (NULL != p_env->pp_lba) free((void *) p_env->pp_lba);
++ if (NULL != p_env->pTOC) free((void *) p_env->pTOC);
++ IOObjectRelease( p_env->MediaClass_service );
++
++ if (NULL != p_env->pp_scsiTaskDeviceInterface)
++ ( *(p_env->pp_scsiTaskDeviceInterface) )->
++ Release ( (p_env->pp_scsiTaskDeviceInterface) );
+
+- return( i_tracks );
+ }
+
+ /*!
+@@ -128,10 +644,10 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
+- bool is_form2, unsigned int nblocks)
++_get_read_mode1_sectors_osx (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ dk_cd_read_t cd_read;
+
+ memset( &cd_read, 0, sizeof(cd_read) );
+@@ -140,7 +656,7 @@
+ cd_read.buffer = data;
+ cd_read.sectorType = kCDSectorTypeMode1;
+
+- if (is_form2) {
++ if (b_form2) {
+ cd_read.offset = lsn * kCDSectorSizeMode2;
+ cd_read.bufferLength = kCDSectorSizeMode2 * nblocks;
+ } else {
+@@ -148,9 +664,9 @@
+ cd_read.bufferLength = kCDSectorSizeMode1 * nblocks;
+ }
+
+- if( ioctl( _obj->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
++ if( ioctl( env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
+ {
+- cdio_error( "could not read block %d, %s", lsn, strerror(errno) );
++ cdio_info( "could not read block %d, %s", lsn, strerror(errno) );
+ return -1;
+ }
+ return 0;
+@@ -163,10 +679,10 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
+- bool is_form2, unsigned int nblocks)
++_get_read_mode2_sectors_osx (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ dk_cd_read_t cd_read;
+
+ memset( &cd_read, 0, sizeof(cd_read) );
+@@ -174,7 +690,7 @@
+ cd_read.sectorArea = kCDSectorAreaUser;
+ cd_read.buffer = data;
+
+- if (is_form2) {
++ if (b_form2) {
+ cd_read.offset = lsn * kCDSectorSizeMode2Form2;
+ cd_read.sectorType = kCDSectorTypeMode2Form2;
+ cd_read.bufferLength = kCDSectorSizeMode2Form2 * nblocks;
+@@ -184,9 +700,9 @@
+ cd_read.bufferLength = kCDSectorSizeMode2Form1 * nblocks;
+ }
+
+- if( ioctl( _obj->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
++ if( ioctl( env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
+ {
+- cdio_error( "could not read block %d, %s", lsn, strerror(errno) );
++ cdio_info( "could not read block %d, %s", lsn, strerror(errno) );
+ return -1;
+ }
+ return 0;
+@@ -198,24 +714,24 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
+- unsigned int nblocks)
++_get_read_audio_sectors_osx (void *user_data, void *data, lsn_t lsn,
++ unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ dk_cd_read_t cd_read;
+
+ memset( &cd_read, 0, sizeof(cd_read) );
+
+- cd_read.offset = lsn * kCDSectorSizeCDDA;
+- cd_read.sectorArea = kCDSectorAreaUser;
+- cd_read.sectorType = kCDSectorTypeCDDA;
++ cd_read.offset = lsn * kCDSectorSizeCDDA;
++ cd_read.sectorArea = kCDSectorAreaUser;
++ cd_read.sectorType = kCDSectorTypeCDDA;
+
+- cd_read.buffer = data;
++ cd_read.buffer = data;
+ cd_read.bufferLength = kCDSectorSizeCDDA * nblocks;
+
+- if( ioctl( _obj->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
++ if( ioctl( env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
+ {
+- cdio_error( "could not read block %d", lsn );
++ cdio_info( "could not read block %d", lsn );
+ return -1;
+ }
+ return 0;
+@@ -226,10 +742,10 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
+- bool is_form2)
++_get_read_mode1_sector_osx (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
+ {
+- return _cdio_read_mode1_sectors(env, data, lsn, is_form2, 1);
++ return _get_read_mode1_sectors_osx(user_data, data, lsn, b_form2, 1);
+ }
+
+ /*!
+@@ -237,35 +753,35 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
+- bool is_form2)
++_get_read_mode2_sector_osx (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
+ {
+- return _cdio_read_mode2_sectors(env, data, lsn, is_form2, 1);
++ return _get_read_mode2_sectors_osx(user_data, data, lsn, b_form2, 1);
+ }
+
+ /*!
+ Set the key "arg" to "value" in source device.
+ */
+ static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
++_set_arg_osx (void *user_data, const char key[], const char value[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+ if (!strcmp (key, "source"))
+ {
+ if (!value)
+ return -2;
+
+- free (_obj->gen.source_name);
++ free (env->gen.source_name);
+
+- _obj->gen.source_name = strdup (value);
++ env->gen.source_name = strdup (value);
+ }
+ else if (!strcmp (key, "access-mode"))
+ {
+ if (!strcmp(value, "OSX"))
+- _obj->access_mode = _AM_OSX;
++ env->access_mode = _AM_OSX;
+ else
+- cdio_error ("unknown access type: %s. ignored.", value);
++ cdio_warn ("unknown access type: %s. ignored.", value);
+ }
+ else
+ return -1;
+@@ -273,168 +789,194 @@
+ return 0;
+ }
+
++#if 0
++static void TestDevice(_img_private_t *p_env, io_service_t service)
++{
++ SInt32 score;
++ HRESULT herr;
++ kern_return_t err;
++ IOCFPlugInInterface **plugInInterface = NULL;
++ MMCDeviceInterface **mmcInterface = NULL;
++
++ /* Create the IOCFPlugIn interface so we can query it. */
++
++ err = IOCreatePlugInInterfaceForService ( service,
++ kIOMMCDeviceUserClientTypeID,
++ kIOCFPlugInInterfaceID,
++ &plugInInterface,
++ &score );
++ if ( err != noErr ) {
++ printf("IOCreatePlugInInterfaceForService returned %d\n", err);
++ return;
++ }
++
++ /* Query the interface for the MMCDeviceInterface. */
++
++ herr = ( *plugInInterface )->QueryInterface ( plugInInterface,
++ CFUUIDGetUUIDBytes ( kIOMMCDeviceInterfaceID ),
++ ( LPVOID ) &mmcInterface );
++
++ if ( herr != S_OK ) {
++ printf("QueryInterface returned %ld\n", herr);
++ return;
++ }
++
++ p_env->pp_scsiTaskDeviceInterface =
++ ( *mmcInterface )->GetSCSITaskDeviceInterface ( mmcInterface );
++
++ if ( NULL == p_env->pp_scsiTaskDeviceInterface ) {
++ printf("GetSCSITaskDeviceInterface returned NULL\n");
++ return;
++ }
++
++ ( *mmcInterface )->Release ( mmcInterface );
++ IODestroyPlugInInterface ( plugInInterface );
++}
++#endif
++
+ /*!
+ Read and cache the CD's Track Table of Contents and track info.
+ Return false if successful or true if an error.
+ */
+ static bool
+-_cdio_read_toc (_img_private_t *_obj)
++read_toc_osx (void *p_user_data)
+ {
+- mach_port_t port;
+- char *psz_devname;
+- kern_return_t ret;
+- io_iterator_t iterator;
+- io_registry_entry_t service;
+- CFMutableDictionaryRef properties;
++ _img_private_t *p_env = p_user_data;
++ CFDictionaryRef propertiesDict = 0;
+ CFDataRef data;
+-
+- _obj->gen.fd = open( _obj->gen.source_name, O_RDONLY | O_NONBLOCK );
+- if (-1 == _obj->gen.fd) {
+- cdio_error("Failed to open %s: %s", _obj->gen.source_name,
+- strerror(errno));
++
++ /* create a CF dictionary containing the TOC */
++ propertiesDict = GetRegistryEntryProperties( p_env->MediaClass_service );
++
++ if ( 0 == propertiesDict ) {
+ return false;
+ }
+
+- /* get the device name */
+- if( ( psz_devname = strrchr( _obj->gen.source_name, '/') ) != NULL )
+- ++psz_devname;
+- else
+- psz_devname = _obj->gen.source_name;
+-
+- /* unraw the device name */
+- if( *psz_devname == 'r' )
+- ++psz_devname;
+-
+- /* get port for IOKit communication */
+- if( ( ret = IOMasterPort( MACH_PORT_NULL, &port ) ) != KERN_SUCCESS )
+- {
+- cdio_error( "IOMasterPort: 0x%08x", ret );
+- return false;
+- }
+-
+- /* get service iterator for the device */
+- if( ( ret = IOServiceGetMatchingServices(
+- port, IOBSDNameMatching( port, 0, psz_devname ),
+- &iterator ) ) != KERN_SUCCESS )
+- {
+- cdio_error( "IOServiceGetMatchingServices: 0x%08x", ret );
+- return false;
+- }
+-
+- /* first service */
+- service = IOIteratorNext( iterator );
+- IOObjectRelease( iterator );
+-
+- /* search for kIOCDMediaClass */
+- while( service && !IOObjectConformsTo( service, kIOCDMediaClass ) )
+- {
+-
+- ret = IORegistryEntryGetParentIterator( service, kIOServicePlane,
+- &iterator );
+- if( ret != KERN_SUCCESS )
+- {
+- cdio_error( "IORegistryEntryGetParentIterator: 0x%08x", ret );
+- IOObjectRelease( service );
+- return false;
+- }
+-
+- IOObjectRelease( service );
+- service = IOIteratorNext( iterator );
+- IOObjectRelease( iterator );
+- }
+-
+- if( service == 0 )
+- {
+- cdio_error( "search for kIOCDMediaClass came up empty" );
+- return false;
+- }
+-
+- /* create a CF dictionary containing the TOC */
+- ret = IORegistryEntryCreateCFProperties( service, &properties,
+- kCFAllocatorDefault, kNilOptions );
+-
+- if( ret != KERN_SUCCESS )
+- {
+- cdio_error( "IORegistryEntryCreateCFProperties: 0x%08x", ret );
+- IOObjectRelease( service );
+- return false;
+- }
+-
+ /* get the TOC from the dictionary */
+- data = (CFDataRef) CFDictionaryGetValue( properties,
++ data = (CFDataRef) CFDictionaryGetValue( propertiesDict,
+ CFSTR(kIOCDMediaTOCKey) );
+- if( data != NULL )
+- {
+- CFRange range;
+- CFIndex buf_len;
+-
+- buf_len = CFDataGetLength( data ) + 1;
+- range = CFRangeMake( 0, buf_len );
+-
+- if( ( _obj->pTOC = (CDTOC *)malloc( buf_len ) ) != NULL ) {
+- CFDataGetBytes( data, range, (u_char *) _obj->pTOC );
+- } else {
+- cdio_error( "Trouble allocating CDROM TOC" );
+- return false;
+- }
+- }
+- else
+- {
+- cdio_error( "CFDictionaryGetValue failed" );
++ if ( data != NULL ) {
++ CFRange range;
++ CFIndex buf_len;
++
++ buf_len = CFDataGetLength( data ) + 1;
++ range = CFRangeMake( 0, buf_len );
++
++ if( ( p_env->pTOC = (CDTOC *)malloc( buf_len ) ) != NULL ) {
++ CFDataGetBytes( data, range, (u_char *) p_env->pTOC );
++ } else {
++ cdio_warn( "Trouble allocating CDROM TOC" );
++ return false;
+ }
+-
+- CFRelease( properties );
+- IOObjectRelease( service );
++ } else {
++ cdio_warn( "Trouble reading TOC" );
++ return false;
++ }
+
+- _obj->i_descriptors = CDTOCGetDescriptorCount ( _obj->pTOC );
+- _obj->num_tracks = _cdio_getNumberOfTracks(_obj->pTOC, _obj->i_descriptors);
++ /* TestDevice(p_env, service); */
++ CFRelease( propertiesDict );
+
+- /* Read in starting sectors */
++ p_env->i_descriptors = CDTOCGetDescriptorCount ( p_env->pTOC );
++
++ /* Read in starting sectors. There may be non-tracks mixed in with
++ the real tracks. So find the first and last track number by
++ scanning. Also find the lead-out track position.
++ */
+ {
+ int i, i_leadout = -1;
++
+ CDTOCDescriptor *pTrackDescriptors;
+- track_t track;
+- int i_tracks;
+
+- _obj->pp_lba = malloc( (_obj->num_tracks + 1) * sizeof(int) );
+- if( _obj->pp_lba == NULL )
++ p_env->pp_lba = malloc( p_env->i_descriptors * sizeof(int) );
++ if( p_env->pp_lba == NULL )
+ {
+- cdio_error("Out of memory in allocating track starting LSNs" );
+- free( _obj->pTOC );
++ cdio_warn("Out of memory in allocating track starting LSNs" );
++ free( p_env->pTOC );
+ return false;
+ }
+
+- pTrackDescriptors = _obj->pTOC->descriptors;
++ pTrackDescriptors = p_env->pTOC->descriptors;
++
++ p_env->gen.i_first_track = CDIO_CD_MAX_TRACKS+1;
++ p_env->i_last_track = CDIO_CD_MIN_TRACK_NO;
++ p_env->i_first_session = CDIO_CD_MAX_TRACKS+1;
++ p_env->i_last_session = CDIO_CD_MIN_TRACK_NO;
+
+- for( i_tracks = 0, i = 0; i <= _obj->i_descriptors; i++ )
++ for( i = 0; i <= p_env->i_descriptors; i++ )
+ {
+- track = pTrackDescriptors[i].point;
++ track_t i_track = pTrackDescriptors[i].point;
++ session_t i_session = pTrackDescriptors[i].session;
++
++ cdio_debug( "point: %d, tno: %d, session: %d, adr: %d, control:%d, "
++ "address: %d:%d:%d, p: %d:%d:%d",
++ i_track,
++ pTrackDescriptors[i].tno, i_session,
++ pTrackDescriptors[i].adr, pTrackDescriptors[i].control,
++ pTrackDescriptors[i].address.minute,
++ pTrackDescriptors[i].address.second,
++ pTrackDescriptors[i].address.frame,
++ pTrackDescriptors[i].p.minute,
++ pTrackDescriptors[i].p.second,
++ pTrackDescriptors[i].p.frame );
+
+- if( track == 0xA2 )
+- /* Note leadout should be 0xAA, But OSX seems to use 0xA2. */
++ /* track information has adr = 1 */
++ if ( 0x01 != pTrackDescriptors[i].adr )
++ continue;
++
++ if( i_track == OSX_CDROM_LEADOUT_TRACK )
+ i_leadout = i;
+-
+- if( track > CDIO_CD_MAX_TRACKS || track < CDIO_CD_MIN_TRACK_NO )
++
++ if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
+ continue;
++
++ if (p_env->gen.i_first_track > i_track)
++ p_env->gen.i_first_track = i_track;
++
++ if (p_env->i_last_track < i_track)
++ p_env->i_last_track = i_track;
+
+- _obj->pp_lba[i_tracks++] =
++ if (p_env->i_first_session > i_session)
++ p_env->i_first_session = i_session;
++
++ if (p_env->i_last_session < i_session)
++ p_env->i_last_session = i_session;
++ }
++
++ /* Now that we know what the first track number is, we can make sure
++ index positions are ordered starting at 0.
++ */
++ for( i = 0; i <= p_env->i_descriptors; i++ )
++ {
++ track_t i_track = pTrackDescriptors[i].point;
++
++ if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
++ continue;
++
++ /* Note what OSX calls a LBA we call an LSN. So below re we
++ really have have MSF -> LSN -> LBA.
++ */
++ p_env->pp_lba[i_track - p_env->gen.i_first_track] =
+ cdio_lsn_to_lba(CDConvertMSFToLBA( pTrackDescriptors[i].p ));
+ }
+
+ if( i_leadout == -1 )
+ {
+- cdio_error( "CD leadout not found" );
+- free( _obj->pp_lba );
+- free( (void *) _obj->pTOC );
++ cdio_warn( "CD leadout not found" );
++ free( p_env->pp_lba );
++ free( (void *) p_env->pTOC );
+ return false;
+ }
+
+- /* set leadout sector */
+- _obj->pp_lba[i_tracks] =
++ /* Set leadout sector.
++ Note what OSX calls a LBA we call an LSN. So below re we
++ really have have MSF -> LSN -> LBA.
++ */
++ p_env->pp_lba[TOTAL_TRACKS] =
+ cdio_lsn_to_lba(CDConvertMSFToLBA( pTrackDescriptors[i_leadout].p ));
++ p_env->gen.i_tracks = TOTAL_TRACKS;
+ }
+
+- _obj->toc_init = true;
++ p_env->gen.toc_init = true;
+
+ return( true );
+
+@@ -442,24 +984,25 @@
+
+ /*!
+ Return the starting LSN track number
+- track_num in obj. Track numbers start at 1.
++ i_track in obj. Track numbers start at 1.
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
++ using i_track LEADOUT_TRACK or the total tracks+1.
+ False is returned if there is no track entry.
+ */
+ static lsn_t
+-_cdio_get_track_lba(void *env, track_t track_num)
++get_track_lba_osx(void *p_user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
++ if (!p_env->gen.toc_init) read_toc_osx (p_env) ;
++ if (!p_env->gen.toc_init) return CDIO_INVALID_LSN;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = p_env->i_last_track+1;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
++ if (i_track > p_env->i_last_track + 1 || i_track < p_env->gen.i_first_track) {
+ return CDIO_INVALID_LSN;
+ } else {
+- return _obj->pp_lba[track_num-1];
++ return p_env->pp_lba[i_track - p_env->gen.i_first_track];
+ }
+ }
+
+@@ -474,18 +1017,18 @@
+ */
+
+ static int
+-_cdio_eject_media (void *env) {
++_eject_media_osx (void *user_data) {
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ FILE *p_eject;
+ char *psz_disk;
+ char sz_cmd[32];
+
+- if( ( psz_disk = (char *)strstr( _obj->gen.source_name, "disk" ) ) != NULL &&
++ if( ( psz_disk = (char *)strstr( p_env->gen.source_name, "disk" ) ) != NULL &&
+ strlen( psz_disk ) > 4 )
+ {
+-#define EJECT_CMD "/usr/sbin/disktool -e %s 0"
++#define EJECT_CMD "/usr/sbin/hdiutil eject %s"
+ snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_disk );
+ #undef EJECT_CMD
+
+@@ -518,23 +1061,23 @@
+ Return the size of the CD in logical block address (LBA) units.
+ */
+ static uint32_t
+-_cdio_stat_size (void *env)
++_stat_size_osx (void *user_data)
+ {
+- return _cdio_get_track_lba(env, CDIO_CDROM_LEADOUT_TRACK);
++ return get_track_lba_osx(user_data, CDIO_CDROM_LEADOUT_TRACK);
+ }
+
+ /*!
+ Return the value associated with the key "arg".
+ */
+ static const char *
+-_cdio_get_arg (void *env, const char key[])
++_get_arg_osx (void *user_data, const char key[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+ if (!strcmp (key, "source")) {
+- return _obj->gen.source_name;
++ return p_env->gen.source_name;
+ } else if (!strcmp (key, "access-mode")) {
+- switch (_obj->access_mode) {
++ switch (p_env->access_mode) {
+ case _AM_OSX:
+ return "OS X";
+ case _AM_NONE:
+@@ -545,101 +1088,67 @@
+ }
+
+ /*!
+- Return the number of the first track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_first_track_num(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+-
+- {
+- track_t track = CDIO_INVALID_TRACK;
+- int i;
+- CDTOCDescriptor *pTrackDescriptors;
+-
+- pTrackDescriptors = _obj->pTOC->descriptors;
+-
+- for( i = 0; i < _obj->i_descriptors; i++ )
+- {
+- track = pTrackDescriptors[i].point;
+-
+- if( track > CDIO_CD_MAX_TRACKS || track < CDIO_CD_MIN_TRACK_NO )
+- continue;
+- return ( track );
+- }
+- }
+-
+- return CDIO_INVALID_TRACK;
+-}
+-
+-/*!
+ Return the media catalog number MCN.
+ */
+ static char *
+-_cdio_get_mcn (void *env) {
+- _img_private_t *_obj = env;
++get_mcn_osx (const void *user_data) {
++ const _img_private_t *p_env = user_data;
+ dk_cd_read_mcn_t cd_read;
+
+ memset( &cd_read, 0, sizeof(cd_read) );
+
+- if( ioctl( _obj->gen.fd, DKIOCCDREADMCN, &cd_read ) < 0 )
++ if( ioctl( p_env->gen.fd, DKIOCCDREADMCN, &cd_read ) < 0 )
+ {
+- cdio_error( "could not read MCN, %s", strerror(errno) );
++ cdio_debug( "could not read MCN, %s", strerror(errno) );
+ return NULL;
+ }
+ return strdup((char*)cd_read.mcn);
+ }
+
+
+-/*!
+- Return the number of tracks in the current medium.
+- CDIO_INVALID_TRACK is returned on error.
+- This is the externally called interface.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+- return( _obj->num_tracks );
+-}
+-
+ /*!
+ Get format of track.
+ */
+ static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
++get_track_format_osx(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
++ dk_cd_read_track_info_t cd_read;
+ CDTrackInfo a_track;
+-
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+
+- if (track_num > TOTAL_TRACKS || track_num == 0)
++ if (!p_env->gen.toc_init) read_toc_osx (p_env) ;
++
++ if (i_track > p_env->i_last_track || i_track < p_env->gen.i_first_track)
+ return TRACK_FORMAT_ERROR;
+
+- dk_cd_read_track_info_t cd_read;
+ memset( &cd_read, 0, sizeof(cd_read) );
+
+- cd_read.address = track_num;
++ cd_read.address = i_track;
+ cd_read.addressType = kCDTrackInfoAddressTypeTrackNumber;
+
+ cd_read.buffer = &a_track;
+ cd_read.bufferLength = sizeof(CDTrackInfo);
+
+- if( ioctl( _obj->gen.fd, DKIOCCDREADTRACKINFO, &cd_read ) == -1 )
++ if( ioctl( p_env->gen.fd, DKIOCCDREADTRACKINFO, &cd_read ) == -1 )
+ {
+- cdio_error( "could not read trackinfo for track %d", track_num );
+- return -1;
++ cdio_warn( "could not read trackinfo for track %d", i_track );
++ return TRACK_FORMAT_ERROR;
+ }
+
+- cdio_warn( "trackinfo trackMode: %x dataMode: %x", a_track.trackMode, a_track.dataMode );
++ cdio_debug( "%d: trackinfo trackMode: %x dataMode: %x", i_track, a_track.trackMode, a_track.dataMode );
++
++ if (a_track.trackMode == CDIO_CDROM_DATA_TRACK) {
++ if (a_track.dataMode == CDROM_CDI_TRACK) {
++ return TRACK_FORMAT_CDI;
++ } else if (a_track.dataMode == CDROM_XA_TRACK) {
++ return TRACK_FORMAT_XA;
++ } else {
++ return TRACK_FORMAT_DATA;
++ }
++ } else {
++ return TRACK_FORMAT_AUDIO;
++ }
+
+- return TRACK_FORMAT_AUDIO;
+ }
+
+ /*!
+@@ -651,25 +1160,34 @@
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+ static bool
+-_cdio_get_track_green(void *env, track_t track_num)
++get_track_green_osx(void *user_data, track_t i_track)
+ {
++ _img_private_t *p_env = user_data;
++ CDTrackInfo a_track;
+
+-#if 0
+- if (!_obj->toc_init) _cdio_read_toc (_obj) ;
+-
+- if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if (!p_env->gen.toc_init) read_toc_osx (p_env) ;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0)
++ if ( i_track > p_env->i_last_track || i_track < p_env->gen.i_first_track )
+ return false;
+
+- /* FIXME: Dunno if this is the right way, but it's what
+- I was using in cdinfo for a while.
+- */
+- return ((_obj->tocent[track_num-1].cdte_ctrl & 2) != 0);
+-#else
+- /* FIXME! Figure out how to do. */
+- return true;
+-#endif
++ else {
++
++ dk_cd_read_track_info_t cd_read;
++
++ memset( &cd_read, 0, sizeof(cd_read) );
++
++ cd_read.address = i_track;
++ cd_read.addressType = kCDTrackInfoAddressTypeTrackNumber;
++
++ cd_read.buffer = &a_track;
++ cd_read.bufferLength = sizeof(CDTrackInfo);
++
++ if( ioctl( p_env->gen.fd, DKIOCCDREADTRACKINFO, &cd_read ) == -1 ) {
++ cdio_warn( "could not read trackinfo for track %d", i_track );
++ return false;
++ }
++ return ((a_track.trackMode & CDIO_CDROM_DATA_TRACK) != 0);
++ }
+ }
+
+ #endif /* HAVE_DARWIN_CDROM */
+@@ -694,13 +1212,13 @@
+ kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
+ if( kern_result != KERN_SUCCESS )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ classes_to_match = IOServiceMatching( kIOCDMediaClass );
+ if( classes_to_match == NULL )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
+@@ -711,7 +1229,7 @@
+ &media_iterator );
+ if( kern_result != KERN_SUCCESS )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ next_media = IOIteratorNext( media_iterator );
+@@ -744,7 +1262,7 @@
+ CFRelease( str_bsd_path );
+ IOObjectRelease( next_media );
+ IOObjectRelease( media_iterator );
+- cdio_add_device_list(&drives, psz_buf, &num_drives);
++ cdio_add_device_list(&drives, strdup(psz_buf), &num_drives);
+ }
+
+ CFRelease( str_bsd_path );
+@@ -776,13 +1294,13 @@
+ kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
+ if( kern_result != KERN_SUCCESS )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ classes_to_match = IOServiceMatching( kIOCDMediaClass );
+ if( classes_to_match == NULL )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
+@@ -793,7 +1311,7 @@
+ &media_iterator );
+ if( kern_result != KERN_SUCCESS )
+ {
+- return( nil );
++ return( NULL );
+ }
+
+ next_media = IOIteratorNext( media_iterator );
+@@ -845,55 +1363,90 @@
+ ones to set that up.
+ */
+ CdIo *
+-cdio_open_osx (const char *orig_source_name)
++cdio_open_am_osx (const char *psz_source_name, const char *psz_access_mode)
++{
++
++ if (psz_access_mode != NULL)
++ cdio_warn ("there is only one access mode for OS X. Arg %s ignored",
++ psz_access_mode);
++ return cdio_open_osx(psz_source_name);
++}
++
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_osx (const char *psz_orig_source)
+ {
+
+ #ifdef HAVE_DARWIN_CDROM
+ CdIo *ret;
+ _img_private_t *_data;
+- char *source_name;
++ char *psz_source;
+
+ cdio_funcs _funcs = {
+- .eject_media = _cdio_eject_media,
+- .free = _cdio_osx_free,
+- .get_arg = _cdio_get_arg,
++ .eject_media = _eject_media_osx,
++ .free = _free_osx,
++ .get_arg = _get_arg_osx,
++ .get_cdtext = get_cdtext_osx,
+ .get_default_device = cdio_get_default_device_osx,
+ .get_devices = cdio_get_devices_osx,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_mcn = _cdio_get_mcn,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
+- .get_track_lba = _cdio_get_track_lba,
++ .get_discmode = get_discmode_osx,
++ .get_drive_cap = get_drive_cap_osx,
++ .get_first_track_num= get_first_track_num_generic,
++ .get_hwinfo = get_hwinfo_osx,
++ .get_mcn = get_mcn_osx,
++ .get_num_tracks = get_num_tracks_generic,
++ .get_track_format = get_track_format_osx,
++ .get_track_green = get_track_green_osx,
++ .get_track_lba = get_track_lba_osx,
+ .get_track_msf = NULL,
+ .lseek = cdio_generic_lseek,
+ .read = cdio_generic_read,
+- .read_audio_sectors = _cdio_read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .set_arg = _cdio_set_arg,
+- .stat_size = _cdio_stat_size
++ .read_audio_sectors = _get_read_audio_sectors_osx,
++ .read_mode1_sector = _get_read_mode1_sector_osx,
++ .read_mode1_sectors = _get_read_mode1_sectors_osx,
++ .read_mode2_sector = _get_read_mode2_sector_osx,
++ .read_mode2_sectors = _get_read_mode2_sectors_osx,
++ .read_toc = read_toc_osx,
++ .run_scsi_mmc_cmd = run_scsi_cmd_osx,
++ .set_arg = _set_arg_osx,
++ .stat_size = _stat_size_osx
+ };
+
+ _data = _cdio_malloc (sizeof (_img_private_t));
+ _data->access_mode = _AM_OSX;
+- _data->gen.init = false;
+- _data->gen.fd = -1;
+-
+- if (NULL == orig_source_name) {
+- source_name=cdio_get_default_device_linux();
+- if (NULL == source_name) return NULL;
+- _cdio_set_arg(_data, "source", source_name);
+- free(source_name);
+- } else
+- _cdio_set_arg(_data, "source", orig_source_name);
++ _data->MediaClass_service = 0;
++ _data->gen.init = false;
++ _data->gen.fd = -1;
++ _data->gen.toc_init = false;
++ _data->gen.b_cdtext_init = false;
++ _data->gen.b_cdtext_error = false;
++
++ if (NULL == psz_orig_source) {
++ psz_source=cdio_get_default_device_osx();
++ if (NULL == psz_source) return NULL;
++ _set_arg_osx(_data, "source", psz_source);
++ free(psz_source);
++ } else {
++ if (cdio_is_device_generic(psz_orig_source))
++ _set_arg_osx(_data, "source", psz_orig_source);
++ else {
++ /* The below would be okay if all device drivers worked this way. */
++#if 0
++ cdio_info ("source %s is a not a device", psz_orig_source);
++#endif
++ return NULL;
++ }
++ }
+
+- ret = cdio_new (_data, &_funcs);
++ ret = cdio_new ((void *)_data, &_funcs);
+ if (ret == NULL) return NULL;
+
+- if (cdio_generic_init(_data))
++ if (cdio_generic_init(_data) && init_osx(_data))
+ return ret;
+ else {
+ cdio_generic_free (_data);
+--- ./src/input/vcd/libcdio/_cdio_sunos.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/_cdio_sunos.c 3 Jan 2005 21:13:56 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: _cdio_sunos.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: _cdio_sunos.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -26,22 +26,23 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+-#ifdef HAVE_GLOB_H
+-#include <glob.h>
+-#endif
+
+ #include <cdio/logging.h>
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/scsi_mmc.h>
+ #include "cdio_assert.h"
+ #include "cdio_private.h"
+-#include "scsi_mmc.h"
+
+ #define DEFAULT_CDIO_DEVICE "/vol/dev/aliases/cdrom0"
+
+ #ifdef HAVE_SOLARIS_CDROM
+
+-static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.2.2.1 2005/01/03 21:13:56 mroi Exp $";
++
++#ifdef HAVE_GLOB_H
++#include <glob.h>
++#endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -62,18 +63,14 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#include "cdtext_private.h"
+
+-#define TOTAL_TRACKS (_obj->tochdr.cdth_trk1)
+-#define FIRST_TRACK_NUM (_obj->tochdr.cdth_trk0)
++/* not defined in dkio.h yet */
++#define DK_DVDRW 0x13
+
+ /* reader */
+
+-typedef struct {
+- /* Things common to all drivers like this.
+- This must be first. */
+- generic_img_private_t gen;
+-
+- enum {
++typedef enum {
+ _AM_NONE,
+ _AM_SUN_CTRL_ATAPI,
+ _AM_SUN_CTRL_SCSI
+@@ -81,30 +78,98 @@
+ _AM_READ_CD,
+ _AM_READ_10
+ #endif
+- } access_mode;
++} access_mode_t;
++
++
++typedef struct {
++ /* Things common to all drivers like this.
++ This must be first. */
++ generic_img_private_t gen;
++
++ access_mode_t access_mode;
+
++ /* Some of the more OS specific things. */
++ /* Entry info for each track, add 1 for leadout. */
++ struct cdrom_tocentry tocent[CDIO_CD_MAX_TRACKS+1];
+
+ /* Track information */
+ struct cdrom_tochdr tochdr;
+- struct cdrom_tocentry tocent[100]; /* entry info for each track */
+-
+ } _img_private_t;
+
++static track_format_t get_track_format_solaris(void *p_user_data,
++ track_t i_track);
++
++static access_mode_t
++str_to_access_mode_sunos(const char *psz_access_mode)
++{
++ const access_mode_t default_access_mode = _AM_SUN_CTRL_SCSI;
++
++ if (NULL==psz_access_mode) return default_access_mode;
++
++ if (!strcmp(psz_access_mode, "ATAPI"))
++ return _AM_SUN_CTRL_SCSI; /* force ATAPI to be SCSI */
++ else if (!strcmp(psz_access_mode, "SCSI"))
++ return _AM_SUN_CTRL_SCSI;
++ else {
++ cdio_warn ("unknown access type: %s. Default SCSI used.",
++ psz_access_mode);
++ return default_access_mode;
++ }
++}
++
++
+ /*!
+ Initialize CD device.
+ */
+ static bool
+-_cdio_init (_img_private_t *_obj)
++init_solaris (_img_private_t *p_env)
+ {
+
+- if (!cdio_generic_init(_obj)) return false;
++ if (!cdio_generic_init(p_env)) return false;
+
+- _obj->access_mode = _AM_SUN_CTRL_SCSI;
++ p_env->access_mode = _AM_SUN_CTRL_SCSI;
+
+ return true;
+ }
+
+ /*!
++ Run a SCSI MMC command.
++
++ p_user_data internal CD structure.
++ i_timeout_ms time in milliseconds we will wait for the command
++ to complete.
++ i_cdb Size of p_cdb
++ p_cdb CDB bytes.
++ e_direction direction the transfer is to go.
++ i_buf Size of buffer
++ p_buf Buffer for data, both sending and receiving
++
++ Return 0 if no error.
++ */
++static int
++run_scsi_cmd_solaris( const void *p_user_data, unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
++{
++ const _img_private_t *p_env = p_user_data;
++ struct uscsi_cmd cgc;
++
++ memset (&cgc, 0, sizeof (struct uscsi_cmd));
++ cgc.uscsi_cdb = (caddr_t) p_cdb;
++
++ cgc.uscsi_flags = SCSI_MMC_DATA_READ == e_direction ?
++ USCSI_READ : USCSI_WRITE;
++
++ cgc.uscsi_timeout = msecs2secs(i_timeout_ms);
++ cgc.uscsi_bufaddr = p_buf;
++ cgc.uscsi_buflen = i_buf;
++ cgc.uscsi_cdblen = i_cdb;
++
++ return ioctl(p_env->gen.fd, USCSICMD, &cgc);
++}
++
++/*!
+ Reads audio sectors from CD device into data starting from lsn.
+ Returns 0 if no error.
+
+@@ -113,44 +178,44 @@
+ */
+
+ static int
+-_cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
++_read_audio_sectors_solaris (void *p_user_data, void *data, lsn_t lsn,
+ unsigned int nblocks)
+ {
+- char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+- struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
++ struct cdrom_msf solaris_msf;
+ msf_t _msf;
+ struct cdrom_cdda cdda;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ solaris_msf.cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ solaris_msf.cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ solaris_msf.cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+- if (_obj->gen.ioctls_debugged == 75)
++ if (p_env->gen.ioctls_debugged == 75)
+ cdio_debug ("only displaying every 75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged == 30 * 75)
++ if (p_env->gen.ioctls_debugged == 30 * 75)
+ cdio_debug ("only displaying every 30*75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged < 75
+- || (_obj->gen.ioctls_debugged < (30 * 75)
+- && _obj->gen.ioctls_debugged % 75 == 0)
+- || _obj->gen.ioctls_debugged % (30 * 75) == 0)
++ if (p_env->gen.ioctls_debugged < 75
++ || (p_env->gen.ioctls_debugged < (30 * 75)
++ && p_env->gen.ioctls_debugged % 75 == 0)
++ || p_env->gen.ioctls_debugged % (30 * 75) == 0)
+ cdio_debug ("reading %d", lsn);
+
+- _obj->gen.ioctls_debugged++;
++ p_env->gen.ioctls_debugged++;
++
++ cdda.cdda_addr = lsn;
++ cdda.cdda_length = nblocks;
++ cdda.cdda_data = (caddr_t) data;
++ cdda.cdda_subcode = CDROM_DA_NO_SUBCODE;
+
+- cdda.cdda_addr = lsn;
+- cdda.cdda_length = nblocks;
+- cdda.cdda_data = (caddr_t) data;
+- if (ioctl (_obj->gen.fd, CDROMCDDA, &cdda) == -1) {
++ if (ioctl (p_env->gen.fd, CDROMCDDA, &cdda) == -1) {
+ perror ("ioctl(..,CDROMCDDA,..)");
+ return 1;
+ /* exit (EXIT_FAILURE); */
+ }
+- memcpy (data, buf, CDIO_CD_FRAMESIZE_RAW);
+
+ return 0;
+ }
+@@ -160,21 +225,15 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
+- bool b_form2)
++_read_mode1_sector_solaris (void *env, void *data, lsn_t lsn,
++ bool b_form2)
+ {
+
+- char buf[M2RAW_SECTOR_SIZE] = { 0, };
+ #if FIXED
+ do something here.
+ #else
+- if (0 > cdio_generic_lseek(env, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
+- return -1;
+- if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
+- return -1;
+- memcpy (data, buf, b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
++ return cdio_generic_read_form1_sector(env, data, lsn);
+ #endif
+- return 0;
+ }
+
+ /*!
+@@ -183,18 +242,18 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
+- bool b_form2, unsigned int nblocks)
++_read_mode1_sectors_solaris (void *p_user_data, void *p_data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+ unsigned int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode1_sector (_obj,
+- ((char *)data) + (blocksize * i),
+- lsn + i, b_form2)) )
++ if ( (retval = _read_mode1_sector_solaris (p_env,
++ ((char *)p_data) + (blocksize * i),
++ lsn + i, b_form2)) )
+ return retval;
+ }
+ return 0;
+@@ -205,36 +264,37 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
+- bool b_form2)
++_read_mode2_sector_solaris (void *p_user_data, void *p_data, lsn_t lsn,
++ bool b_form2)
+ {
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+- struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
++ struct cdrom_msf solaris_msf;
+ msf_t _msf;
+ int offset = 0;
+ struct cdrom_cdxa cd_read;
+
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+ cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
+- msf->cdmsf_min0 = from_bcd8(_msf.m);
+- msf->cdmsf_sec0 = from_bcd8(_msf.s);
+- msf->cdmsf_frame0 = from_bcd8(_msf.f);
++ solaris_msf.cdmsf_min0 = cdio_from_bcd8(_msf.m);
++ solaris_msf.cdmsf_sec0 = cdio_from_bcd8(_msf.s);
++ solaris_msf.cdmsf_frame0 = cdio_from_bcd8(_msf.f);
+
+- if (_obj->gen.ioctls_debugged == 75)
++ if (p_env->gen.ioctls_debugged == 75)
+ cdio_debug ("only displaying every 75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged == 30 * 75)
++ if (p_env->gen.ioctls_debugged == 30 * 75)
+ cdio_debug ("only displaying every 30*75th ioctl from now on");
+
+- if (_obj->gen.ioctls_debugged < 75
+- || (_obj->gen.ioctls_debugged < (30 * 75)
+- && _obj->gen.ioctls_debugged % 75 == 0)
+- || _obj->gen.ioctls_debugged % (30 * 75) == 0)
++ if (p_env->gen.ioctls_debugged < 75
++ || (p_env->gen.ioctls_debugged < (30 * 75)
++ && p_env->gen.ioctls_debugged % 75 == 0)
++ || p_env->gen.ioctls_debugged % (30 * 75) == 0)
+ cdio_debug ("reading %2.2d:%2.2d:%2.2d",
+- msf->cdmsf_min0, msf->cdmsf_sec0, msf->cdmsf_frame0);
++ solaris_msf.cdmsf_min0, solaris_msf.cdmsf_sec0,
++ solaris_msf.cdmsf_frame0);
+
+- _obj->gen.ioctls_debugged++;
++ p_env->gen.ioctls_debugged++;
+
+ /* Using CDROMXA ioctl will actually use the same uscsi command
+ * as ATAPI, except we don't need to be root
+@@ -244,16 +304,16 @@
+ cd_read.cdxa_data = buf;
+ cd_read.cdxa_length = 1;
+ cd_read.cdxa_format = CDROM_XA_SECTOR_DATA;
+- if (ioctl (_obj->gen.fd, CDROMCDXA, &cd_read) == -1) {
++ if (ioctl (p_env->gen.fd, CDROMCDXA, &cd_read) == -1) {
+ perror ("ioctl(..,CDROMCDXA,..)");
+ return 1;
+ /* exit (EXIT_FAILURE); */
+ }
+
+ if (b_form2)
+- memcpy (data, buf + (offset-CDIO_CD_SUBHEADER_SIZE), M2RAW_SECTOR_SIZE);
++ memcpy (p_data, buf + (offset-CDIO_CD_SUBHEADER_SIZE), M2RAW_SECTOR_SIZE);
+ else
+- memcpy (((char *)data), buf + offset, CDIO_CD_FRAMESIZE);
++ memcpy (((char *)p_data), buf + offset, CDIO_CD_FRAMESIZE);
+
+ return 0;
+ }
+@@ -264,18 +324,18 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
+- bool b_form2, unsigned int nblocks)
++_read_mode2_sectors_solaris (void *p_user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = p_user_data;
+ unsigned int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode2_sector (_obj,
++ if ( (retval = _read_mode2_sector_solaris (env,
+ ((char *)data) + (blocksize * i),
+- lsn + i, b_form2)) )
++ lsn + i, b_form2)) )
+ return retval;
+ }
+ return 0;
+@@ -286,16 +346,16 @@
+ Return the size of the CD in logical block address (LBA) units.
+ */
+ static uint32_t
+-_cdio_stat_size (void *env)
++_cdio_stat_size (void *p_user_data)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = p_user_data;
+
+ struct cdrom_tocentry tocent;
+ uint32_t size;
+
+- tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+- tocent.cdte_format = CDROM_LBA;
+- if (ioctl (_obj->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
++ tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
++ tocent.cdte_format = CDIO_CDROM_LBA;
++ if (ioctl (env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
+ {
+ perror ("ioctl(CDROMREADTOCENTRY)");
+ exit (EXIT_FAILURE);
+@@ -315,27 +375,22 @@
+ 0 is returned if no error was found, and nonzero if there as an error.
+ */
+ static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
++_set_arg_solaris (void *p_user_data, const char key[], const char value[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = p_user_data;
+
+ if (!strcmp (key, "source"))
+ {
+ if (!value)
+ return -2;
+
+- free (_obj->gen.source_name);
++ free (env->gen.source_name);
+
+- _obj->gen.source_name = strdup (value);
++ env->gen.source_name = strdup (value);
+ }
+ else if (!strcmp (key, "access-mode"))
+ {
+- if (!strcmp(value, "ATAPI"))
+- _obj->access_mode = _AM_SUN_CTRL_SCSI; /* force ATAPI to be SCSI */
+- else if (!strcmp(value, "SCSI"))
+- _obj->access_mode = _AM_SUN_CTRL_SCSI;
+- else
+- cdio_warn ("unknown access type: %s. ignored.", value);
++ env->access_mode = str_to_access_mode_sunos(key);
+ }
+ else
+ return -1;
+@@ -348,23 +403,27 @@
+ Return true if successful or false if an error.
+ */
+ static bool
+-_cdio_read_toc (_img_private_t *_obj)
++read_toc_solaris (void *p_user_data)
+ {
++ _img_private_t *p_env = p_user_data;
+ int i;
+
+ /* read TOC header */
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCHDR, &_obj->tochdr) == -1 ) {
+- cdio_error("%s: %s\n",
++ if ( ioctl(p_env->gen.fd, CDROMREADTOCHDR, &p_env->tochdr) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCHDR", strerror(errno));
+ return false;
+ }
+
++ p_env->gen.i_first_track = p_env->tochdr.cdth_trk0;
++ p_env->gen.i_tracks = p_env->tochdr.cdth_trk1;
++
+ /* read individual tracks */
+- for (i=_obj->tochdr.cdth_trk0; i<=_obj->tochdr.cdth_trk1; i++) {
+- _obj->tocent[i-1].cdte_track = i;
+- _obj->tocent[i-1].cdte_format = CDROM_MSF;
+- if ( ioctl(_obj->gen.fd, CDROMREADTOCENTRY, &_obj->tocent[i-1]) == -1 ) {
+- cdio_error("%s %d: %s\n",
++ for (i=p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++) {
++ p_env->tocent[i-1].cdte_track = i;
++ p_env->tocent[i-1].cdte_format = CDIO_CDROM_MSF;
++ if ( ioctl(p_env->gen.fd, CDROMREADTOCENTRY, &p_env->tocent[i-1]) == -1 ) {
++ cdio_warn("%s %d: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for track",
+ i, strerror(errno));
+ return false;
+@@ -372,18 +431,18 @@
+ }
+
+ /* read the lead-out track */
+- _obj->tocent[_obj->tochdr.cdth_trk1].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
+- _obj->tocent[_obj->tochdr.cdth_trk1].cdte_format = CDROM_MSF;
++ p_env->tocent[p_env->tochdr.cdth_trk1].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
++ p_env->tocent[p_env->tochdr.cdth_trk1].cdte_format = CDIO_CDROM_MSF;
+
+- if (ioctl(_obj->gen.fd, CDROMREADTOCENTRY,
+- &_obj->tocent[_obj->tochdr.cdth_trk1]) == -1 ) {
+- cdio_error("%s: %s\n",
++ if (ioctl(p_env->gen.fd, CDROMREADTOCENTRY,
++ &p_env->tocent[p_env->tochdr.cdth_trk1]) == -1 ) {
++ cdio_warn("%s: %s\n",
+ "error in ioctl CDROMREADTOCENTRY for lead-out",
+ strerror(errno));
+ return false;
+ }
+
+- _obj->gen.toc_init = true;
++ p_env->gen.toc_init = true;
+ return true;
+ }
+
+@@ -392,17 +451,17 @@
+ also free obj.
+ */
+ static int
+-_cdio_eject_media (void *env) {
++eject_media_solaris (void *p_user_data) {
+
+- _img_private_t *_obj = env;
++ _img_private_t *env = p_user_data;
+ int ret;
+
+- close(_obj->gen.fd);
+- _obj->gen.fd = -1;
+- if (_obj->gen.fd > -1) {
+- if ((ret = ioctl(_obj->gen.fd, CDROMEJECT)) != 0) {
+- cdio_generic_free((void *) _obj);
+- cdio_error ("CDROMEJECT failed: %s\n", strerror(errno));
++ close(env->gen.fd);
++ env->gen.fd = -1;
++ if (env->gen.fd > -1) {
++ if ((ret = ioctl(env->gen.fd, CDROMEJECT)) != 0) {
++ cdio_generic_free((void *) env);
++ cdio_warn ("CDROMEJECT failed: %s\n", strerror(errno));
+ return 1;
+ } else {
+ return 0;
+@@ -419,7 +478,7 @@
+ if( !size ) size++;
+
+ if((ptr = malloc(size)) == NULL) {
+- cdio_error("malloc() failed: %s", strerror(errno));
++ cdio_warn("malloc() failed: %s", strerror(errno));
+ return NULL;
+ }
+
+@@ -431,14 +490,14 @@
+ Return the value associated with the key "arg".
+ */
+ static const char *
+-_cdio_get_arg (void *env, const char key[])
++get_arg_solaris (void *p_user_data, const char key[])
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = p_user_data;
+
+ if (!strcmp (key, "source")) {
+- return _obj->gen.source_name;
++ return env->gen.source_name;
+ } else if (!strcmp (key, "access-mode")) {
+- switch (_obj->access_mode) {
++ switch (env->access_mode) {
+ case _AM_SUN_CTRL_ATAPI:
+ return "ATAPI";
+ case _AM_SUN_CTRL_SCSI:
+@@ -478,57 +537,147 @@
+ }
+ return device;
+ }
++ /* Check if it could be a Solaris media*/
++ if((stat(DEFAULT_CDIO_DEVICE, &stb) == 0) && S_ISDIR(stb.st_mode)) {
++ device = _cdio_malloc_and_zero(strlen(DEFAULT_CDIO_DEVICE) + 4);
++ sprintf(device, "%s/s0", DEFAULT_CDIO_DEVICE);
++ return device;
++ }
+ return strdup(DEFAULT_CDIO_DEVICE);
+ }
+
+-/*!
+- Return the number of of the first track.
+- CDIO_INVALID_TRACK is returned on error.
++/*!
++ Get disc type associated with cd object.
+ */
+-static track_t
+-_cdio_get_first_track_num(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
+
+- return FIRST_TRACK_NUM;
+-}
+-
+-/*!
+- Return the number of tracks in the current medium.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
++static discmode_t
++get_discmode_solaris (void *p_user_data)
+ {
+- _img_private_t *_obj = env;
+-
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ _img_private_t *p_env = p_user_data;
++ track_t i_track;
++ discmode_t discmode=CDIO_DISC_MODE_NO_INFO;
++ struct dk_minfo media;
++ int ret;
+
+- return TOTAL_TRACKS;
++ /* Get the media info */
++ if((ret = ioctl(p_env->gen.fd, DKIOCGMEDIAINFO, &media)) != 0) {
++ cdio_warn ("DKIOCGMEDIAINFO failed: %s\n", strerror(errno));
++ return CDIO_DISC_MODE_NO_INFO;
++ }
++ switch(media.dki_media_type) {
++ case DK_CDROM:
++ case DK_CDR:
++ case DK_CDRW:
++ /* Do cdrom detection */
++ break;
++ case DK_DVDROM: return CDIO_DISC_MODE_DVD_ROM;
++ case DK_DVDR: discmode = CDIO_DISC_MODE_DVD_R;
++ break;
++ case DK_DVDRAM: discmode = CDIO_DISC_MODE_DVD_RAM;
++ break;
++ case DK_DVDRW:
++ case DK_DVDRW+1: discmode = CDIO_DISC_MODE_DVD_RW;
++ break;
++ default: /* no valid match */
++ return CDIO_DISC_MODE_NO_INFO;
++ }
++
++ if((discmode == CDIO_DISC_MODE_DVD_RAM ||
++ discmode == CDIO_DISC_MODE_DVD_RW ||
++ discmode == CDIO_DISC_MODE_DVD_R)) {
++ /* Fallback to uscsi if we can */
++ if(geteuid() == 0)
++ return get_discmode_solaris(p_user_data);
++ return discmode;
++ }
++
++ if (!p_env->gen.toc_init)
++ read_toc_solaris (p_env);
++
++ if (!p_env->gen.toc_init)
++ return CDIO_DISC_MODE_NO_INFO;
++
++ for (i_track = p_env->gen.i_first_track;
++ i_track < p_env->gen.i_first_track + p_env->tochdr.cdth_trk1 ;
++ i_track ++) {
++ track_format_t track_fmt=get_track_format_solaris(p_env, i_track);
++
++ switch(track_fmt) {
++ case TRACK_FORMAT_AUDIO:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_DA;
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_XA:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_DATA:
++ switch(discmode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ discmode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* No change*/
++ break;
++ default:
++ discmode = CDIO_DISC_MODE_CD_MIXED;
++ }
++ break;
++ case TRACK_FORMAT_ERROR:
++ default:
++ discmode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ return discmode;
+ }
+
+ /*!
+ Get format of track.
+ */
+ static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
++get_track_format_solaris(void *p_user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+- if (!_obj->gen.init) _cdio_init(_obj);
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ if ( !p_env ) return TRACK_FORMAT_ERROR;
++ if (!p_env->gen.init) init_solaris(p_env);
++ if (!p_env->gen.toc_init) read_toc_solaris (p_user_data) ;
+
+- if (track_num > TOTAL_TRACKS || track_num == 0)
++ if ( (i_track > p_env->gen.i_tracks+p_env->gen.i_first_track)
++ || i_track < p_env->gen.i_first_track)
+ return TRACK_FORMAT_ERROR;
+
++ i_track -= p_env->gen.i_first_track;
++
+ /* This is pretty much copied from the "badly broken" cdrom_count_tracks
+ in linux/cdrom.c.
+ */
+- if (_obj->tocent[track_num-1].cdte_ctrl & CDROM_DATA_TRACK) {
+- if (_obj->tocent[track_num-1].cdte_format == 0x10)
++ if (p_env->tocent[i_track].cdte_ctrl & CDROM_DATA_TRACK) {
++ if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_CDI_TRACK)
+ return TRACK_FORMAT_CDI;
+- else if (_obj->tocent[track_num-1].cdte_format == 0x20)
++ else if (p_env->tocent[i_track].cdte_format == CDIO_CDROM_XA_TRACK)
+ return TRACK_FORMAT_XA;
+ else
+ return TRACK_FORMAT_DATA;
+@@ -546,50 +695,56 @@
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+ static bool
+-_cdio_get_track_green(void *env, track_t track_num)
++_cdio_get_track_green(void *p_user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+- if (!_obj->gen.init) _cdio_init(_obj);
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
+-
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if ( !p_env ) return false;
++ if (!p_env->gen.init) init_solaris(p_env);
++ if (!p_env->gen.toc_init) read_toc_solaris (p_env) ;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0)
++ if (i_track >= p_env->gen.i_tracks+p_env->gen.i_first_track
++ || i_track < p_env->gen.i_first_track)
+ return false;
+
++ i_track -= p_env->gen.i_first_track;
++
+ /* FIXME: Dunno if this is the right way, but it's what
+- I was using in cdinfo for a while.
++ I was using in cd-info for a while.
+ */
+- return ((_obj->tocent[track_num-1].cdte_ctrl & 2) != 0);
++ return ((p_env->tocent[i_track].cdte_ctrl & 2) != 0);
+ }
+
+ /*!
+ Return the starting MSF (minutes/secs/frames) for track number
+- track_num in obj. Tracks numbers start at 1.
++ track_num in obj. Track numbers usually start at something
++ greater than 0, usually 1.
++
+ The "leadout" track is specified either by
+ using track_num LEADOUT_TRACK or the total tracks+1.
+ False is returned if there is no entry.
+ */
+ static bool
+-_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
++_cdio_get_track_msf(void *p_user_data, track_t i_track, msf_t *msf)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = p_user_data;
+
+ if (NULL == msf) return false;
+
+- if (!_obj->gen.init) _cdio_init(_obj);
+- if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
++ if (!p_env->gen.init) init_solaris(p_env);
++ if (!p_env->gen.toc_init) read_toc_solaris (p_env) ;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK)
++ i_track = p_env->gen.i_tracks + p_env->gen.i_first_track;
+
+- if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
++ if (i_track > (p_env->gen.i_tracks+p_env->gen.i_first_track)
++ || i_track < p_env->gen.i_first_track) {
+ return false;
+ } else {
+- struct cdrom_tocentry *msf0 = &_obj->tocent[track_num-1];
+- msf->m = to_bcd8(msf0->cdte_addr.msf.minute);
+- msf->s = to_bcd8(msf0->cdte_addr.msf.second);
+- msf->f = to_bcd8(msf0->cdte_addr.msf.frame);
++ struct cdrom_tocentry *msf0 = &p_env->tocent[i_track-1];
++ msf->m = cdio_to_bcd8(msf0->cdte_addr.msf.minute);
++ msf->s = cdio_to_bcd8(msf0->cdte_addr.msf.second);
++ msf->f = cdio_to_bcd8(msf0->cdte_addr.msf.frame);
+ return true;
+ }
+ }
+@@ -603,6 +758,7 @@
+ {
+ return strdup(DEFAULT_CDIO_DEVICE);
+ }
++
+ #endif /* HAVE_SOLARIS_CDROM */
+
+ /*!
+@@ -614,21 +770,41 @@
+ #ifndef HAVE_SOLARIS_CDROM
+ return NULL;
+ #else
++ char volpath[256];
++ struct stat st;
+ char **drives = NULL;
+- unsigned int num_files=0;
++ unsigned int i_files=0;
+ #ifdef HAVE_GLOB_H
+ unsigned int i;
+ glob_t globbuf;
++
+ globbuf.gl_offs = 0;
+ glob("/vol/dev/aliases/cdrom*", GLOB_DOOFFS, NULL, &globbuf);
+ for (i=0; i<globbuf.gl_pathc; i++) {
+- cdio_add_device_list(&drives, globbuf.gl_pathv[i], &num_files);
++ if(stat(globbuf.gl_pathv[i], &st) < 0)
++ continue;
++
++ /* Check if this is a directory, if so it's probably Solaris media */
++ if(S_ISDIR(st.st_mode)) {
++ sprintf(volpath, "%s/s0", globbuf.gl_pathv[i]);
++ if(stat(volpath, &st) == 0)
++ cdio_add_device_list(&drives, volpath, &i_files);
++ }else
++ cdio_add_device_list(&drives, globbuf.gl_pathv[i], &i_files);
+ }
+ globfree(&globbuf);
+ #else
+- cdio_add_device_list(&drives, DEFAULT_CDIO_DEVICE, &num_files);
++ if(stat(DEFAULT_CDIO_DEVICE, &st) == 0) {
++ /* Check if this is a directory, if so it's probably Solaris media */
++ if(S_ISDIR(st.st_mode)) {
++ sprintf(volpath, "%s/s0", DEFAULT_CDIO_DEVICE);
++ if(stat(volpath, &st) == 0)
++ cdio_add_device_list(&drives, volpath, &i_files);
++ }else
++ cdio_add_device_list(&drives, DEFAULT_CDIO_DEVICE, &i_files);
++ }
+ #endif /*HAVE_GLOB_H*/
+- cdio_add_device_list(&drives, NULL, &num_files);
++ cdio_add_device_list(&drives, NULL, &i_files);
+ return drives;
+ #endif /*HAVE_SOLARIS_CDROM*/
+ }
+@@ -639,47 +815,85 @@
+ ones to set that up.
+ */
+ CdIo *
+-cdio_open_solaris (const char *source_name)
++cdio_open_solaris (const char *psz_source_name)
++{
++ return cdio_open_am_solaris(psz_source_name, NULL);
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
+ {
+
+ #ifdef HAVE_SOLARIS_CDROM
+ CdIo *ret;
+ _img_private_t *_data;
++ char *psz_source;
++
++ cdio_funcs _funcs;
+
+- cdio_funcs _funcs = {
+- .eject_media = _cdio_eject_media,
+- .free = cdio_generic_free,
+- .get_arg = _cdio_get_arg,
+- .get_devices = cdio_get_devices_solaris,
+- .get_default_device = cdio_get_default_device_solaris,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_mcn = NULL,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
+- .get_track_lba = NULL, /* This could be implemented if need be. */
+- .get_track_msf = _cdio_get_track_msf,
+- .lseek = cdio_generic_lseek,
+- .read = cdio_generic_read,
+- .read_audio_sectors = _cdio_read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .stat_size = _cdio_stat_size,
+- .set_arg = _cdio_set_arg
+- };
++ _funcs.eject_media = eject_media_solaris;
++ _funcs.free = cdio_generic_free;
++ _funcs.get_arg = get_arg_solaris;
++ _funcs.get_cdtext = get_cdtext_generic;
++ _funcs.get_default_device = cdio_get_default_device_solaris;
++ _funcs.get_devices = cdio_get_devices_solaris;
++ _funcs.get_discmode = get_discmode_solaris;
++ _funcs.get_drive_cap = scsi_mmc_get_drive_cap_generic;
++ _funcs.get_first_track_num= get_first_track_num_generic;
++ _funcs.get_hwinfo = NULL;
++ _funcs.get_mcn = scsi_mmc_get_mcn_generic,
++ _funcs.get_num_tracks = get_num_tracks_generic;
++ _funcs.get_track_format = get_track_format_solaris;
++ _funcs.get_track_green = _cdio_get_track_green;
++ _funcs.get_track_lba = NULL; /* This could be implemented if need be. */
++ _funcs.get_track_msf = _cdio_get_track_msf;
++ _funcs.lseek = cdio_generic_lseek;
++ _funcs.read = cdio_generic_read;
++ _funcs.read_audio_sectors = _read_audio_sectors_solaris;
++ _funcs.read_mode1_sector = _read_mode1_sector_solaris;
++ _funcs.read_mode1_sectors = _read_mode1_sectors_solaris;
++ _funcs.read_mode2_sector = _read_mode2_sector_solaris;
++ _funcs.read_mode2_sectors = _read_mode2_sectors_solaris;
++ _funcs.read_toc = read_toc_solaris;
++ _funcs.run_scsi_mmc_cmd = run_scsi_cmd_solaris;
++ _funcs.stat_size = _cdio_stat_size;
++ _funcs.set_arg = _set_arg_solaris;
+
+ _data = _cdio_malloc (sizeof (_img_private_t));
+- _data->gen.fd = -1;
+
+- _cdio_set_arg(_data, "source", (NULL == source_name)
+- ? DEFAULT_CDIO_DEVICE: source_name);
++ _data->access_mode = _AM_SUN_CTRL_SCSI;
++ _data->gen.init = false;
++ _data->gen.fd = -1;
++ _data->gen.toc_init = false;
++ _data->gen.b_cdtext_init = false;
++ _data->gen.b_cdtext_error = false;
++
++ if (NULL == psz_orig_source) {
++ psz_source = cdio_get_default_device_solaris();
++ if (NULL == psz_source) return NULL;
++ _set_arg_solaris(_data, "source", psz_source);
++ free(psz_source);
++ } else {
++ if (cdio_is_device_generic(psz_orig_source))
++ _set_arg_solaris(_data, "source", psz_orig_source);
++ else {
++ /* The below would be okay if all device drivers worked this way. */
++#if 0
++ cdio_info ("source %s is not a device", psz_orig_source);
++#endif
++ return NULL;
++ }
++ }
+
+- ret = cdio_new (_data, &_funcs);
++ ret = cdio_new ( (void *) _data, &_funcs );
+ if (ret == NULL) return NULL;
+
+- if (_cdio_init(_data))
++ if (init_solaris(_data))
+ return ret;
+ else {
+ cdio_generic_free (_data);
+@@ -701,4 +915,3 @@
+ return false;
+ #endif /* HAVE_SOLARIS_CDROM */
+ }
+-
+--- ./src/input/vcd/libcdio/cd_types.c 22 Jul 2004 14:15:19 -0000 1.3
++++ ./src/input/vcd/libcdio/cd_types.c 3 Jan 2005 21:13:57 -0000 1.3.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: cd_types.c,v 1.3 2004/07/22 14:15:19 mroi Exp $
++ $Id: cd_types.c,v 1.3.2.1 2005/01/03 21:13:57 mroi Exp $
+
+- Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -63,9 +63,13 @@
+ static char buffer[6][CDIO_CD_FRAMESIZE_RAW]; /* for CD-Data */
+
+ /* Some interesting sector numbers stored in the above buffer. */
++#define ISO_SUPERBLOCK_SECTOR 16 /* buffer[0] */
+ #define UFS_SUPERBLOCK_SECTOR 4 /* buffer[2] */
+ #define BOOT_SECTOR 17 /* buffer[3] */
+ #define VCD_INFO_SECTOR 150 /* buffer[4] */
++#define XISO_SECTOR 32 /* buffer[4] */
++#define UDFX_SECTOR 32 /* buffer[4] */
++#define UDF_ANCHOR_SECTOR 256 /* buffer[5] */
+
+
+ typedef struct signature
+@@ -79,6 +83,8 @@
+ static signature_t sigs[] =
+ {
+ /*buffer[x] off look for description */
++ {0, 0, "MICROSOFT*XBOX*MEDIA", "XBOX CD"},
++ {0, 1, "BEA01", "UDF"},
+ {0, 1, ISO_STANDARD_ID, "ISO 9660"},
+ {0, 1, "CD-I", "CD-I"},
+ {0, 8, "CDTV", "CDTV"},
+@@ -97,19 +103,21 @@
+
+
+ /* The below index into the above sigs array. Make sure things match. */
+-#define INDEX_ISOFS 0
+-#define INDEX_CD_I 1
+-#define INDEX_CDTV 2
+-#define INDEX_CD_RTOS 3
+-#define INDEX_HS 4
+-#define INDEX_BRIDGE 5
+-#define INDEX_XA 6
+-#define INDEX_PHOTO_CD 7
+-#define INDEX_EXT2 8
+-#define INDEX_UFS 9
+-#define INDEX_BOOTABLE 10
+-#define INDEX_VIDEO_CD 11 /* Video CD */
+-#define INDEX_SVCD 12 /* CVD *or* SVCD */
++#define INDEX_XISO 0 /* Microsoft X-BOX filesystem */
++#define INDEX_UDF 1
++#define INDEX_ISOFS 2
++#define INDEX_CD_I 3
++#define INDEX_CDTV 4
++#define INDEX_CD_RTOS 5
++#define INDEX_HS 6
++#define INDEX_BRIDGE 7
++#define INDEX_XA 8
++#define INDEX_PHOTO_CD 9
++#define INDEX_EXT2 10
++#define INDEX_UFS 11
++#define INDEX_BOOTABLE 12
++#define INDEX_VIDEO_CD 13 /* Video CD */
++#define INDEX_SVCD 14 /* CVD *or* SVCD */
+
+
+ /*
+@@ -118,21 +126,21 @@
+ */
+ static int
+ _cdio_read_block(const CdIo *cdio, int superblock, uint32_t offset,
+- uint8_t bufnum, track_t track_num)
++ uint8_t bufnum, track_t i_track)
+ {
+- unsigned int track_sec_count = cdio_get_track_sec_count(cdio, track_num);
++ unsigned int track_sec_count = cdio_get_track_sec_count(cdio, i_track);
+ memset(buffer[bufnum], 0, CDIO_CD_FRAMESIZE);
+
+ if ( track_sec_count < superblock) {
+ cdio_debug("reading block %u skipped track %d has only %u sectors\n",
+- superblock, track_num, track_sec_count);
++ superblock, i_track, track_sec_count);
+ return -1;
+ }
+
+ cdio_debug("about to read sector %lu\n",
+ (long unsigned int) offset+superblock);
+
+- if (cdio_get_track_green(cdio, track_num)) {
++ if (cdio_get_track_green(cdio, i_track)) {
+ if (0 > cdio_read_mode2_sector(cdio, buffer[bufnum],
+ offset+superblock, false))
+ return -1;
+@@ -180,6 +188,12 @@
+ return 2 == buffer[3][0] && buffer[3][88] == 0x25 && buffer[3][89] == 0x2f;
+ }
+
++static int
++_cdio_is_UDF(void)
++{
++ return 2 == ((uint16_t)buffer[5][0] | ((uint16_t)buffer[5][1] << 8));
++}
++
+ /* ISO 9660 volume space in M2F1_SECTOR_SIZE byte units */
+ static int
+ _cdio_get_iso9660_fs_sec_count(void)
+@@ -203,23 +217,47 @@
+
+ /*
+ Try to determine what kind of CD-image and/or filesystem we
+- have at track track_num. Return information about the CD image
++ have at track i_track. Return information about the CD image
+ is returned in cdio_analysis and the return value.
+ */
+ cdio_fs_anal_t
+-cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t track_num,
++cdio_guess_cd_type(const CdIo *cdio, int start_session, track_t i_track,
+ /*out*/ cdio_iso_analysis_t *iso_analysis)
+ {
+- int ret = 0;
++ int ret = CDIO_FS_UNKNOWN;
+ bool sector0_read_ok;
+
+- if (TRACK_FORMAT_AUDIO == cdio_get_track_format(cdio, track_num))
++ if (TRACK_FORMAT_AUDIO == cdio_get_track_format(cdio, i_track))
+ return CDIO_FS_AUDIO;
+
+ if ( _cdio_read_block(cdio, ISO_PVD_SECTOR, start_session,
+- 0, track_num) < 0 )
++ 0, i_track) < 0 )
+ return CDIO_FS_UNKNOWN;
+
++ if ( _cdio_is_it(INDEX_XISO) )
++ return CDIO_FS_ANAL_XISO;
++
++ if (_cdio_read_block(cdio, ISO_SUPERBLOCK_SECTOR, start_session, 0,
++ i_track) < 0)
++ return ret;
++
++ if ( _cdio_is_it(INDEX_UDF) ) {
++ /* Detect UDF version
++ Test if we have a valid version of UDF the xbox can read natively */
++ if (_cdio_read_block(cdio, 35, start_session, 5, i_track) < 0)
++ return CDIO_FS_UNKNOWN;
++
++ iso_analysis->UDFVerMinor=(unsigned int)buffer[5][240];
++ iso_analysis->UDFVerMajor=(unsigned int)buffer[5][241];
++ /* Read disc label */
++ if (_cdio_read_block(cdio, 32, start_session, 5, i_track) < 0)
++ return CDIO_FS_UDF;
++
++ strncpy(iso_analysis->iso_label, buffer[5]+25, 33);
++ iso_analysis->iso_label[32] = '\0';
++ return CDIO_FS_UDF;
++ }
++
+ /* We have something that smells of a filesystem. */
+ if (_cdio_is_it(INDEX_CD_I) && _cdio_is_it(INDEX_CD_RTOS)
+ && !_cdio_is_it(INDEX_BRIDGE) && !_cdio_is_it(INDEX_XA)) {
+@@ -228,7 +266,7 @@
+ /* read sector 0 ONLY, when NO greenbook CD-I !!!! */
+
+ sector0_read_ok =
+- _cdio_read_block(cdio, 0, start_session, 1, track_num) == 0;
++ _cdio_read_block(cdio, 0, start_session, 1, i_track) == 0;
+
+ if (_cdio_is_it(INDEX_HS))
+ ret |= CDIO_FS_HIGH_SIERRA;
+@@ -240,14 +278,40 @@
+ else
+ ret = CDIO_FS_ISO_9660;
+ iso_analysis->isofs_size = _cdio_get_iso9660_fs_sec_count();
+- snprintf(iso_analysis->iso_label, 33, "%s", buffer[0]+40);
++ strncpy(iso_analysis->iso_label, buffer[0]+40,33);
++ iso_analysis->iso_label[32] = '\0';
+
++ if ( _cdio_read_block(cdio, UDF_ANCHOR_SECTOR, start_session, 5,
++ i_track) < 0)
++ return ret;
++
++ /* Maybe there is an UDF anchor in IOS session
++ so its ISO/UDF session and we prefere UDF */
++ if ( _cdio_is_UDF() ) {
++ /* Detect UDF version.
++ Test if we have a valid version of UDF the xbox can read natively */
++ if ( _cdio_read_block(cdio, 35, start_session, 5, i_track) < 0)
++ return ret;
++
++ iso_analysis->UDFVerMinor=(unsigned int)buffer[5][240];
++ iso_analysis->UDFVerMajor=(unsigned int)buffer[5][241];
++#if 0
++ /* We are using ISO/UDF cd's as iso,
++ no need to get UDF disc label */
++ if (_cdio_read_block(cdio, 32, start_session, 5, i_track) < 0)
++ return ret;
++ stnrcpy(iso_analysis->iso_label, buffer[5]+25, 33);
++ iso_analysis->iso_label[32] = '\0';
++#endif
++ ret=CDIO_FS_ISO_UDF;
++ }
++
+ #if 0
+ if (_cdio_is_rockridge())
+ ret |= CDIO_FS_ANAL_ROCKRIDGE;
+ #endif
+
+- if (_cdio_read_block(cdio, BOOT_SECTOR, start_session, 3, track_num) < 0)
++ if (_cdio_read_block(cdio, BOOT_SECTOR, start_session, 3, i_track) < 0)
+ return ret;
+
+ if (_cdio_is_joliet()) {
+@@ -261,7 +325,7 @@
+ && !(sector0_read_ok && _cdio_is_it(INDEX_PHOTO_CD)) ) {
+
+ if ( _cdio_read_block(cdio, VCD_INFO_SECTOR, start_session, 4,
+- track_num) < 0 )
++ i_track) < 0 )
+ return ret;
+
+ if (_cdio_is_it(INDEX_BRIDGE) && _cdio_is_it(INDEX_CD_RTOS)) {
+@@ -276,7 +340,7 @@
+ else if (_cdio_is_3do()) ret |= CDIO_FS_3DO;
+ else {
+ if ( _cdio_read_block(cdio, UFS_SUPERBLOCK_SECTOR, start_session, 2,
+- track_num) < 0 )
++ i_track) < 0 )
+ return ret;
+
+ if (sector0_read_ok && _cdio_is_it(INDEX_UFS))
+--- ./src/input/vcd/libcdio/cdio.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: cdio.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: cdio.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+@@ -26,7 +26,9 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ #include <errno.h>
+ #include <string.h>
+
+@@ -37,7 +39,7 @@
+ #include <cdio/logging.h>
+ #include "cdio_private.h"
+
+-static const char _rcsid[] = "$Id: cdio.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: cdio.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+
+ const char *track_format2str[6] =
+@@ -45,6 +47,24 @@
+ "audio", "CD-i", "XA", "data", "PSX", "error"
+ };
+
++/* Must match discmode enumeration */
++const char *discmode2str[] = {
++ "CD-DA",
++ "CD-DATA Form 1",
++ "CD DATA Form 2",
++ "CD-ROM Mixed",
++ "DVD-ROM",
++ "DVD-RAM",
++ "DVD-R",
++ "DVD-RW",
++ "DVD+R",
++ "DVD+RW",
++ "Unknown/unclassified DVD",
++ "No information",
++ "Error in getting information"
++};
++
++
+ /* The below array gives of the drivers that are currently available for
+ on a particular host. */
+
+@@ -58,13 +78,28 @@
+ #define CDIO_DRIVER_UNINIT -1
+ int CdIo_last_driver = CDIO_DRIVER_UNINIT;
+
++#ifdef HAVE_BSDI_CDROM
++const driver_id_t cdio_os_driver = DRIVER_BSDI;
++#elif HAVE_FREEBSD_CDROM
++const driver_id_t cdio_os_driver = DRIVER_FREEBSD;
++#elif HAVE_LINUX_CDROM
++const driver_id_t cdio_os_driver = DRIVER_LINUX;
++#elif HAVE_DARWIN_CDROM
++const driver_id_t cdio_os_driver = DRIVER_OSX;
++#elif HAVE_DARWIN_SOLARIS
++const driver_id_t cdio_os_driver = DRIVER_SOLARIS;
++#elif HAVE_DARWIN_WIN32
++const driver_id_t cdio_os_driver = DRIVER_WIN32;
++#else
++const driver_id_t cdio_os_driver = DRIVER_UNKNOWN;
++#endif
++
+ static bool
+ cdio_have_false(void)
+ {
+ return false;
+ }
+
+-
+ /* The below array gives all drivers that can possibly appear.
+ on a particular host. */
+
+@@ -77,6 +112,7 @@
+ NULL,
+ NULL,
+ NULL,
++ NULL,
+ NULL
+ },
+
+@@ -86,6 +122,7 @@
+ "BSDI ATAPI and SCSI driver",
+ &cdio_have_bsdi,
+ &cdio_open_bsdi,
++ &cdio_open_am_bsdi,
+ &cdio_get_default_device_bsdi,
+ &cdio_is_device_generic,
+ &cdio_get_devices_bsdi
+@@ -97,6 +134,7 @@
+ "FreeBSD driver",
+ &cdio_have_freebsd,
+ &cdio_open_freebsd,
++ &cdio_open_am_freebsd,
+ &cdio_get_default_device_freebsd,
+ &cdio_is_device_generic,
+ NULL
+@@ -108,6 +146,7 @@
+ "GNU/Linux ioctl and MMC driver",
+ &cdio_have_linux,
+ &cdio_open_linux,
++ &cdio_open_am_linux,
+ &cdio_get_default_device_linux,
+ &cdio_is_device_generic,
+ &cdio_get_devices_linux
+@@ -119,6 +158,7 @@
+ "Solaris ATAPI and SCSI driver",
+ &cdio_have_solaris,
+ &cdio_open_solaris,
++ &cdio_open_am_solaris,
+ &cdio_get_default_device_solaris,
+ &cdio_is_device_generic,
+ &cdio_get_devices_solaris
+@@ -130,6 +170,7 @@
+ "Apple Darwin OS X driver",
+ &cdio_have_osx,
+ &cdio_open_osx,
++ &cdio_open_am_osx,
+ &cdio_get_default_device_osx,
+ &cdio_is_device_generic,
+ &cdio_get_devices_osx
+@@ -138,20 +179,34 @@
+ {DRIVER_WIN32,
+ CDIO_SRC_IS_DEVICE_MASK|CDIO_SRC_IS_NATIVE_MASK|CDIO_SRC_IS_SCSI_MASK,
+ "WIN32",
+- "Windows 32-bit ASPI and winNT/2K/XP ioctl driver",
++ "MS Windows ASPI and ioctl driver",
+ &cdio_have_win32,
+ &cdio_open_win32,
++ &cdio_open_am_win32,
+ &cdio_get_default_device_win32,
+ &cdio_is_device_win32,
+ &cdio_get_devices_win32
+ },
+
++ {DRIVER_CDRDAO,
++ CDIO_SRC_IS_DISK_IMAGE_MASK,
++ "CDRDAO",
++ "cdrdao (TOC) disk image driver",
++ &cdio_have_cdrdao,
++ &cdio_open_cdrdao,
++ &cdio_open_am_cdrdao,
++ &cdio_get_default_device_cdrdao,
++ NULL,
++ &cdio_get_devices_cdrdao
++ },
++
+ {DRIVER_BINCUE,
+ CDIO_SRC_IS_DISK_IMAGE_MASK,
+ "BIN/CUE",
+ "bin/cuesheet disk image driver",
+ &cdio_have_bincue,
+ &cdio_open_bincue,
++ &cdio_open_am_bincue,
+ &cdio_get_default_device_bincue,
+ NULL,
+ &cdio_get_devices_bincue
+@@ -163,6 +218,7 @@
+ "Nero NRG disk image driver",
+ &cdio_have_nrg,
+ &cdio_open_nrg,
++ &cdio_open_am_nrg,
+ &cdio_get_default_device_nrg,
+ NULL,
+ &cdio_get_devices_nrg
+@@ -171,13 +227,15 @@
+ };
+
+ static CdIo *
+-scan_for_driver(driver_id_t start, driver_id_t end, const char *source_name)
++scan_for_driver(driver_id_t start, driver_id_t end,
++ const char *psz_source, const char *access_mode)
+ {
+ driver_id_t driver_id;
+
+ for (driver_id=start; driver_id<=end; driver_id++) {
+ if ((*CdIo_all_drivers[driver_id].have_driver)()) {
+- CdIo *ret=(*CdIo_all_drivers[driver_id].driver_open)(source_name);
++ CdIo *ret=
++ (*CdIo_all_drivers[driver_id].driver_open_am)(psz_source, access_mode);
+ if (ret != NULL) {
+ ret->driver_id = driver_id;
+ return ret;
+@@ -246,6 +304,25 @@
+ }
+ }
+
++/*!
++ Get cdtext information for a CdIo object .
++
++ @param obj the CD object that may contain CD-TEXT information.
++ @return the CD-TEXT object or NULL if obj is NULL
++ or CD-TEXT information does not exist.
++*/
++const cdtext_t *
++cdio_get_cdtext (CdIo *obj, track_t i_track)
++{
++ if (obj == NULL) return NULL;
++
++ if (obj->op.get_cdtext) {
++ return obj->op.get_cdtext (obj->env, i_track);
++ } else {
++ return NULL;
++ }
++}
++
+ /*!
+ Return a string containing the default CD device if none is specified.
+ if CdIo is NULL (we haven't initialized a specific device driver),
+@@ -285,22 +362,31 @@
+ char **
+ cdio_get_devices (driver_id_t driver_id)
+ {
+- CdIo *cdio;
++ /* Probably could get away with &driver_id below. */
++ driver_id_t driver_id_temp = driver_id;
++ return cdio_get_devices_ret (&driver_id_temp);
++}
+
+- switch (driver_id) {
++char **
++cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id)
++{
++ CdIo *p_cdio;
++
++ switch (*p_driver_id) {
+ /* FIXME: spit out unknown to give image drivers as well. */
+ case DRIVER_UNKNOWN:
+ case DRIVER_DEVICE:
+- cdio = scan_for_driver(DRIVER_UNKNOWN, CDIO_MAX_DRIVER, NULL);
++ p_cdio = scan_for_driver(DRIVER_UNKNOWN, CDIO_MAX_DRIVER, NULL, NULL);
++ *p_driver_id = cdio_get_driver_id(p_cdio);
+ break;
+ default:
+- return (*CdIo_all_drivers[driver_id].get_devices)();
++ return (*CdIo_all_drivers[*p_driver_id].get_devices)();
+ }
+
+- if (cdio == NULL) return NULL;
+- if (cdio->op.get_devices) {
+- char **devices = cdio->op.get_devices ();
+- cdio_destroy(cdio);
++ if (p_cdio == NULL) return NULL;
++ if (p_cdio->op.get_devices) {
++ char **devices = p_cdio->op.get_devices ();
++ cdio_destroy(p_cdio);
+ return devices;
+ } else {
+ return NULL;
+@@ -324,14 +410,26 @@
+ the value is NULL. This also means nothing was found.
+ */
+ char **
+-cdio_get_devices_with_cap (char* search_devices[],
++cdio_get_devices_with_cap (/*out*/ char* search_devices[],
+ cdio_fs_anal_t capabilities, bool any)
+ {
++ driver_id_t p_driver_id;
++ return cdio_get_devices_with_cap_ret (search_devices, capabilities, any,
++ &p_driver_id);
++}
++
++char **
++cdio_get_devices_with_cap_ret (/*out*/ char* search_devices[],
++ cdio_fs_anal_t capabilities, bool any,
++ /*out*/ driver_id_t *p_driver_id)
++{
+ char **drives=search_devices;
+ char **drives_ret=NULL;
+- int num_drives=0;
++ unsigned int i_drives=0;
++
++ *p_driver_id = DRIVER_DEVICE;
+
+- if (NULL == drives) drives=cdio_get_devices(DRIVER_DEVICE);
++ if (NULL == drives) drives=cdio_get_devices_ret(p_driver_id);
+ if (NULL == drives) return NULL;
+
+ if (capabilities == CDIO_FS_MATCH_ALL) {
+@@ -339,7 +437,7 @@
+ char **d = drives;
+
+ for( ; *d != NULL; d++ ) {
+- cdio_add_device_list(&drives_ret, *d, &num_drives);
++ cdio_add_device_list(&drives_ret, *d, &i_drives);
+ }
+ } else {
+ cdio_fs_anal_t got_fs=0;
+@@ -349,7 +447,7 @@
+ need_fs_ext = capabilities & ~CDIO_FS_MASK;
+
+ for( ; *d != NULL; d++ ) {
+- CdIo *cdio = cdio_open(*d, DRIVER_UNKNOWN);
++ CdIo *cdio = cdio_open(*d, *p_driver_id);
+
+ if (NULL != cdio) {
+ track_t first_track = cdio_get_first_track_num(cdio);
+@@ -363,19 +461,84 @@
+ ? (got_fs & need_fs_ext) != 0
+ : (got_fs | ~need_fs_ext) == -1;
+ if (doit)
+- cdio_add_device_list(&drives_ret, *drives, &num_drives);
++ cdio_add_device_list(&drives_ret, *d, &i_drives);
+ }
+
+ cdio_destroy(cdio);
+ }
+ }
+ }
+- cdio_add_device_list(&drives_ret, NULL, &num_drives);
++ cdio_add_device_list(&drives_ret, NULL, &i_drives);
+ cdio_free_device_list(drives);
+ free(drives);
+ return drives_ret;
+ }
+
++/*!
++ Get medium associated with cd_obj.
++*/
++discmode_t
++cdio_get_discmode (CdIo *cd_obj)
++{
++ if (cd_obj == NULL) return CDIO_DISC_MODE_ERROR;
++
++ if (cd_obj->op.get_discmode) {
++ return cd_obj->op.get_discmode (cd_obj->env);
++ } else {
++ return CDIO_DISC_MODE_NO_INFO;
++ }
++}
++
++/*!
++ Return the the kind of drive capabilities of device.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++void
++cdio_get_drive_cap (const CdIo *p_cdio,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ /* This seems like a safe bet. */
++ *p_read_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ *p_write_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ *p_misc_cap = CDIO_DRIVE_CAP_UNKNOWN;
++
++ if (p_cdio && p_cdio->op.get_drive_cap) {
++ p_cdio->op.get_drive_cap(p_cdio->env, p_read_cap, p_write_cap, p_misc_cap);
++ }
++}
++
++/*!
++ Return the the kind of drive capabilities of device.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++void
++cdio_get_drive_cap_dev (const char *device,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ /* This seems like a safe bet. */
++ CdIo *cdio=scan_for_driver(CDIO_MIN_DRIVER, CDIO_MAX_DRIVER,
++ device, NULL);
++ if (cdio) {
++ cdio_get_drive_cap(cdio, p_read_cap, p_write_cap, p_misc_cap);
++ cdio_destroy(cdio);
++ } else {
++ *p_read_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ *p_write_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ *p_misc_cap = CDIO_DRIVE_CAP_UNKNOWN;
++ }
++}
++
++
+ /*!
+ Return a string containing the name of the driver in use.
+ if CdIo is NULL (we haven't initialized a specific device driver),
+@@ -384,21 +547,34 @@
+ const char *
+ cdio_get_driver_name (const CdIo *cdio)
+ {
++ if (NULL==cdio) return NULL;
+ return CdIo_all_drivers[cdio->driver_id].name;
+ }
+
++ /*!
++ Return the driver id.
++ if CdIo is NULL (we haven't initialized a specific device driver),
++ then return DRIVER_UNKNOWN.
++ */
++driver_id_t
++cdio_get_driver_id (const CdIo *cdio)
++{
++ if (NULL==cdio) return DRIVER_UNKNOWN;
++ return cdio->driver_id;
++}
++
+
+ /*!
+- Return the number of of the first track.
++ Return the number of the first track.
+ CDIO_INVALID_TRACK is returned on error.
+ */
+ track_t
+-cdio_get_first_track_num (const CdIo *cdio)
++cdio_get_first_track_num (const CdIo *p_cdio)
+ {
+- cdio_assert (cdio != NULL);
++ if (NULL == p_cdio) return CDIO_INVALID_TRACK;
+
+- if (cdio->op.get_first_track_num) {
+- return cdio->op.get_first_track_num (cdio->env);
++ if (p_cdio->op.get_first_track_num) {
++ return p_cdio->op.get_first_track_num (p_cdio->env);
+ } else {
+ return CDIO_INVALID_TRACK;
+ }
+@@ -409,11 +585,29 @@
+ if CdIo is NULL (we haven't initialized a specific device driver),
+ then return NULL.
+ */
++bool
++cdio_get_hwinfo (const CdIo *p_cdio, cdio_hwinfo_t *hw_info)
++{
++ if (!p_cdio) return false;
++ if (p_cdio->op.get_hwinfo) {
++ return p_cdio->op.get_hwinfo (p_cdio, hw_info);
++ } else {
++ /* Perhaps driver forgot to initialize. We are no worse off Using
++ scsi_mmc than returning false here. */
++ return scsi_mmc_get_hwinfo(p_cdio, hw_info);
++ }
++}
++
++/*!
++ Return a string containing the name of the driver in use.
++ if CdIo is NULL (we haven't initialized a specific device driver),
++ then return NULL.
++*/
+ char *
+-cdio_get_mcn (const CdIo *cdio)
++cdio_get_mcn (const CdIo *p_cdio)
+ {
+- if (cdio->op.get_mcn) {
+- return cdio->op.get_mcn (cdio->env);
++ if (p_cdio->op.get_mcn) {
++ return p_cdio->op.get_mcn (p_cdio->env);
+ } else {
+ return NULL;
+ }
+@@ -424,12 +618,12 @@
+ CDIO_INVALID_TRACK is returned on error.
+ */
+ track_t
+-cdio_get_num_tracks (const CdIo *cdio)
++cdio_get_num_tracks (const CdIo *p_cdio)
+ {
+- if (cdio == NULL) return CDIO_INVALID_TRACK;
++ if (p_cdio == NULL) return CDIO_INVALID_TRACK;
+
+- if (cdio->op.get_num_tracks) {
+- return cdio->op.get_num_tracks (cdio->env);
++ if (p_cdio->op.get_num_tracks) {
++ return p_cdio->op.get_num_tracks (p_cdio->env);
+ } else {
+ return CDIO_INVALID_TRACK;
+ }
+@@ -439,12 +633,12 @@
+ Get format of track.
+ */
+ track_format_t
+-cdio_get_track_format(const CdIo *cdio, track_t track_num)
++cdio_get_track_format(const CdIo *p_cdio, track_t i_track)
+ {
+- cdio_assert (cdio != NULL);
++ cdio_assert (p_cdio != NULL);
+
+- if (cdio->op.get_track_format) {
+- return cdio->op.get_track_format (cdio->env, track_num);
++ if (p_cdio->op.get_track_format) {
++ return p_cdio->op.get_track_format (p_cdio->env, i_track);
+ } else {
+ return TRACK_FORMAT_ERROR;
+ }
+@@ -562,11 +756,25 @@
+ return (*CdIo_all_drivers[driver_id].have_driver)();
+ }
+
++/*!
++ Return the Joliet level recognized for p_cdio.
++*/
++uint8_t
++cdio_get_joliet_level(const CdIo *p_cdio)
++{
++ if (!p_cdio) return 0;
++ {
++ const generic_img_private_t *p_env
++ = (generic_img_private_t *) (p_cdio->env);
++ return p_env->i_joliet_level;
++ }
++}
++
+ bool
+-cdio_is_device(const char *source_name, driver_id_t driver_id)
++cdio_is_device(const char *psz_source, driver_id_t driver_id)
+ {
+ if (CdIo_all_drivers[driver_id].is_device == NULL) return false;
+- return (*CdIo_all_drivers[driver_id].is_device)(source_name);
++ return (*CdIo_all_drivers[driver_id].is_device)(psz_source);
+ }
+
+
+@@ -599,16 +807,19 @@
+ }
+
+ CdIo *
+-cdio_new (void *env, const cdio_funcs *funcs)
++cdio_new (generic_img_private_t *p_env, cdio_funcs *p_funcs)
+ {
+- CdIo *new_cdio;
+-
+- new_cdio = _cdio_malloc (sizeof (CdIo));
+-
+- new_cdio->env = env;
+- new_cdio->op = *funcs;
++ CdIo *p_new_cdio = _cdio_malloc (sizeof (CdIo));
+
+- return new_cdio;
++ if (NULL == p_new_cdio) return NULL;
++
++ p_new_cdio->env = p_env; /* This is the private "environment" that
++ driver-dependent routines use. */
++ p_new_cdio->op = *p_funcs;
++ p_env->cdio = p_new_cdio; /* A way for the driver-dependent routines
++ to access the higher-level general cdio
++ object. */
++ return p_new_cdio;
+ }
+
+ /*!
+@@ -646,35 +857,44 @@
+ Similar to (if not the same as) libc's read()
+ */
+ ssize_t
+-cdio_read (const CdIo *cdio, void *buf, size_t size)
++cdio_read (const CdIo *p_cdio, void *buf, size_t size)
+ {
+- if (cdio == NULL) return -1;
++ if (p_cdio == NULL) return -1;
+
+- if (cdio->op.read)
+- return cdio->op.read (cdio->env, buf, size);
++ if (p_cdio->op.read)
++ return p_cdio->op.read (p_cdio->env, buf, size);
+ return -1;
+ }
+
++/*!
++ Reads an audio sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++*/
+ int
+-cdio_read_audio_sector (const CdIo *cdio, void *buf, lsn_t lsn)
++cdio_read_audio_sector (const CdIo *p_cdio, void *buf, lsn_t lsn)
+ {
+- cdio_assert (cdio != NULL);
+- cdio_assert (buf != NULL);
+
+- if (cdio->op.read_audio_sectors != NULL)
+- return cdio->op.read_audio_sectors (cdio->env, buf, lsn, 1);
++ if (NULL == p_cdio || NULL == buf || CDIO_INVALID_LSN == lsn )
++ return 0;
++
++ if (p_cdio->op.read_audio_sectors != NULL)
++ return p_cdio->op.read_audio_sectors (p_cdio->env, buf, lsn, 1);
+ return -1;
+ }
+
++/*!
++ Reads audio sectors from cd device into data starting
++ from lsn. Returns 0 if no error.
++*/
+ int
+-cdio_read_audio_sectors (const CdIo *cdio, void *buf, lsn_t lsn,
++cdio_read_audio_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn,
+ unsigned int nblocks)
+ {
+- cdio_assert (cdio != NULL);
+- cdio_assert (buf != NULL);
++ if ( NULL == p_cdio || NULL == buf || CDIO_INVALID_LSN == lsn )
++ return 0;
+
+- if (cdio->op.read_audio_sectors != NULL)
+- return cdio->op.read_audio_sectors (cdio->env, buf, lsn, nblocks);
++ if (p_cdio->op.read_audio_sectors != NULL)
++ return p_cdio->op.read_audio_sectors (p_cdio->env, buf, lsn, nblocks);
+ return -1;
+ }
+
+@@ -687,20 +907,21 @@
+ into data starting from lsn. Returns 0 if no error.
+ */
+ int
+-cdio_read_mode1_sector (const CdIo *cdio, void *data, lsn_t lsn, bool b_form2)
++cdio_read_mode1_sector (const CdIo *p_cdio, void *data, lsn_t lsn,
++ bool b_form2)
+ {
+ uint32_t size = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE ;
+- char buf[M2RAW_SECTOR_SIZE] = { 0, };
+
+- cdio_assert (cdio != NULL);
+- cdio_assert (data != NULL);
++ if (NULL == p_cdio || NULL == data || CDIO_INVALID_LSN == lsn )
++ return 0;
+
+- if (cdio->op.read_mode1_sector && cdio->op.read_mode1_sector) {
+- return cdio->op.read_mode1_sector(cdio->env, data, lsn, b_form2);
+- } else if (cdio->op.lseek && cdio->op.read) {
+- if (0 > cdio_lseek(cdio, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
++ if (p_cdio->op.read_mode1_sector) {
++ return p_cdio->op.read_mode1_sector(p_cdio->env, data, lsn, b_form2);
++ } else if (p_cdio->op.lseek && p_cdio->op.read) {
++ char buf[CDIO_CD_FRAMESIZE] = { 0, };
++ if (0 > cdio_lseek(p_cdio, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
+ return -1;
+- if (0 > cdio_read(cdio, buf, CDIO_CD_FRAMESIZE))
++ if (0 > cdio_read(p_cdio, buf, CDIO_CD_FRAMESIZE))
+ return -1;
+ memcpy (data, buf, size);
+ return 0;
+@@ -714,8 +935,10 @@
+ cdio_read_mode1_sectors (const CdIo *cdio, void *buf, lsn_t lsn,
+ bool b_form2, unsigned int num_sectors)
+ {
+- cdio_assert (cdio != NULL);
+- cdio_assert (buf != NULL);
++
++ if (NULL == cdio || NULL == buf || CDIO_INVALID_LSN == lsn )
++ return 0;
++
+ cdio_assert (cdio->op.read_mode1_sectors != NULL);
+
+ return cdio->op.read_mode1_sectors (cdio->env, buf, lsn, b_form2,
+@@ -730,8 +953,9 @@
+ cdio_read_mode2_sector (const CdIo *cdio, void *buf, lsn_t lsn,
+ bool b_form2)
+ {
+- cdio_assert (cdio != NULL);
+- cdio_assert (buf != NULL);
++ if (NULL == cdio || NULL == buf || CDIO_INVALID_LSN == lsn )
++ return 0;
++
+ cdio_assert (cdio->op.read_mode2_sector != NULL
+ || cdio->op.read_mode2_sectors != NULL);
+
+@@ -748,8 +972,10 @@
+ cdio_read_mode2_sectors (const CdIo *cdio, void *buf, lsn_t lsn,
+ bool b_form2, unsigned int num_sectors)
+ {
+- cdio_assert (cdio != NULL);
+- cdio_assert (buf != NULL);
++
++ if (NULL == cdio || NULL == buf || CDIO_INVALID_LSN == lsn )
++ return 0;
++
+ cdio_assert (cdio->op.read_mode2_sectors != NULL);
+
+ return cdio->op.read_mode2_sectors (cdio->env, buf, lsn,
+@@ -787,58 +1013,42 @@
+ CdIo *
+ cdio_open (const char *orig_source_name, driver_id_t driver_id)
+ {
+- char *source_name;
++ return cdio_open_am(orig_source_name, driver_id, NULL);
++}
++
++/*! Sets up to read from place specified by source_name and
++ driver_id. This should be called before using any other routine,
++ except cdio_init. This will call cdio_init, if that hasn't been
++ done previously.
++
++ NULL is returned on error.
++*/
++CdIo *
++cdio_open_am (const char *psz_orig_source, driver_id_t driver_id,
++ const char *psz_access_mode)
++{
++ char *psz_source;
+
+ if (CdIo_last_driver == -1) cdio_init();
+
+- if (NULL == orig_source_name || strlen(orig_source_name)==0)
+- source_name = cdio_get_default_device(NULL);
++ if (NULL == psz_orig_source || strlen(psz_orig_source)==0)
++ psz_source = cdio_get_default_device(NULL);
+ else
+- source_name = strdup(orig_source_name);
++ psz_source = strdup(psz_orig_source);
+
+- retry:
+ switch (driver_id) {
+ case DRIVER_UNKNOWN:
+ {
+ CdIo *cdio=scan_for_driver(CDIO_MIN_DRIVER, CDIO_MAX_DRIVER,
+- source_name);
+- if (cdio != NULL && cdio_is_device(source_name, cdio->driver_id)) {
+- driver_id = cdio->driver_id;
+- } else {
+- struct stat buf;
+- if (0 != stat(source_name, &buf)) {
+- return NULL;
+- }
+- if (S_ISREG(buf.st_mode)) {
+- /* FIXME: check to see if is a text file. If so, then
+- set SOURCE_CUE. */
+- int i=strlen(source_name)-strlen("bin");
+- if (i > 0
+- && ( (source_name)[i] =='n' || (source_name)[i] =='N' )
+- && ( (source_name)[i+1] =='r' || (source_name)[i+1] =='R' )
+- && ( (source_name)[i+2] =='g' || (source_name)[i+2] =='G' ) )
+- driver_id = DRIVER_NRG;
+- else if (i > 0
+- && ( (source_name)[i] =='c' || (source_name)[i] =='C')
+- && ( (source_name)[i+1] =='u' || (source_name)[i+1] =='U')
+- && ( (source_name)[i+2] =='e' || (source_name)[i+2] =='E') )
+- driver_id = DRIVER_BINCUE;
+- else
+- driver_id = DRIVER_BINCUE;
+- } else {
+- cdio_destroy(cdio);
+- return NULL;
+- }
+-
+- }
+- cdio_destroy(cdio);
+- goto retry;
++ psz_source, psz_access_mode);
++ free(psz_source);
++ return cdio;
+ }
+ case DRIVER_DEVICE:
+ {
+ /* Scan for a driver. */
+- CdIo *ret = cdio_open_cd(source_name);
+- free(source_name);
++ CdIo *ret = cdio_open_am_cd(psz_source, psz_access_mode);
++ free(psz_source);
+ return ret;
+ }
+ break;
+@@ -850,19 +1060,42 @@
+ case DRIVER_OSX:
+ case DRIVER_NRG:
+ case DRIVER_BINCUE:
++ case DRIVER_CDRDAO:
+ if ((*CdIo_all_drivers[driver_id].have_driver)()) {
+- CdIo *ret = (*CdIo_all_drivers[driver_id].driver_open)(source_name);
++ CdIo *ret =
++ (*CdIo_all_drivers[driver_id].driver_open_am)(psz_source,
++ psz_access_mode);
+ if (ret) ret->driver_id = driver_id;
+- free(source_name);
++ free(psz_source);
+ return ret;
+ }
+ }
+
+- free(source_name);
++ free(psz_source);
+ return NULL;
+ }
+
+
++/*!
++ Set up CD-ROM for reading. The device_name is
++ the some sort of device name.
++
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no driver for a some sort of hardware CD-ROM.
++*/
++CdIo *
++cdio_open_cd (const char *psz_source)
++{
++ return cdio_open_am_cd(psz_source, NULL);
++}
++
++/*!
++ Set up CD-ROM for reading. The device_name is
++ the some sort of device name.
++
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no driver for a some sort of hardware CD-ROM.
++*/
+ /* In the future we'll have more complicated code to allow selection
+ of an I/O routine as well as code to find an appropriate default
+ routine among the "registered" routines. Possibly classes too
+@@ -872,13 +1105,13 @@
+ For now though, we'll start more simply...
+ */
+ CdIo *
+-cdio_open_cd (const char *source_name)
++cdio_open_am_cd (const char *psz_source, const char *psz_access_mode)
+ {
+ if (CdIo_last_driver == -1) cdio_init();
+
+ /* Scan for a driver. */
+ return scan_for_driver(CDIO_MIN_DEVICE_DRIVER, CDIO_MAX_DEVICE_DRIVER,
+- source_name);
++ psz_source, psz_access_mode);
+ }
+
+
+--- ./src/input/vcd/libcdio/cdio_private.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio_private.h 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: cdio_private.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: cdio_private.h,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+@@ -29,6 +29,8 @@
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/cdtext.h>
++#include "scsi_mmc_private.h"
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -37,6 +39,18 @@
+ /* Opaque type */
+ typedef struct _CdioDataSource CdioDataSource;
+
++#ifdef __cplusplus
++}
++
++#endif /* __cplusplus */
++
++#include "generic.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++
+ typedef struct {
+
+ /*!
+@@ -55,6 +69,18 @@
+ */
+ const char * (*get_arg) (void *env, const char key[]);
+
++ /*!
++ Get cdtext information for a CdIo object.
++
++ @param obj the CD object that may contain CD-TEXT information.
++ @return the CD-TEXT object or NULL if obj is NULL
++ or CD-TEXT information does not exist.
++
++ If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned
++ is the information assocated with the CD.
++ */
++ const cdtext_t * (*get_cdtext) (void *env, track_t i_track);
++
+ /*!
+ Return an array of device names. if CdIo is NULL (we haven't
+ initialized a specific device driver), then find a suitable device
+@@ -69,19 +95,40 @@
+ */
+ char * (*get_default_device)(void);
+
+- /*!
+- Return the media catalog number MCN from the CD or NULL if
+- there is none or we don't have the ability to get it.
++ /*!
++ Get disc mode associated with cd_obj.
+ */
+- char * (*get_mcn) (void *env);
++ discmode_t (*get_discmode) (void *p_env);
+
+ /*!
++ Return the what kind of device we've got.
++
++ See cd_types.h for a list of bitmasks for the drive type;
++ */
++ void (*get_drive_cap) (const void *env,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap);
++ /*!
+ Return the number of of the first track.
+ CDIO_INVALID_TRACK is returned on error.
+ */
+- track_t (*get_first_track_num) (void *env);
++ track_t (*get_first_track_num) (void *p_env);
+
+ /*!
++ Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
++ False is returned if we had an error getting the information.
++ */
++ bool (*get_hwinfo) ( const CdIo *p_cdio,
++ /* out*/ cdio_hwinfo_t *p_hw_info );
++
++ /*!
++ Return the media catalog number MCN from the CD or NULL if
++ there is none or we don't have the ability to get it.
++ */
++ char * (*get_mcn) (const void *env);
++
++ /*!
+ Return the number of tracks in the current medium.
+ CDIO_INVALID_TRACK is returned on error.
+ */
+@@ -153,14 +200,14 @@
+ from lsn.
+ Returns 0 if no error.
+ */
+- int (*read_mode2_sectors) (void *env, void *buf, lsn_t lsn,
++ int (*read_mode2_sectors) (void *p_env, void *p_buf, lsn_t lsn,
+ bool mode2_form2, unsigned int nblocks);
+
+ /*!
+ Reads a single mode1 sector from cd device into buf starting
+ from lsn. Returns 0 if no error.
+ */
+- int (*read_mode1_sector) (void *env, void *buf, lsn_t lsn,
++ int (*read_mode1_sector) (void *p_env, void *p_buf, lsn_t lsn,
+ bool mode1_form2);
+
+ /*!
+@@ -168,9 +215,29 @@
+ from lsn.
+ Returns 0 if no error.
+ */
+- int (*read_mode1_sectors) (void *env, void *buf, lsn_t lsn,
++ int (*read_mode1_sectors) (void *p_env, void *p_buf, lsn_t lsn,
+ bool mode1_form2, unsigned int nblocks);
+
++ bool (*read_toc) ( void *p_env ) ;
++
++ /*!
++ Run a SCSI MMC command.
++
++ cdio CD structure set by cdio_open().
++ i_timeout_ms time in milliseconds we will wait for the command
++ to complete.
++ cdb_len number of bytes in cdb (6, 10, or 12).
++ cdb CDB bytes. All values that are needed should be set on
++ input.
++ b_return_data TRUE if the command expects data to be returned in
++ the buffer
++ len Size of buffer
++ buf Buffer for data, both sending and receiving
++
++ Returns 0 if command completed successfully.
++ */
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd;
++
+ /*!
+ Set the arg "key" with "value" in the source device.
+ */
+@@ -180,36 +247,18 @@
+ Return the size of the CD in logical block address (LBA) units.
+ */
+ uint32_t (*stat_size) (void *env);
+-
++
+ } cdio_funcs;
+
+
+- /* Implementation of CdIo type */
++ /*! Implementation of CdIo type */
+ struct _CdIo {
+- driver_id_t driver_id; /* Particular driver opened. */
+- cdio_funcs op; /* driver-specific routines handling implimentatin*/
+- void *env; /* environment. Passed to routine above. */
++ driver_id_t driver_id; /**< Particular driver opened. */
++ cdio_funcs op; /**< driver-specific routines handling
++ implementation*/
++ void *env; /**< environment. Passed to routine above. */
+ };
+
+- /*!
+- Things common to private device structures. Even though not all
+- devices may have some of these fields, by listing common ones
+- we facilitate writing generic routines and even cut-and-paste
+- code.
+- */
+- typedef struct {
+- char *source_name; /* Name used in open. */
+- bool init; /* True if structure has been initialized */
+- bool toc_init; /* True TOC read in */
+- int ioctls_debugged; /* for debugging */
+-
+- /* Only one of the below is used. The first is for CD-ROM devices
+- and the second for stream reading (bincue, nrg, toc, network).
+- */
+- int fd; /* File descriptor of device */
+- CdioDataSource *data_source;
+- } generic_img_private_t;
+-
+ /* This is used in drivers that must keep their own internal
+ position pointer for doing seeks. Stream-based drivers (like bincue,
+ nrg, toc, network) would use this.
+@@ -221,7 +270,7 @@
+ lba_t lba; /* Current LBA */
+ } internal_position_t;
+
+- CdIo * cdio_new (void *env, const cdio_funcs *funcs);
++ CdIo * cdio_new (generic_img_private_t *p_env, cdio_funcs *funcs);
+
+ /* The below structure describes a specific CD Input driver */
+ typedef struct
+@@ -231,9 +280,11 @@
+ const char *name;
+ const char *describe;
+ bool (*have_driver) (void);
+- CdIo *(*driver_open) (const char *source_name);
++ CdIo *(*driver_open) (const char *psz_source_name);
++ CdIo *(*driver_open_am) (const char *psz_source_name,
++ const char *psz_access_mode);
+ char *(*get_default_device) (void);
+- bool (*is_device) (const char *source_name);
++ bool (*is_device) (const char *psz_source_name);
+ char **(*get_devices) (void);
+ } CdIo_driver_t;
+
+@@ -255,63 +306,8 @@
+ Use cdio_free_device_list() to free this device_list.
+ */
+ void cdio_add_device_list(char **device_list[], const char *drive,
+- int *num_drives);
+-
+- /*!
+- Bogus eject media when there is no ejectable media, e.g. a disk image
+- We always return 2. Should we also free resources?
+- */
+- int cdio_generic_bogus_eject_media (void *env);
+-
+- /*!
+- Release and free resources associated with cd.
+- */
+- void cdio_generic_free (void *env);
+-
+- /*!
+- Initialize CD device.
+- */
+- bool cdio_generic_init (void *env);
++ unsigned int *i_drives);
+
+- /*!
+- Reads into buf the next size bytes.
+- Returns -1 on error.
+- Is in fact libc's read().
+- */
+- off_t cdio_generic_lseek (void *env, off_t offset, int whence);
+-
+- /*!
+- Reads into buf the next size bytes.
+- Returns -1 on error.
+- Is in fact libc's read().
+- */
+- ssize_t cdio_generic_read (void *env, void *buf, size_t size);
+-
+- /*!
+- Release and free resources associated with stream or disk image.
+- */
+- void cdio_generic_stdio_free (void *env);
+-
+- /*!
+- Return true if source_name could be a device containing a CD-ROM on
+- Win32
+- */
+- bool cdio_is_device_win32(const char *source_name);
+-
+-
+- /*!
+- Return true if source_name could be a device containing a CD-ROM on
+- most Unix servers with block and character devices.
+- */
+- bool cdio_is_device_generic(const char *source_name);
+-
+-
+- /*!
+- Like above, but don't give a warning device doesn't exist.
+- */
+- bool cdio_is_device_quiet_generic(const char *source_name);
+-
+-
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdtext.c 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,228 @@
++/*
++ $Id: cdtext.c,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++ toc reading routine adapted from cuetools
++ Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <cdio/cdtext.h>
++#include <cdio/logging.h>
++#include "cdtext_private.h"
++
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
++/*! Note: the order and number items (except CDTEXT_INVALID) should
++ match the cdtext_field_t enumeration. */
++const char *cdtext_keywords[] =
++ {
++ "ARRANGER",
++ "COMPOSER",
++ "DISC_ID",
++ "GENRE",
++ "ISRC",
++ "MESSAGE",
++ "PERFORMER",
++ "SIZE_INFO",
++ "SONGWRITER",
++ "TITLE",
++ "TOC_INFO",
++ "TOC_INFO2",
++ "UPC_EAN",
++ };
++
++
++/*! Return string representation of the enum values above */
++const char *
++cdtext_field2str (cdtext_field_t i)
++{
++ if (i >= MAX_CDTEXT_FIELDS)
++ return "Invalid CDTEXT field index";
++ else
++ return cdtext_keywords[i];
++}
++
++
++/*! Free memory assocated with cdtext*/
++void
++cdtext_destroy (cdtext_t *cdtext)
++{
++ cdtext_field_t i;
++
++ for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
++ if (cdtext->field[i]) free(cdtext->field[i]);
++ }
++}
++
++/*!
++ returns the CDTEXT value associated with key. NULL is returned
++ if key is CDTEXT_INVALID or the field is not set.
++ */
++const char *
++cdtext_get (cdtext_field_t key, const cdtext_t *cdtext)
++{
++ if (key == CDTEXT_INVALID) return NULL;
++ return cdtext->field[key];
++}
++
++/*! Initialize a new cdtext structure.
++ When the structure is no longer needed, release the
++ resources using cdtext_delete.
++*/
++void
++cdtext_init (cdtext_t *cdtext)
++{
++ cdtext_field_t i;
++
++ for (i=0; i < MAX_CDTEXT_FIELDS; i++) {
++ cdtext->field[i] = NULL;
++ }
++}
++
++/*!
++ returns 0 if field is a CD-TEXT keyword, returns non-zero otherwise
++*/
++cdtext_field_t
++cdtext_is_keyword (const char *key)
++{
++#if 0
++ char *item;
++
++ item = bsearch(key,
++ cdtext_keywords, 12,
++ sizeof (char *),
++ (int (*)(const void *, const void *))
++ strcmp);
++ return (NULL != item) ? 0 : 1;
++#else
++ unsigned int i;
++
++ for (i = 0; i < 13 ; i++)
++ if (0 == strcmp (cdtext_keywords[i], key)) {
++ return i;
++ }
++ return CDTEXT_INVALID;
++#endif
++}
++
++/*! sets cdtext's keyword entry to field.
++ */
++void
++cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext)
++{
++ if (NULL == value || key == CDTEXT_INVALID) return;
++
++ if (cdtext->field[key]) free (cdtext->field[key]);
++ cdtext->field[key] = strdup (value);
++
++}
++
++#define SET_CDTEXT_FIELD(FIELD) \
++ (*set_cdtext_field_fn)(user_data, i_track, i_first_track, FIELD, buffer);
++
++/*
++ parse all CD-TEXT data retrieved.
++*/
++bool
++cdtext_data_init(void *user_data, track_t i_first_track,
++ unsigned char *wdata,
++ set_cdtext_field_fn_t set_cdtext_field_fn)
++{
++ CDText_data_t *pdata;
++ int i;
++ int j;
++ char buffer[256];
++ int idx;
++ int i_track;
++ bool b_ret = false;
++
++ memset( buffer, 0x00, sizeof(buffer) );
++ idx = 0;
++
++ pdata = (CDText_data_t *) (&wdata[4]);
++ for( i=0; i < CDIO_CDTEXT_MAX_PACK_DATA; i++ ) {
++
++#if TESTED
++ if ( pdata->bDBC ) {
++ cdio_warn("Double-byte characters not supported");
++ return false;
++ }
++#endif
++
++ if( pdata->seq != i )
++ break;
++
++ if( (pdata->type >= 0x80)
++ && (pdata->type <= 0x85) && (pdata->block == 0) ) {
++ i_track = pdata->i_track;
++
++ for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; j++ ) {
++ if( pdata->text[j] == 0x00 ) {
++ bool b_field_set=true;
++ switch( pdata->type) {
++ case CDIO_CDTEXT_TITLE:
++ SET_CDTEXT_FIELD(CDTEXT_TITLE);
++ break;
++ case CDIO_CDTEXT_PERFORMER:
++ SET_CDTEXT_FIELD(CDTEXT_PERFORMER);
++ break;
++ case CDIO_CDTEXT_SONGWRITER:
++ SET_CDTEXT_FIELD(CDTEXT_SONGWRITER);
++ break;
++ case CDIO_CDTEXT_COMPOSER:
++ SET_CDTEXT_FIELD(CDTEXT_COMPOSER);
++ break;
++ case CDIO_CDTEXT_ARRANGER:
++ SET_CDTEXT_FIELD(CDTEXT_ARRANGER);
++ break;
++ case CDIO_CDTEXT_MESSAGE:
++ SET_CDTEXT_FIELD(CDTEXT_MESSAGE);
++ break;
++ case CDIO_CDTEXT_DISCID:
++ SET_CDTEXT_FIELD(CDTEXT_DISCID);
++ break;
++ case CDIO_CDTEXT_GENRE:
++ SET_CDTEXT_FIELD(CDTEXT_GENRE);
++ break;
++ default : b_field_set = false;
++ }
++ if (b_field_set) {
++ b_ret = true;
++ i_track++;
++ idx = 0;
++ }
++ } else {
++ buffer[idx++] = pdata->text[j];
++ }
++ buffer[idx] = 0x00;
++ }
++ }
++ pdata++;
++ }
++ return b_ret;
++}
++
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdtext_private.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,119 @@
++/*
++ $Id: cdtext_private.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifndef __CDIO_CDTEXT_PRIVATE_H__
++#define __CDIO_CDTEXT_PRIVATE_H__
++
++#include <cdio/cdio.h>
++#include <cdio/cdtext.h>
++
++#define CDIO_CDTEXT_MAX_PACK_DATA 255
++#define CDIO_CDTEXT_MAX_TEXT_DATA 12
++
++/* From table J.2 - Pack Type Indicator Definitions from
++ Working Draft NCITS XXX T10/1364-D Revision 10G. November 12, 2001.
++*/
++/* Title of Alubm name (ID=0) or Track Titles (ID != 0) */
++#define CDIO_CDTEXT_TITLE 0x80
++
++/* Name(s) of the performer(s) in ASCII */
++#define CDIO_CDTEXT_PERFORMER 0x81
++
++/* Name(s) of the songwriter(s) in ASCII */
++#define CDIO_CDTEXT_SONGWRITER 0x82
++
++/* Name(s) of the Composers in ASCII */
++#define CDIO_CDTEXT_COMPOSER 0x83
++
++/* Name(s) of the Arrangers in ASCII */
++#define CDIO_CDTEXT_ARRANGER 0x84
++
++/* Message(s) from content provider and/or artist in ASCII */
++#define CDIO_CDTEXT_MESSAGE 0x85
++
++/* Disc Identificatin information */
++#define CDIO_CDTEXT_DISCID 0x86
++
++/* Genre Identification and Genre Information */
++#define CDIO_CDTEXT_GENRE 0x87
++
++/* Table of Content Information */
++#define CDIO_CDTEXT_TOC 0x88
++
++/* Second Table of Content Information */
++#define CDIO_CDTEXT_TOC2 0x89
++
++/* 0x8A, 0x8B, 0x8C are reserved
++ 0x8D Reserved for content provider only.
++ */
++
++/* UPC/EAN code of the album and ISRC code of each track */
++#define CDIO_CDTEXT_UPC 0x8E
++
++/* Size information of the Block */
++#define CDIO_CDTEXT_BLOCKSIZE 0x8F
++
++
++PRAGMA_BEGIN_PACKED
++
++struct CDText_data
++{
++ uint8_t type;
++ track_t i_track;
++ uint8_t seq;
++#ifdef WORDS_BIGENDIAN
++ uint8_t bDBC: 1; /* double byte character */
++ uint8_t block: 3; /* block number 0..7 */
++ uint8_t characterPosition:4; /* character position */
++#else
++ uint8_t characterPosition:4; /* character position */
++ uint8_t block :3; /* block number 0..7 */
++ uint8_t bDBC :1; /* double byte character */
++#endif
++ char text[CDIO_CDTEXT_MAX_TEXT_DATA];
++ uint8_t crc[2];
++} GNUC_PACKED;
++
++PRAGMA_END_PACKED
++
++typedef struct CDText_data CDText_data_t;
++
++typedef void (*set_cdtext_field_fn_t) (void *user_data, track_t i_track,
++ track_t i_first_track,
++ cdtext_field_t field,
++ const char *buffer);
++
++/*
++ Internal routine to parse all CD-TEXT data retrieved.
++*/
++bool cdtext_data_init(void *user_data, track_t i_first_track,
++ unsigned char *wdata,
++ set_cdtext_field_fn_t set_cdtext_field_fn);
++
++
++#endif /* __CDIO_CDTEXT_PRIVATE_H__ */
++
++/*
++ * Local variables:
++ * c-file-style: "gnu"
++ * tab-width: 8
++ * indent-tabs-mode: nil
++ * End:
++ */
+--- ./src/input/vcd/libcdio/ds.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/ds.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: ds.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: ds.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -25,12 +25,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "ds.h"
++#include <cdio/ds.h>
+ #include <cdio/util.h>
+ #include <cdio/types.h>
+ #include "cdio_assert.h"
+
+-static const char _rcsid[] = "$Id: ds.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: ds.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+ struct _CdioList
+ {
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/generic.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,179 @@
++/*
++ $Id: generic.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* Internal routines for CD I/O drivers. */
++
++
++#ifndef __CDIO_GENERIC_H__
++#define __CDIO_GENERIC_H__
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <cdio/cdio.h>
++#include <cdio/cdtext.h>
++#include <cdio/iso9660.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++ /*!
++ Things common to private device structures. Even though not all
++ devices may have some of these fields, by listing common ones
++ we facilitate writing generic routines and even cut-and-paste
++ code.
++ */
++ typedef struct {
++ char *source_name; /**< Name used in open. */
++ bool init; /**< True if structure has been initialized */
++ bool toc_init; /**< True if TOC read in */
++ bool b_cdtext_init; /**< True if CD-Text read in */
++ bool b_cdtext_error; /**< True if trouble reading CD-Text */
++
++ int ioctls_debugged; /**< for debugging */
++
++ /* Only one of data_source or fd is used; fd is for CD-ROM
++ devices and the data_source for stream reading (bincue, nrg, toc,
++ network).
++ */
++ CdioDataSource *data_source;
++ int fd; /**< File descriptor of device */
++ track_t i_first_track; /**< The starting track number. */
++ track_t i_tracks; /**< The number of tracks. */
++
++ uint8_t i_joliet_level; /**< 0 = no Joliet extensions.
++ 1-3: Joliet level. */
++ iso9660_pvd_t pvd;
++ iso9660_svd_t svd;
++ CdIo *cdio; /**< a way to call general cdio routines. */
++ cdtext_t cdtext; /**< CD-Text for disc. */
++ cdtext_t cdtext_track[CDIO_CD_MAX_TRACKS+1]; /*CD-TEXT for each track*/
++
++ } generic_img_private_t;
++
++ /*!
++ Bogus eject media when there is no ejectable media, e.g. a disk image
++ We always return 2. Should we also free resources?
++ */
++ int cdio_generic_bogus_eject_media (void *env);
++
++ /*!
++ Release and free resources associated with cd.
++ */
++ void cdio_generic_free (void *env);
++
++ /*!
++ Initialize CD device.
++ */
++ bool cdio_generic_init (void *env);
++
++ /*!
++ Reads into buf the next size bytes.
++ Returns -1 on error.
++ Is in fact libc's read().
++ */
++ off_t cdio_generic_lseek (void *env, off_t offset, int whence);
++
++ /*!
++ Reads into buf the next size bytes.
++ Returns -1 on error.
++ Is in fact libc's read().
++ */
++ ssize_t cdio_generic_read (void *env, void *buf, size_t size);
++
++ /*!
++ Reads a single form1 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++ int cdio_generic_read_form1_sector (void * user_data, void *data,
++ lsn_t lsn);
++
++ /*!
++ Release and free resources associated with stream or disk image.
++ */
++ void cdio_generic_stdio_free (void *env);
++
++ /*!
++ Return true if source_name could be a device containing a CD-ROM on
++ Win32
++ */
++ bool cdio_is_device_win32(const char *source_name);
++
++
++ /*!
++ Return true if source_name could be a device containing a CD-ROM on
++ most Unix servers with block and character devices.
++ */
++ bool cdio_is_device_generic(const char *source_name);
++
++
++ /*!
++ Like above, but don't give a warning device doesn't exist.
++ */
++ bool cdio_is_device_quiet_generic(const char *source_name);
++
++ /*!
++ Get cdtext information for a CdIo object .
++
++ @param obj the CD object that may contain CD-TEXT information.
++ @return the CD-TEXT object or NULL if obj is NULL
++ or CD-TEXT information does not exist.
++ */
++ const cdtext_t *get_cdtext_generic (void *p_user_data, track_t i_track);
++
++ /*!
++ Return the number of of the first track.
++ CDIO_INVALID_TRACK is returned on error.
++ */
++ track_t get_first_track_num_generic(void *p_user_data);
++
++ /*!
++ Return the number of tracks in the current medium.
++ */
++ track_t get_num_tracks_generic(void *p_user_data);
++
++ /*!
++ Get disc type associated with cd object.
++ */
++ discmode_t get_discmode_generic (void *p_user_data );
++
++ /*!
++ Same as above but only handles CD cases
++ */
++ discmode_t get_discmode_cd_generic (void *p_user_data );
++
++ void set_cdtext_field_generic(void *user_data, track_t i_track,
++ track_t i_first_track,
++ cdtext_field_t e_field, const char *psz_value);
++ /*!
++ Read cdtext information for a CdIo object .
++
++ return true on success, false on error or CD-Text information does
++ not exist.
++ */
++ bool init_cdtext_generic (generic_img_private_t *p_env);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __CDIO_GENERIC_H__ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/image.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,75 @@
++/*
++ $Id: image.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/*!
++ Header for image drivers. In contrast to image_common.h which contains
++ routines, this header like most C headers does not depend on anything
++ defined before it is included.
++*/
++
++#ifndef __CDIO_IMAGE_H__
++#define __CDIO_IMAGE_H__
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <cdio/types.h>
++#include <cdio/cdtext.h>
++#include "cdio_private.h"
++#include <cdio/sector.h>
++
++/*!
++ The universal format for information about a track for CD image readers
++ It may be that some fields can be derived from other fields.
++ Over time this structure may get cleaned up. Possibly this can be
++ expanded/reused for real CD formats.
++*/
++
++typedef struct {
++ track_t track_num; /**< Probably is index+1 */
++ msf_t start_msf;
++ lba_t start_lba;
++ int start_index;
++ lba_t length;
++ lba_t pregap; /**< pre-gap with zero audio data */
++ int sec_count; /**< Number of sectors in this track. Does not
++ include pregap */
++ int num_indices;
++ flag_t flags; /**< "[NO] COPY", "4CH", "[NO] PREMPAHSIS" */
++ char *isrc; /**< IRSC Code (5.22.4) exactly 12 bytes */
++ char *filename;
++ CdioDataSource *data_source;
++ track_format_t track_format;
++ bool track_green;
++ cdtext_t cdtext; /**< CD-TEXT */
++
++ trackmode_t mode;
++ uint16_t datasize; /**< How much is in the portion we return
++ back? */
++ uint16_t datastart; /**< Offset from begining that data starts */
++ uint16_t endsize; /**< How much stuff at the end to skip over.
++ This stuff may have error correction
++ (EDC, or ECC).*/
++ uint16_t blocksize; /**< total block size = start + size + end */
++} track_info_t;
++
++
++#endif /* __CDIO_IMAGE_H__ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/image_common.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,225 @@
++/*
++ $Id: image_common.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/*! Common image routines.
++
++ Because _img_private_t may vary over image formats, the routines are
++ included into the image drivers after _img_private_t is defined. In
++ order for the below routines to work, there is a large part of
++ _img_private_t that is common among image drivers. For example, see
++ image.h
++*/
++
++#ifndef __CDIO_IMAGE_COMMON_H__
++#define __CDIO_IMAGE_COMMON_H__
++
++#define free_if_notnull(obj) \
++ if (NULL != obj) { free(obj); obj=NULL; };
++
++/*!
++ We don't need the image any more. Free all memory associated with
++ it.
++ */
++static void
++_free_image (void *user_data)
++{
++ _img_private_t *p_env = user_data;
++ track_t i_track;
++
++ if (NULL == p_env) return;
++
++ for (i_track=0; i_track < p_env->gen.i_tracks; i_track++) {
++ free_if_notnull(p_env->tocent[i_track].filename);
++ free_if_notnull(p_env->tocent[i_track].isrc);
++ cdtext_destroy(&(p_env->tocent[i_track].cdtext));
++ }
++
++ free_if_notnull(p_env->psz_mcn);
++ free_if_notnull(p_env->psz_cue_name);
++ cdtext_destroy(&(p_env->gen.cdtext));
++ cdio_generic_stdio_free(p_env);
++ free(p_env);
++}
++
++#ifdef NEED_MEDIA_EJECT_IMAGE
++/*!
++ Eject media -- there's nothing to do here except free resources.
++ We always return 2.
++ */
++static int
++_eject_media_image(void *user_data)
++{
++ _free_image (user_data);
++ return 2;
++}
++#endif
++
++/*!
++ Return the value associated with the key "arg".
++*/
++static const char *
++_get_arg_image (void *user_data, const char key[])
++{
++ _img_private_t *p_env = user_data;
++
++ if (!strcmp (key, "source")) {
++ return p_env->gen.source_name;
++ } else if (!strcmp (key, "cue")) {
++ return p_env->psz_cue_name;
++ } else if (!strcmp(key, "access-mode")) {
++ return "image";
++ }
++ return NULL;
++}
++
++/*!
++ Get disc type associated with cd_obj.
++*/
++static discmode_t
++_get_discmode_image (void *p_user_data)
++{
++ _img_private_t *p_env = p_user_data;
++ return p_env->disc_mode;
++}
++
++/*!
++ Return the media catalog number (MCN) from the CD or NULL if there
++ is none or we don't have the ability to get it.
++
++ Note: string is malloc'd so caller has to free() the returned
++ string when done with it.
++ */
++static char *
++_get_mcn_image(const void *user_data)
++{
++ const _img_private_t *env = user_data;
++
++ if (NULL == env || NULL == env->psz_mcn) return NULL;
++ return strdup(env->psz_mcn);
++}
++
++/*!
++ Return the starting MSF (minutes/secs/frames) for the track number
++ track_num in obj. Tracks numbers start at 1.
++ The "leadout" track is specified either by
++ using track_num LEADOUT_TRACK or the total tracks+1.
++
++*/
++static bool
++_get_track_msf_image(void *user_data, track_t track_num, msf_t *msf)
++{
++ _img_private_t *env = user_data;
++
++ if (NULL == msf) return false;
++
++ if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = env->gen.i_tracks+1;
++
++ if (track_num <= env->gen.i_tracks+1 && track_num != 0) {
++ *msf = env->tocent[track_num-env->gen.i_first_track].start_msf;
++ return true;
++ } else
++ return false;
++}
++
++/*!
++ Return the number of of the first track.
++ CDIO_INVALID_TRACK is returned on error.
++*/
++static track_t
++_get_first_track_num_image(void *user_data)
++{
++ _img_private_t *env = user_data;
++
++ return env->gen.i_first_track;
++}
++
++/*!
++ Return the number of tracks.
++*/
++static track_t
++_get_num_tracks_image(void *user_data)
++{
++ _img_private_t *env = user_data;
++
++ return env->gen.i_tracks;
++}
++
++/*!
++ Set the arg "key" with "value" in the source device.
++ Currently "source" to set the source device in I/O operations
++ is the only valid key.
++
++ 0 is returned if no error was found, and nonzero if there as an error.
++*/
++static int
++_set_arg_image (void *user_data, const char key[], const char value[])
++{
++ _img_private_t *env = user_data;
++
++ if (!strcmp (key, "source"))
++ {
++ free_if_notnull (env->gen.source_name);
++
++ if (!value)
++ return -2;
++
++ env->gen.source_name = strdup (value);
++ }
++ else if (!strcmp (key, "cue"))
++ {
++ free_if_notnull (env->psz_cue_name);
++
++ if (!value)
++ return -2;
++
++ env->psz_cue_name = strdup (value);
++ }
++ else
++ return -1;
++
++ return 0;
++}
++
++/*!
++ Return the the kind of drive capabilities of device.
++
++ */
++static void
++_get_drive_cap_image (const void *user_data,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap)
++{
++
++ *p_read_cap = CDIO_DRIVE_CAP_READ_AUDIO
++ | CDIO_DRIVE_CAP_READ_CD_G
++ | CDIO_DRIVE_CAP_READ_CD_R
++ | CDIO_DRIVE_CAP_READ_CD_RW
++ ;
++
++ *p_write_cap = 0;
++
++ /* In the future we may want to simulate
++ LOCK, OPEN_TRAY, CLOSE_TRAY, SELECT_SPEED, etc.
++ */
++ *p_misc_cap = CDIO_DRIVE_CAP_MISC_FILE;
++}
++
++#endif /* __CDIO_IMAGE_COMMON_H__ */
+--- ./src/input/vcd/libcdio/iso9660.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/iso9660.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,8 +1,8 @@
+ /*
+- $Id: iso9660.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: iso9660.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+- Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -22,9 +22,9 @@
+ /* Private headers */
+ #include "iso9660_private.h"
+ #include "cdio_assert.h"
+-#include "bytesex.h"
+
+ /* Public headers */
++#include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+ #include <cdio/util.h>
+
+@@ -37,12 +37,38 @@
+ #include <stdio.h>
+ #endif
+
+-static const char _rcsid[] = "$Id: iso9660.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: iso9660.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+ /* some parameters... */
+ #define SYSTEM_ID "CD-RTOS CD-BRIDGE"
+ #define VOLUME_SET_ID ""
+
++/*!
++ Change trailing blanks in str to nulls. Str has a maximum size of
++ n characters.
++*/
++static char *
++strip_trail (const char str[], size_t n)
++{
++ static char buf[1024];
++ int j;
++
++ cdio_assert (n < 1024);
++
++ strncpy (buf, str, n);
++ buf[n] = '\0';
++
++ for (j = strlen (buf) - 1; j >= 0; j--)
++ {
++ if (buf[j] != ' ')
++ break;
++
++ buf[j] = '\0';
++ }
++
++ return buf;
++}
++
+ static void
+ pathtable_get_size_and_entries(const void *pt, unsigned int *size,
+ unsigned int *entries);
+@@ -52,72 +78,86 @@
+ record. Even though tm_wday and tm_yday fields are not explicitly in
+ idr_date, the are calculated from the other fields.
+
+- If tm is to reflect the localtime set use_localtime true, otherwise
++ If tm is to reflect the localtime set b_localtime true, otherwise
+ tm will reported in GMT.
+ */
+ void
+-iso9660_get_dtime (const iso9660_dtime_t *idr_date, bool use_localtime,
+- /*out*/ struct tm *tm)
++iso9660_get_dtime (const iso9660_dtime_t *idr_date, bool b_localtime,
++ /*out*/ struct tm *p_tm)
+ {
+ time_t t;
+- struct tm *temp_tm;
++ struct tm *p_temp_tm;
+
+ if (!idr_date) return;
+
+- tm->tm_year = idr_date->dt_year;
+- tm->tm_mon = idr_date->dt_month - 1;
+- tm->tm_mday = idr_date->dt_day;
+- tm->tm_hour = idr_date->dt_hour;
+- tm->tm_min = idr_date->dt_minute;
+- tm->tm_sec = idr_date->dt_second;
++ memset(p_tm, 0, sizeof(struct tm));
++ p_tm->tm_year = idr_date->dt_year;
++ p_tm->tm_mon = idr_date->dt_month - 1;
++ p_tm->tm_mday = idr_date->dt_day;
++ p_tm->tm_hour = idr_date->dt_hour;
++ p_tm->tm_min = idr_date->dt_minute;
++ p_tm->tm_sec = idr_date->dt_second;
++
++#if defined(HAVE_TM_GMTOFF) && defined(HAVE_TZSET)
++ if (b_localtime) {
++ tzset();
++#if defined(HAVE_TZNAME)
++ p_tm->tm_zone = (char *) tzname;
++#endif
++#if defined(HAVE_DAYLIGHT)
++ p_tm->tm_isdst = daylight;
++ p_tm->tm_gmtoff = timezone;
++#endif
++ }
++#endif
+
+ /* Recompute tm_wday and tm_yday via mktime. */
+- t = mktime(tm);
++ t = mktime(p_tm);
+
+- if (use_localtime)
+- temp_tm = localtime(&t);
++ if (b_localtime)
++ p_temp_tm = localtime(&t);
+ else
+- temp_tm = gmtime(&t);
++ p_temp_tm = gmtime(&t);
+
+- memcpy(tm, temp_tm, sizeof(struct tm));
++ memcpy(p_tm, p_temp_tm, sizeof(struct tm));
+ }
+
+ /*!
+ Set time in format used in ISO 9660 directory index record
+ from a Unix time structure. */
+ void
+-iso9660_set_dtime (const struct tm *tm, /*out*/ iso9660_dtime_t *idr_date)
++iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date)
+ {
+- memset (idr_date, 0, 7);
++ memset (p_idr_date, 0, 7);
+
+- if (!tm) return;
++ if (!p_tm) return;
+
+- idr_date->dt_year = tm->tm_year;
+- idr_date->dt_month = tm->tm_mon + 1;
+- idr_date->dt_day = tm->tm_mday;
+- idr_date->dt_hour = tm->tm_hour;
+- idr_date->dt_minute = tm->tm_min;
+- idr_date->dt_second = tm->tm_sec;
++ p_idr_date->dt_year = p_tm->tm_year;
++ p_idr_date->dt_month = p_tm->tm_mon + 1;
++ p_idr_date->dt_day = p_tm->tm_mday;
++ p_idr_date->dt_hour = p_tm->tm_hour;
++ p_idr_date->dt_minute = p_tm->tm_min;
++ p_idr_date->dt_second = p_tm->tm_sec;
+
+ #ifdef HAVE_TM_GMTOFF
+ /* The ISO 9660 timezone is in the range -48..+52 and each unit
+ represents a 15-minute interval. */
+- idr_date->dt_gmtoff = tm->tm_gmtoff / (15 * 60);
++ p_idr_date->dt_gmtoff = p_tm->tm_gmtoff / (15 * 60);
+
+- if (tm->tm_isdst) idr_date->dt_gmtoff -= 4;
++ if (p_tm->tm_isdst) p_idr_date->dt_gmtoff -= 4;
+
+- if (idr_date->dt_gmtoff < -48 ) {
++ if (p_idr_date->dt_gmtoff < -48 ) {
+
+ cdio_warn ("Converted ISO 9660 timezone %d is less than -48. Adjusted",
+- idr_date->dt_gmtoff);
+- idr_date->dt_gmtoff = -48;
+- } else if (idr_date->dt_gmtoff > 52) {
++ p_idr_date->dt_gmtoff);
++ p_idr_date->dt_gmtoff = -48;
++ } else if (p_idr_date->dt_gmtoff > 52) {
+ cdio_warn ("Converted ISO 9660 timezone %d is over 52. Adjusted",
+- idr_date->dt_gmtoff);
+- idr_date->dt_gmtoff = 52;
++ p_idr_date->dt_gmtoff);
++ p_idr_date->dt_gmtoff = 52;
+ }
+ #else
+- idr_date->dt_gmtoff = 0;
++ p_idr_date->dt_gmtoff = 0;
+ #endif
+ }
+
+@@ -146,14 +186,28 @@
+ /*!
+ Convert ISO-9660 file name that stored in a directory entry into
+ what's usually listed as the file name in a listing.
+- Lowercase name, and trailing ;1's or .;1's and turn the
+- other ;'s into version numbers.
++ Lowercase name, and remove trailing ;1's or .;1's and
++ turn the other ;'s into version numbers.
+
+ The length of the translated string is returned.
+ */
+ int
+ iso9660_name_translate(const char *old, char *new)
+ {
++ return iso9660_name_translate_ext(old, new, 0);
++}
++
++/*!
++ Convert ISO-9660 file name that stored in a directory entry into
++ what's usually listed as the file name in a listing. Lowercase
++ name if not using Joliet extension. Remove trailing ;1's or .;1's and
++ turn the other ;'s into version numbers.
++
++ The length of the translated string is returned.
++*/
++int
++iso9660_name_translate_ext(const char *old, char *new, uint8_t i_joliet_level)
++{
+ int len = strlen(old);
+ int i;
+
+@@ -162,8 +216,8 @@
+ if (!c)
+ break;
+
+- /* lower case */
+- if (isupper(c)) c = tolower(c);
++ /* Lower case, unless we have Joliet extensions. */
++ if (!i_joliet_level && isupper(c)) c = tolower(c);
+
+ /* Drop trailing '.;1' (ISO 9660:1988 7.5.1 requires period) */
+ if (c == '.' && i == len - 3 && old[i + 1] == ';' && old[i + 2] == '1')
+@@ -353,10 +407,13 @@
+ ipd.type_l_path_table = to_731(path_table_l_extent);
+ ipd.type_m_path_table = to_732(path_table_m_extent);
+
+- cdio_assert (sizeof(ipd.root_directory_record) == 34);
+- memcpy(ipd.root_directory_record, root_dir, sizeof(ipd.root_directory_record));
+- ipd.root_directory_record[0] = 34;
+-
++ /* root_directory_record doesn't contain the 1-byte filename,
++ so we add one for that. */
++ cdio_assert (sizeof(ipd.root_directory_record) == 33);
++ memcpy(&(ipd.root_directory_record), root_dir,
++ sizeof(ipd.root_directory_record));
++ ipd.root_directory_filename='\0';
++ ipd.root_directory_record.length = 33+1;
+ iso9660_strncpy_pad (ipd.volume_set_id, VOLUME_SET_ID, 128, ISO9660_DCHARS);
+
+ iso9660_strncpy_pad (ipd.publisher_id, publisher_id, 128, ISO9660_ACHARS);
+@@ -797,6 +854,17 @@
+ return strdup (tmpbuf);
+ }
+
++/*!
++ Return the PVD's application ID.
++ NULL is returned if there is some problem in getting this.
++*/
++char *
++iso9660_get_application_id(iso9660_pvd_t *p_pvd)
++{
++ if (NULL==p_pvd) return NULL;
++ return strdup(strip_trail(p_pvd->application_id, ISO_MAX_APPLICATION_ID));
++}
++
+ #if FIXME
+ lsn_t
+ iso9660_get_dir_extent(const iso9660_dir_t *idr)
+@@ -869,12 +937,66 @@
+ if (NULL == pvd)
+ return CDIO_INVALID_LSN;
+ else {
+- iso9660_dir_t *idr = (void *) pvd->root_directory_record;
++ const iso9660_dir_t *idr = &(pvd->root_directory_record);
+ if (NULL == idr) return CDIO_INVALID_LSN;
+ return(from_733 (idr->extent));
+ }
+ }
+
++/*!
++ Return a string containing the preparer id with trailing
++ blanks removed.
++*/
++char *
++iso9660_get_preparer_id(const iso9660_pvd_t *pvd)
++{
++ if (NULL==pvd) return NULL;
++ return strdup(strip_trail(pvd->preparer_id, ISO_MAX_PREPARER_ID));
++}
++
++/*!
++ Return a string containing the publisher id with trailing
++ blanks removed.
++*/
++char *
++iso9660_get_publisher_id(const iso9660_pvd_t *pvd)
++{
++ if (NULL==pvd) return NULL;
++ return strdup(strip_trail(pvd->publisher_id, ISO_MAX_PUBLISHER_ID));
++}
++
++/*!
++ Return a string containing the PVD's system id with trailing
++ blanks removed.
++*/
++char *
++iso9660_get_system_id(const iso9660_pvd_t *pvd)
++{
++ if (NULL==pvd) return NULL;
++ return strdup(strip_trail(pvd->system_id, ISO_MAX_SYSTEM_ID));
++}
++
++/*!
++ Return the PVD's volume ID.
++*/
++char *
++iso9660_get_volume_id(const iso9660_pvd_t *pvd)
++{
++ if (NULL == pvd) return NULL;
++ return strdup(strip_trail(pvd->volume_id, ISO_MAX_VOLUME_ID));
++}
++
++/*!
++ Return the PVD's volumeset ID.
++ NULL is returned if there is some problem in getting this.
++*/
++char *
++iso9660_get_volumeset_id(const iso9660_pvd_t *pvd)
++{
++ if ( NULL == pvd ) return NULL;
++ return strdup(strip_trail(pvd->volume_set_id, ISO_MAX_VOLUMESET_ID));
++}
++
+
+ /*
+ * Local variables:
+--- ./src/input/vcd/libcdio/iso9660_fs.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/iso9660_fs.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: iso9660_fs.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: iso9660_fs.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -24,48 +24,87 @@
+ #endif
+
+ #ifdef HAVE_STRING_H
+-#include <string.h>
++# include <string.h>
++#endif
++
++#ifdef HAVE_ERRNO_H
++# include <errno.h>
++#endif
++
++#ifdef HAVE_ICONV
++# include <iconv.h>
++#endif
++
++#ifdef HAVE_LANGINFO_CODESET
++#include <langinfo.h>
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+ #include <cdio/util.h>
+
+ /* Private headers */
+ #include "cdio_assert.h"
+-#include "bytesex.h"
+-#include "ds.h"
+ #include "_cdio_stdio.h"
+ #include "cdio_private.h"
+
+ #include <stdio.h>
+
+-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+ /* Implementation of iso9660_t type */
+ struct _iso9660 {
+ CdioDataSource *stream; /* Stream pointer */
+- void *env; /* environment. */
++ bool b_xa; /* true if has XA attributes. */
++ uint8_t i_joliet_level;/* 0 = no Joliet extensions.
++ 1-3: Joliet level. */
++ iso9660_pvd_t pvd;
++ iso9660_svd_t svd;
++ iso_extension_mask_t iso_extension_mask; /* What extensions we
++ tolerate. */
+ };
+
+ /*!
+ Open an ISO 9660 image for reading. Maybe in the future we will have
+- flags and mode. NULL is returned on error.
++ a mode. NULL is returned on error.
++*/
++iso9660_t *
++iso9660_open (const char *pathname /*, mode*/)
++{
++ return iso9660_open_ext(pathname, ISO_EXTENSION_NONE);
++}
++
++/*!
++ Open an ISO 9660 image for reading. Maybe in the future we will have
++ a mode. NULL is returned on error.
+ */
+ iso9660_t *
+-iso9660_open (const char *pathname /*flags, mode */)
++iso9660_open_ext (const char *pathname,
++ iso_extension_mask_t iso_extension_mask)
+ {
+- iso9660_t *iso = (iso9660_t *) _cdio_malloc(sizeof(struct _iso9660)) ;
++ iso9660_t *p_iso = (iso9660_t *) _cdio_malloc(sizeof(struct _iso9660)) ;
+
+- if (NULL == iso) return NULL;
++ if (NULL == p_iso) return NULL;
+
+- iso->stream = cdio_stdio_new( pathname );
+- if (NULL == iso->stream) {
+- free(iso);
+- return NULL;
+- }
++ p_iso->stream = cdio_stdio_new( pathname );
++ if (NULL == p_iso->stream)
++ goto error;
++
++ if ( !iso9660_ifs_read_superblock(p_iso, iso_extension_mask) )
++ goto error;
+
+- return iso;
++ /* Determine if image has XA attributes. */
++
++ p_iso->b_xa = !strncmp ((char *) &(p_iso->pvd) + ISO_XA_MARKER_OFFSET,
++ ISO_XA_MARKER_STRING,
++ strlen (ISO_XA_MARKER_STRING));
++ p_iso->iso_extension_mask = iso_extension_mask;
++ return p_iso;
++
++ error:
++ free(p_iso);
++ return NULL;
+ }
+
+
+@@ -76,67 +115,535 @@
+ be returned.
+ */
+ bool
+-iso9660_close (iso9660_t *iso)
++iso9660_close (iso9660_t *p_iso)
++{
++ if (NULL != p_iso) {
++ cdio_stdio_destroy(p_iso->stream);
++ free(p_iso);
++ }
++ return true;
++}
++
++static bool
++check_pvd (const iso9660_pvd_t *p_pvd)
++{
++ if ( ISO_VD_PRIMARY != from_711(p_pvd->type) ) {
++ cdio_warn ("unexpected PVD type %d", p_pvd->type);
++ return false;
++ }
++
++ if (strncmp (p_pvd->id, ISO_STANDARD_ID, strlen (ISO_STANDARD_ID)))
++ {
++ cdio_warn ("unexpected ID encountered (expected `"
++ ISO_STANDARD_ID "', got `%.5s'", p_pvd->id);
++ return false;
++ }
++ return true;
++}
++
++#ifdef HAVE_JOLIET
++static bool
++ucs2be_to_locale(ICONV_CONST char *psz_ucs2be, size_t i_inlen,
++ char **p_psz_out, size_t i_outlen)
++{
++
++ iconv_t ic =
++#if defined(HAVE_LANGINFO_CODESET)
++ iconv_open(nl_langinfo(CODESET), "UCS-2BE");
++#else
++ iconv_open("ASCII", "UCS-2BE");
++#endif
++
++ int rc;
++ char *psz_buf = NULL;
++ char *psz_buf2;
++ int i_outlen_max = i_outlen;
++ int i_outlen_actual;
++
++ if (-1 == (size_t) ic) {
++#if defined(HAVE_LANGINFO_CODESET)
++ cdio_info("Failed to get conversion table for locale, trying ASCII");
++ ic = iconv_open("ASCII", "UCS-2BE");
++ if (-1 == (size_t) ic) {
++ cdio_info("Failed to get conversion table for ASCII too");
++ return false;
++ }
++#else
++ cdio_info("Failed to get conversion table for locale");
++ return false;
++#endif
++ }
++
++ psz_buf = (char *) realloc(psz_buf, i_outlen);
++ psz_buf2 = psz_buf;
++ if (!psz_buf) {
++ /* XXX: report out of memory error */
++ goto error;
++ }
++ rc = iconv(ic, &psz_ucs2be, &i_inlen, &psz_buf2, &i_outlen);
++ iconv_close(ic);
++ if ((rc == -1) && (errno != E2BIG)) {
++ /* conversion failed */
++ goto error;
++ }
++ i_outlen_actual = i_outlen_max - i_outlen;
++ *p_psz_out = malloc(i_outlen_actual + 1);
++ memcpy(*p_psz_out, psz_buf, i_outlen_actual);
++ *(*p_psz_out + i_outlen_actual) = '\0';
++ free(psz_buf);
++ return true;
++ error:
++ free(psz_buf);
++ *p_psz_out = NULL;
++ return false;
++}
++#endif /*HAVE_JOLIET*/
++
++/*!
++ Return the application ID. NULL is returned in psz_app_id if there
++ is some problem in getting this.
++*/
++bool
++iso9660_ifs_get_application_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_app_id)
++{
++ if (!p_iso) {
++ *p_psz_app_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if ( ucs2be_to_locale(p_iso->svd.application_id,
++ ISO_MAX_APPLICATION_ID,
++ p_psz_app_id,
++ ISO_MAX_APPLICATION_ID))
++ return true;
++ }
++#endif /*HAVE_JOLIET*/
++ *p_psz_app_id = iso9660_get_application_id( &(p_iso->pvd) );
++ return *p_psz_app_id != NULL && strlen(*p_psz_app_id);
++}
++
++/*!
++ Return the Joliet level recognaized for p_iso.
++*/
++uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso)
++{
++ if (!p_iso) return 0;
++ return p_iso->i_joliet_level;
++}
++
++/*!
++ Return a string containing the preparer id with trailing
++ blanks removed.
++*/
++bool
++iso9660_ifs_get_preparer_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_preparer_id)
++{
++ if (!p_iso) {
++ *p_psz_preparer_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if ( ucs2be_to_locale(p_iso->svd.preparer_id, ISO_MAX_PREPARER_ID,
++ p_psz_preparer_id, ISO_MAX_PREPARER_ID) )
++ return true;
++ }
++#endif /*HAVE_JOLIET*/
++ *p_psz_preparer_id = iso9660_get_preparer_id( &(p_iso->pvd) );
++ return *p_psz_preparer_id != NULL && strlen(*p_psz_preparer_id);
++}
++
++/*!
++ Return a string containing the PVD's publisher id with trailing
++ blanks removed.
++*/
++bool iso9660_ifs_get_publisher_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_publisher_id)
++{
++ if (!p_iso) {
++ *p_psz_publisher_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if( ucs2be_to_locale(p_iso->svd.publisher_id, ISO_MAX_PUBLISHER_ID,
++ p_psz_publisher_id, ISO_MAX_PUBLISHER_ID) )
++ return true;
++ }
++#endif /*HAVE_JOLIET*/
++ *p_psz_publisher_id = iso9660_get_publisher_id( &(p_iso->pvd) );
++ return *p_psz_publisher_id != NULL && strlen(*p_psz_publisher_id);
++}
++
++
++/*!
++ Return a string containing the PVD's publisher id with trailing
++ blanks removed.
++*/
++bool iso9660_ifs_get_system_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_system_id)
++{
++ if (!p_iso) {
++ *p_psz_system_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if ( ucs2be_to_locale(p_iso->svd.system_id, ISO_MAX_SYSTEM_ID,
++ p_psz_system_id, ISO_MAX_SYSTEM_ID) )
++ return true;
++ }
++#endif /*HAVE_JOLIET*/
++ *p_psz_system_id = iso9660_get_system_id( &(p_iso->pvd) );
++ return *p_psz_system_id != NULL && strlen(*p_psz_system_id);
++}
++
++
++/*!
++ Return a string containing the PVD's publisher id with trailing
++ blanks removed.
++*/
++bool iso9660_ifs_get_volume_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_volume_id)
++{
++ if (!p_iso) {
++ *p_psz_volume_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if ( ucs2be_to_locale(p_iso->svd.volume_id, ISO_MAX_VOLUME_ID,
++ p_psz_volume_id, ISO_MAX_VOLUME_ID) )
++ return true;
++ }
++#endif /* HAVE_JOLIET */
++ *p_psz_volume_id = iso9660_get_volume_id( &(p_iso->pvd) );
++ return *p_psz_volume_id != NULL && strlen(*p_psz_volume_id);
++}
++
++
++/*!
++ Return a string containing the PVD's publisher id with trailing
++ blanks removed.
++*/
++bool iso9660_ifs_get_volumeset_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_volumeset_id)
++{
++ if (!p_iso) {
++ *p_psz_volumeset_id = NULL;
++ return false;
++ }
++
++#ifdef HAVE_JOLIET
++ if (p_iso->i_joliet_level) {
++ /* TODO: check that we haven't reached the maximum size.
++ If we have, perhaps we've truncated and if we can get
++ longer results *and* have the same character using
++ the PVD, do that.
++ */
++ if ( ucs2be_to_locale(p_iso->svd.volume_set_id,
++ ISO_MAX_VOLUMESET_ID,
++ p_psz_volumeset_id,
++ ISO_MAX_VOLUMESET_ID) )
++ return true;
++ }
++#endif /*HAVE_JOLIET*/
++ *p_psz_volumeset_id = iso9660_get_volume_id( &(p_iso->pvd) );
++ return *p_psz_volumeset_id != NULL && strlen(*p_psz_volumeset_id);
++}
++
++
++/*!
++ Read the Primary Volume Descriptor for an ISO 9660 image.
++ True is returned if read, and false if there was an error.
++*/
++bool
++iso9660_ifs_read_pvd (const iso9660_t *p_iso, /*out*/ iso9660_pvd_t *p_pvd)
++{
++ if (0 == iso9660_iso_seek_read (p_iso, p_pvd, ISO_PVD_SECTOR, 1)) {
++ cdio_warn ("error reading PVD sector (%d)", ISO_PVD_SECTOR);
++ return false;
++ }
++ return check_pvd(p_pvd);
++}
++
++
++/*!
++ Read the Super block of an ISO 9660 image. This is the
++ Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume
++ Descriptor if (Joliet) extensions are acceptable.
++*/
++bool
++iso9660_ifs_read_superblock (iso9660_t *p_iso,
++ iso_extension_mask_t iso_extension_mask)
+ {
+- if (NULL != iso) {
+- cdio_stdio_destroy(iso->stream);
+- free(iso);
++ iso9660_svd_t *p_svd; /* Secondary volume descriptor. */
++
++ if (!p_iso || !iso9660_ifs_read_pvd(p_iso, &(p_iso->pvd)))
++ return false;
++
++ p_svd = &(p_iso->svd);
++ p_iso->i_joliet_level = 0;
++
++ if (0 != iso9660_iso_seek_read (p_iso, p_svd, ISO_PVD_SECTOR+1, 1)) {
++ if ( ISO_VD_SUPPLEMENTARY == from_711(p_svd->type) ) {
++ if (p_svd->escape_sequences[0] == 0x25
++ && p_svd->escape_sequences[1] == 0x2f) {
++ switch (p_svd->escape_sequences[2]) {
++ case 0x40:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL1)
++ p_iso->i_joliet_level = 1;
++ break;
++ case 0x43:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL2)
++ p_iso->i_joliet_level = 2;
++ break;
++ case 0x45:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL3)
++ p_iso->i_joliet_level = 3;
++ break;
++ default:
++ cdio_info("Supplementary Volume Descriptor found, but not Joliet");
++ }
++ if (p_iso->i_joliet_level > 0) {
++ cdio_info("Found Extension: Joliet Level %d", p_iso->i_joliet_level);
++ }
++ }
++ }
+ }
++
+ return true;
+ }
+
+
++/*!
++ Read the Primary Volume Descriptor for of CD.
++*/
++bool
++iso9660_fs_read_pvd(const CdIo *p_cdio, /*out*/ iso9660_pvd_t *p_pvd)
++{
++ /* A bit of a hack, we'll assume track 1 contains ISO_PVD_SECTOR.*/
++ bool b_mode2;
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++ int i_rc;
++
++ switch(cdio_get_track_format(p_cdio, 1)) {
++ case TRACK_FORMAT_CDI:
++ case TRACK_FORMAT_XA:
++ b_mode2 = true;
++ break;
++ case TRACK_FORMAT_DATA:
++ b_mode2 = false;
++ break;
++ case TRACK_FORMAT_AUDIO:
++ case TRACK_FORMAT_PSX:
++ case TRACK_FORMAT_ERROR:
++ default:
++ return false;
++ }
++
++ i_rc = b_mode2
++ ? cdio_read_mode2_sector (p_cdio, buf, ISO_PVD_SECTOR, false)
++ : cdio_read_mode1_sector (p_cdio, buf, ISO_PVD_SECTOR, false);
++
++ if (i_rc) {
++ cdio_warn ("error reading PVD sector (%d)", ISO_PVD_SECTOR);
++ return false;
++ }
++
++ /* The size of a PVD or SVD is smaller than a sector. So we
++ allocated a bigger block above (buf) and now we'll copy just
++ the part we need to save.
++ */
++ cdio_assert (sizeof(buf) >= sizeof (iso9660_pvd_t));
++ memcpy(p_pvd, buf, sizeof(iso9660_pvd_t));
++
++ return check_pvd(p_pvd);
++}
++
++
++/*!
++ Read the Super block of an ISO 9660 image. This is the
++ Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume
++ Descriptor if (Joliet) extensions are acceptable.
++*/
++bool
++iso9660_fs_read_superblock (CdIo *p_cdio,
++ iso_extension_mask_t iso_extension_mask)
++{
++ if (!p_cdio) return false;
++
++ {
++ generic_img_private_t *p_env = (generic_img_private_t *) p_cdio->env;
++ iso9660_pvd_t *p_pvd = &(p_env->pvd);
++ iso9660_svd_t *p_svd = &(p_env->svd);
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++ bool b_mode2;
++ int i_rc;
++
++ /* A bit of a hack, we'll assume track 1 contains ISO_PVD_SECTOR.*/
++ switch(cdio_get_track_format(p_cdio, 1)) {
++ case TRACK_FORMAT_CDI:
++ case TRACK_FORMAT_XA:
++ b_mode2 = true;
++ break;
++ case TRACK_FORMAT_DATA:
++ b_mode2 = false;
++ break;
++ case TRACK_FORMAT_AUDIO:
++ case TRACK_FORMAT_PSX:
++ case TRACK_FORMAT_ERROR:
++ default:
++ return false;
++ }
++
++ if ( !iso9660_fs_read_pvd(p_cdio, p_pvd) )
++ return false;
++
++ p_env->i_joliet_level = 0;
++
++ i_rc = (b_mode2)
++ ? cdio_read_mode2_sector (p_cdio, buf, ISO_PVD_SECTOR+1, false)
++ : cdio_read_mode1_sector (p_cdio, buf, ISO_PVD_SECTOR+1, false);
++
++ if (0 == i_rc) {
++ /* The size of a PVD or SVD is smaller than a sector. So we
++ allocated a bigger block above (buf) and now we'll copy just
++ the part we need to save.
++ */
++ cdio_assert (sizeof(buf) >= sizeof (iso9660_svd_t));
++ memcpy(p_svd, buf, sizeof(iso9660_svd_t));
++
++ if ( ISO_VD_SUPPLEMENTARY == from_711(p_svd->type) ) {
++ if (p_svd->escape_sequences[0] == 0x25
++ && p_svd->escape_sequences[1] == 0x2f) {
++ switch (p_svd->escape_sequences[2]) {
++ case 0x40:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL1)
++ p_env->i_joliet_level = 1;
++ break;
++ case 0x43:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL2)
++ p_env->i_joliet_level = 2;
++ break;
++ case 0x45:
++ if (iso_extension_mask & ISO_EXTENSION_JOLIET_LEVEL3)
++ p_env->i_joliet_level = 3;
++ break;
++ default:
++ cdio_info("Supplementary Volume Descriptor found, but not Joliet");
++ }
++ if (p_env->i_joliet_level > 0) {
++ cdio_info("Found Extension: Joliet Level %d",
++ p_env->i_joliet_level);
++ }
++ }
++ }
++ }
++ }
++
++ return true;
++}
+
+ /*!
+ Seek to a position and then read n blocks. Size read is returned.
+ */
+ long int
+-iso9660_iso_seek_read (iso9660_t *iso, void *ptr, lsn_t start, long int size)
++iso9660_iso_seek_read (const iso9660_t *p_iso, void *ptr, lsn_t start,
++ long int size)
+ {
+ long int ret;
+- if (NULL == iso) return 0;
+- ret = cdio_stream_seek (iso->stream, start * ISO_BLOCKSIZE, SEEK_SET);
++ if (NULL == p_iso) return 0;
++ ret = cdio_stream_seek (p_iso->stream, start * ISO_BLOCKSIZE, SEEK_SET);
+ if (ret!=0) return 0;
+- return cdio_stream_read (iso->stream, ptr, ISO_BLOCKSIZE, size);
++ return cdio_stream_read (p_iso->stream, ptr, ISO_BLOCKSIZE, size);
+ }
+
+
+ static iso9660_stat_t *
+-_iso9660_dir_to_statbuf (const iso9660_dir_t *iso9660_dir, bool is_mode2)
++_iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir,
++ bool b_mode2, uint8_t i_joliet_level)
+ {
+ iso9660_xa_t *xa_data = NULL;
+- uint8_t dir_len= iso9660_get_dir_len(iso9660_dir);
++ uint8_t dir_len= iso9660_get_dir_len(p_iso9660_dir);
+ unsigned int filename_len;
+ unsigned int stat_len;
+ iso9660_stat_t *stat;
+
+ if (!dir_len) return NULL;
+
+- filename_len = from_711(iso9660_dir->filename_len);
++ filename_len = from_711(p_iso9660_dir->filename_len);
+
+- /* .. string in statbuf is one longer than in iso9660_dir's listing '\1' */
++ /* .. string in statbuf is one longer than in p_iso9660_dir's listing '\1' */
+ stat_len = sizeof(iso9660_stat_t)+filename_len+2;
+
+ stat = _cdio_malloc(stat_len);
+- stat->type = (iso9660_dir->file_flags & ISO_DIRECTORY)
++ stat->type = (p_iso9660_dir->file_flags & ISO_DIRECTORY)
+ ? _STAT_DIR : _STAT_FILE;
+- stat->lsn = from_733 (iso9660_dir->extent);
+- stat->size = from_733 (iso9660_dir->size);
++ stat->lsn = from_733 (p_iso9660_dir->extent);
++ stat->size = from_733 (p_iso9660_dir->size);
+ stat->secsize = _cdio_len2blocks (stat->size, ISO_BLOCKSIZE);
+
+- if (iso9660_dir->filename[0] == '\0')
++ if ('\0' == p_iso9660_dir->filename[0] && 1 == filename_len)
+ strcpy (stat->filename, ".");
+- else if (iso9660_dir->filename[0] == '\1')
++ else if ('\1' == p_iso9660_dir->filename[0] && 1 == filename_len)
+ strcpy (stat->filename, "..");
+- else
+- strncpy (stat->filename, iso9660_dir->filename, filename_len);
++ else {
++#ifdef HAVE_JOLIET
++ if (i_joliet_level) {
++ int i_inlen = filename_len;
++ int i_outlen = (i_inlen / 2);
++ char *p_psz_out = NULL;
++ ucs2be_to_locale(p_iso9660_dir->filename, i_inlen,
++ &p_psz_out, i_outlen);
++ strncpy(stat->filename, p_psz_out, filename_len);
++ free(p_psz_out);
++ } else
++#endif /*HAVE_JOLIET*/
++ strncpy (stat->filename, p_iso9660_dir->filename, filename_len);
++ }
++
+
+- iso9660_get_dtime(&(iso9660_dir->recording_time), true, &(stat->tm));
++ iso9660_get_dtime(&(p_iso9660_dir->recording_time), true, &(stat->tm));
+
+ cdio_assert (dir_len >= sizeof (iso9660_dir_t));
+
+- if (is_mode2) {
+- int su_length = iso9660_get_dir_len(iso9660_dir) - sizeof (iso9660_dir_t);
++ if (b_mode2) {
++ int su_length = iso9660_get_dir_len(p_iso9660_dir)
++ - sizeof (iso9660_dir_t);
+ su_length -= filename_len;
+
+ if (su_length % 2)
+@@ -145,8 +652,8 @@
+ if (su_length < 0 || su_length < sizeof (iso9660_xa_t))
+ return stat;
+
+- xa_data = (void *) (((char *) iso9660_dir)
+- + (iso9660_get_dir_len(iso9660_dir) - su_length));
++ xa_data = (void *) (((char *) p_iso9660_dir)
++ + (iso9660_get_dir_len(p_iso9660_dir) - su_length));
+
+ if (xa_data->signature[0] != 'X'
+ || xa_data->signature[1] != 'A')
+@@ -154,7 +661,7 @@
+ cdio_warn ("XA signature not found in ISO9660's system use area;"
+ " ignoring XA attributes for this file entry.");
+ cdio_debug ("%d %d %d, '%c%c' (%d, %d)",
+- iso9660_get_dir_len(iso9660_dir),
++ iso9660_get_dir_len(p_iso9660_dir),
+ filename_len,
+ su_length,
+ xa_data->signature[0], xa_data->signature[1],
+@@ -194,57 +701,80 @@
+ return strdup (namebuf);
+ }
+
+-
++/*
++ Return a pointer to a ISO 9660 stat buffer or NULL if there's an error
++*/
+ static iso9660_stat_t *
+-_fs_stat_root (const CdIo *cdio, bool is_mode2)
++_fs_stat_root (CdIo *p_cdio)
+ {
+- char block[ISO_BLOCKSIZE] = { 0, };
+- const iso9660_pvd_t *pvd = (void *) █
+- const iso9660_dir_t *iso9660_dir = (void *) pvd->root_directory_record;
+- iso9660_stat_t *stat;
+
+- if (is_mode2) {
+- if (cdio_read_mode2_sector (cdio, &block, ISO_PVD_SECTOR, false))
+- cdio_assert_not_reached ();
+- } else {
+- if (cdio_read_mode1_sector (cdio, &block, ISO_PVD_SECTOR, false))
+- cdio_assert_not_reached ();
+- }
++ if (!p_cdio) return NULL;
++
++ {
++ iso_extension_mask_t iso_extension_mask = ISO_EXTENSION_ALL;
++ generic_img_private_t *p_env = (generic_img_private_t *) p_cdio->env;
++ bool b_mode2 = cdio_get_track_green(p_cdio, 1);
++ iso9660_dir_t *p_iso9660_dir;
++ iso9660_stat_t *p_stat;
+
+- stat = _iso9660_dir_to_statbuf (iso9660_dir, is_mode2);
+- return stat;
++ if (!p_env->i_joliet_level)
++ iso_extension_mask &= ~ISO_EXTENSION_JOLIET;
++
++ /* FIXME try also with Joliet.*/
++ if ( !iso9660_fs_read_superblock (p_cdio, iso_extension_mask) ) {
++ cdio_warn("Could not read ISO-9660 Superblock.");
++ return NULL;
++ }
++
++#ifdef HAVE_JOLIET
++ p_iso9660_dir = p_env->i_joliet_level
++ ? &(p_env->svd.root_directory_record)
++ : &(p_env->pvd.root_directory_record) ;
++#else
++ p_iso9660_dir = &(p_env->pvd.root_directory_record) ;
++#endif
++
++ p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, b_mode2,
++ p_env->i_joliet_level);
++ return p_stat;
++ }
++
+ }
+
+ static iso9660_stat_t *
+-_fs_stat_iso_root (iso9660_t *iso)
++_fs_stat_iso_root (iso9660_t *p_iso)
+ {
+- char block[ISO_BLOCKSIZE] = { 0, };
+- const iso9660_pvd_t *pvd = (void *) █
+- const iso9660_dir_t *iso9660_dir = (void *) pvd->root_directory_record;
+- iso9660_stat_t *stat;
+- int ret;
++ iso9660_stat_t *p_stat;
++ iso9660_dir_t *p_iso9660_dir;
+
+- ret = iso9660_iso_seek_read (iso, block, ISO_PVD_SECTOR, 1);
+- if (ret!=ISO_BLOCKSIZE) return NULL;
+-
+- stat = _iso9660_dir_to_statbuf (iso9660_dir, true);
+- return stat;
++#ifdef HAVE_JOLIET
++ p_iso9660_dir = p_iso->i_joliet_level
++ ? &(p_iso->svd.root_directory_record)
++ : &(p_iso->pvd.root_directory_record) ;
++#else
++ p_iso9660_dir = &(p_iso->pvd.root_directory_record) ;
++#endif
++
++ p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, true,
++ p_iso->i_joliet_level);
++ return p_stat;
+ }
+
+ static iso9660_stat_t *
+-_fs_stat_traverse (const CdIo *cdio, const iso9660_stat_t *_root,
+- char **splitpath, bool is_mode2, bool translate)
++_fs_stat_traverse (const CdIo *p_cdio, const iso9660_stat_t *_root,
++ char **splitpath, bool b_mode2, bool translate)
+ {
+ unsigned offset = 0;
+ uint8_t *_dirbuf = NULL;
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_stat;
++ generic_img_private_t *p_env = (generic_img_private_t *) p_cdio->env;
+
+ if (!splitpath[0])
+ {
+ unsigned int len=sizeof(iso9660_stat_t) + strlen(_root->filename)+1;
+- stat = _cdio_malloc(len);
+- memcpy(stat, _root, len);
+- return stat;
++ p_stat = _cdio_malloc(len);
++ memcpy(p_stat, _root, len);
++ return p_stat;
+ }
+
+ if (_root->type == _STAT_FILE)
+@@ -261,58 +791,60 @@
+
+ _dirbuf = _cdio_malloc (_root->secsize * ISO_BLOCKSIZE);
+
+- if (is_mode2) {
+- if (cdio_read_mode2_sectors (cdio, _dirbuf, _root->lsn, false,
++ if (b_mode2) {
++ if (cdio_read_mode2_sectors (p_cdio, _dirbuf, _root->lsn, false,
+ _root->secsize))
+ return NULL;
+ } else {
+- if (cdio_read_mode1_sectors (cdio, _dirbuf, _root->lsn, false,
++ if (cdio_read_mode1_sectors (p_cdio, _dirbuf, _root->lsn, false,
+ _root->secsize))
+ return NULL;
+ }
+
+ while (offset < (_root->secsize * ISO_BLOCKSIZE))
+ {
+- const iso9660_dir_t *iso9660_dir = (void *) &_dirbuf[offset];
+- iso9660_stat_t *stat;
++ iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
++ iso9660_stat_t *p_stat;
+ int cmp;
+
+- if (!iso9660_get_dir_len(iso9660_dir))
++ if (!iso9660_get_dir_len(p_iso9660_dir))
+ {
+ offset++;
+ continue;
+ }
+
+- stat = _iso9660_dir_to_statbuf (iso9660_dir, is_mode2);
++ p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, b_mode2,
++ p_env->i_joliet_level);
+
+ if (translate) {
+- char *trans_fname = malloc(strlen(stat->filename));
++ char *trans_fname = malloc(strlen(p_stat->filename));
+ int trans_len;
+
+ if (trans_fname == NULL) {
+ cdio_warn("can't allocate %lu bytes",
+- (long unsigned int) strlen(stat->filename));
++ (long unsigned int) strlen(p_stat->filename));
+ return NULL;
+ }
+- trans_len = iso9660_name_translate(stat->filename, trans_fname);
++ trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname,
++ p_env->i_joliet_level);
+ cmp = strcmp(splitpath[0], trans_fname);
+ free(trans_fname);
+ } else {
+- cmp = strcmp(splitpath[0], stat->filename);
++ cmp = strcmp(splitpath[0], p_stat->filename);
+ }
+
+ if (!cmp) {
+ iso9660_stat_t *ret_stat
+- = _fs_stat_traverse (cdio, stat, &splitpath[1], is_mode2,
++ = _fs_stat_traverse (p_cdio, p_stat, &splitpath[1], b_mode2,
+ translate);
+- free(stat);
++ free(p_stat);
+ free (_dirbuf);
+ return ret_stat;
+ }
+
+- free(stat);
++ free(p_stat);
+
+- offset += iso9660_get_dir_len(iso9660_dir);
++ offset += iso9660_get_dir_len(p_iso9660_dir);
+ }
+
+ cdio_assert (offset == (_root->secsize * ISO_BLOCKSIZE));
+@@ -323,20 +855,20 @@
+ }
+
+ static iso9660_stat_t *
+-_fs_iso_stat_traverse (iso9660_t *iso, const iso9660_stat_t *_root,
++_fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
+ char **splitpath, bool translate)
+ {
+ unsigned offset = 0;
+ uint8_t *_dirbuf = NULL;
+- iso9660_stat_t *stat;
+ int ret;
+
+ if (!splitpath[0])
+ {
++ iso9660_stat_t *p_stat;
+ unsigned int len=sizeof(iso9660_stat_t) + strlen(_root->filename)+1;
+- stat = _cdio_malloc(len);
+- memcpy(stat, _root, len);
+- return stat;
++ p_stat = _cdio_malloc(len);
++ memcpy(p_stat, _root, len);
++ return p_stat;
+ }
+
+ if (_root->type == _STAT_FILE)
+@@ -353,50 +885,52 @@
+
+ _dirbuf = _cdio_malloc (_root->secsize * ISO_BLOCKSIZE);
+
+- ret = iso9660_iso_seek_read (iso, _dirbuf, _root->lsn, _root->secsize);
++ ret = iso9660_iso_seek_read (p_iso, _dirbuf, _root->lsn, _root->secsize);
+ if (ret!=ISO_BLOCKSIZE*_root->secsize) return NULL;
+
+ while (offset < (_root->secsize * ISO_BLOCKSIZE))
+ {
+- const iso9660_dir_t *iso9660_dir = (void *) &_dirbuf[offset];
+- iso9660_stat_t *stat;
++ iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
++ iso9660_stat_t *p_stat;
+ int cmp;
+
+- if (!iso9660_get_dir_len(iso9660_dir))
++ if (!iso9660_get_dir_len(p_iso9660_dir))
+ {
+ offset++;
+ continue;
+ }
+
+- stat = _iso9660_dir_to_statbuf (iso9660_dir, true);
++ p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, true,
++ p_iso->i_joliet_level);
+
+ if (translate) {
+- char *trans_fname = malloc(strlen(stat->filename)+1);
++ char *trans_fname = malloc(strlen(p_stat->filename)+1);
+ int trans_len;
+
+ if (trans_fname == NULL) {
+ cdio_warn("can't allocate %lu bytes",
+- (long unsigned int) strlen(stat->filename));
++ (long unsigned int) strlen(p_stat->filename));
+ return NULL;
+ }
+- trans_len = iso9660_name_translate(stat->filename, trans_fname);
++ trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname,
++ p_iso->i_joliet_level);
+ cmp = strcmp(splitpath[0], trans_fname);
+ free(trans_fname);
+ } else {
+- cmp = strcmp(splitpath[0], stat->filename);
++ cmp = strcmp(splitpath[0], p_stat->filename);
+ }
+
+ if (!cmp) {
+ iso9660_stat_t *ret_stat
+- = _fs_iso_stat_traverse (iso, stat, &splitpath[1], translate);
+- free(stat);
++ = _fs_iso_stat_traverse (p_iso, p_stat, &splitpath[1], translate);
++ free(p_stat);
+ free (_dirbuf);
+ return ret_stat;
+ }
+
+- free(stat);
++ free(p_stat);
+
+- offset += iso9660_get_dir_len(iso9660_dir);
++ offset += iso9660_get_dir_len(p_iso9660_dir);
+ }
+
+ cdio_assert (offset == (_root->secsize * ISO_BLOCKSIZE));
+@@ -410,24 +944,27 @@
+ Get file status for pathname into stat. NULL is returned on error.
+ */
+ iso9660_stat_t *
+-iso9660_fs_stat (const CdIo *cdio, const char pathname[], bool is_mode2)
++iso9660_fs_stat (CdIo *p_cdio, const char pathname[])
+ {
+- iso9660_stat_t *root;
+- char **splitpath;
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_root;
++ char **p_psz_splitpath;
++ iso9660_stat_t *p_stat;
++ /* A bit of a hack, we'll assume track 1 contains ISO_PVD_SECTOR.*/
++ bool b_mode2;
++
++ if (!p_cdio) return NULL;
++ if (!pathname) return NULL;
++
++ p_root = _fs_stat_root (p_cdio);
++ if (!p_root) return NULL;
++
++ b_mode2 = cdio_get_track_green(p_cdio, 1);
++ p_psz_splitpath = _cdio_strsplit (pathname, '/');
++ p_stat = _fs_stat_traverse (p_cdio, p_root, p_psz_splitpath, b_mode2, false);
++ free(p_root);
++ _cdio_strfreev (p_psz_splitpath);
+
+- if (cdio == NULL) return NULL;
+- if (pathname == NULL) return NULL;
+-
+- root = _fs_stat_root (cdio, is_mode2);
+- if (NULL == root) return NULL;
+-
+- splitpath = _cdio_strsplit (pathname, '/');
+- stat = _fs_stat_traverse (cdio, root, splitpath, is_mode2, false);
+- free(root);
+- _cdio_strfreev (splitpath);
+-
+- return stat;
++ return p_stat;
+ }
+
+ /*!
+@@ -437,47 +974,47 @@
+ are lowercased.
+ */
+ iso9660_stat_t *
+-iso9660_fs_stat_translate (const CdIo *cdio, const char pathname[],
+- bool is_mode2)
++iso9660_fs_stat_translate (CdIo *p_cdio, const char pathname[],
++ bool b_mode2)
+ {
+- iso9660_stat_t *root;
+- char **splitpath;
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_root;
++ char **p_psz_splitpath;
++ iso9660_stat_t *p_stat;
++
++ if (!p_cdio) return NULL;
++ if (pathname) return NULL;
++
++ p_root = _fs_stat_root (p_cdio);
++ if (!p_root) return NULL;
++
++ p_psz_splitpath = _cdio_strsplit (pathname, '/');
++ p_stat = _fs_stat_traverse (p_cdio, p_root, p_psz_splitpath, b_mode2, true);
++ free(p_root);
++ _cdio_strfreev (p_psz_splitpath);
+
+- if (cdio == NULL) return NULL;
+- if (pathname == NULL) return NULL;
+-
+- root = _fs_stat_root (cdio, is_mode2);
+- if (NULL == root) return NULL;
+-
+- splitpath = _cdio_strsplit (pathname, '/');
+- stat = _fs_stat_traverse (cdio, root, splitpath, is_mode2, true);
+- free(root);
+- _cdio_strfreev (splitpath);
+-
+- return stat;
++ return p_stat;
+ }
+
+ /*!
+ Get file status for pathname into stat. NULL is returned on error.
+ */
+-void *
+-iso9660_ifs_stat (iso9660_t *iso, const char pathname[])
++iso9660_stat_t *
++iso9660_ifs_stat (iso9660_t *p_iso, const char pathname[])
+ {
+- iso9660_stat_t *root;
++ iso9660_stat_t *p_root;
+ char **splitpath;
+ iso9660_stat_t *stat;
+
+- if (iso == NULL) return NULL;
+- if (pathname == NULL) return NULL;
++ if (!p_iso) return NULL;
++ if (!pathname) return NULL;
+
+- root = _fs_stat_iso_root (iso);
+- if (NULL == root) return NULL;
++ p_root = _fs_stat_iso_root (p_iso);
++ if (!p_root) return NULL;
+
+ splitpath = _cdio_strsplit (pathname, '/');
+- stat = _fs_iso_stat_traverse (iso, root, splitpath, false);
+- free(root);
+- _cdio_strfreev (splitpath);
++ stat = _fs_iso_stat_traverse (p_iso, p_root, splitpath, false);
++ free(p_root);
++ /*** FIXME _cdio_strfreev (splitpath); ***/
+
+ return stat;
+ }
+@@ -488,45 +1025,45 @@
+ name are dropped, i.e. ;1 is removed and if level 1 ISO-9660 names
+ are lowercased.
+ */
+-void *
+-iso9660_ifs_stat_translate (iso9660_t *iso, const char pathname[])
++iso9660_stat_t *
++iso9660_ifs_stat_translate (iso9660_t *p_iso, const char pathname[])
+ {
+- iso9660_stat_t *root;
+- char **splitpath;
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_root;
++ char **p_psz_splitpath;
++ iso9660_stat_t *p_stat;
++
++ if (!p_iso) return NULL;
++ if (!pathname) return NULL;
++
++ p_root = _fs_stat_iso_root (p_iso);
++ if (NULL == p_root) return NULL;
++
++ p_psz_splitpath = _cdio_strsplit (pathname, '/');
++ p_stat = _fs_iso_stat_traverse (p_iso, p_root, p_psz_splitpath, true);
++ free(p_root);
++ _cdio_strfreev (p_psz_splitpath);
+
+- if (iso == NULL) return NULL;
+- if (pathname == NULL) return NULL;
+-
+- root = _fs_stat_iso_root (iso);
+- if (NULL == root) return NULL;
+-
+- splitpath = _cdio_strsplit (pathname, '/');
+- stat = _fs_iso_stat_traverse (iso, root, splitpath, true);
+- free(root);
+- _cdio_strfreev (splitpath);
+-
+- return stat;
++ return p_stat;
+ }
+
+ /*!
+ Read pathname (a directory) and return a list of iso9660_stat_t
+ of the files inside that. The caller must free the returned result.
+ */
+-void *
+-iso9660_fs_readdir (const CdIo *cdio, const char pathname[], bool is_mode2)
++CdioList *
++iso9660_fs_readdir (CdIo *p_cdio, const char pathname[], bool b_mode2)
+ {
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_stat;
++ generic_img_private_t *p_env = (generic_img_private_t *) p_cdio->env;
+
+- if (NULL == cdio) return NULL;
+- if (NULL == pathname) return NULL;
++ if (!p_cdio) return NULL;
++ if (!pathname) return NULL;
+
+- stat = iso9660_fs_stat (cdio, pathname, is_mode2);
+- if (NULL == stat)
+- return NULL;
++ p_stat = iso9660_fs_stat (p_cdio, pathname);
++ if (!p_stat) return NULL;
+
+- if (stat->type != _STAT_DIR) {
+- free(stat);
++ if (p_stat->type != _STAT_DIR) {
++ free(p_stat);
+ return NULL;
+ }
+
+@@ -535,46 +1072,47 @@
+ uint8_t *_dirbuf = NULL;
+ CdioList *retval = _cdio_list_new ();
+
+- if (stat->size != ISO_BLOCKSIZE * stat->secsize)
++ if (p_stat->size != ISO_BLOCKSIZE * p_stat->secsize)
+ {
+ cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
+- (unsigned) stat->size,
+- (unsigned long int) ISO_BLOCKSIZE * stat->secsize);
++ (unsigned) p_stat->size,
++ (unsigned long int) ISO_BLOCKSIZE * p_stat->secsize);
+ }
+
+- _dirbuf = _cdio_malloc (stat->secsize * ISO_BLOCKSIZE);
++ _dirbuf = _cdio_malloc (p_stat->secsize * ISO_BLOCKSIZE);
+
+- if (is_mode2) {
+- if (cdio_read_mode2_sectors (cdio, _dirbuf, stat->lsn, false,
+- stat->secsize))
++ if (b_mode2) {
++ if (cdio_read_mode2_sectors (p_cdio, _dirbuf, p_stat->lsn, false,
++ p_stat->secsize))
+ cdio_assert_not_reached ();
+ } else {
+- if (cdio_read_mode1_sectors (cdio, _dirbuf, stat->lsn, false,
+- stat->secsize))
++ if (cdio_read_mode1_sectors (p_cdio, _dirbuf, p_stat->lsn, false,
++ p_stat->secsize))
+ cdio_assert_not_reached ();
+ }
+
+- while (offset < (stat->secsize * ISO_BLOCKSIZE))
++ while (offset < (p_stat->secsize * ISO_BLOCKSIZE))
+ {
+- const iso9660_dir_t *iso9660_dir = (void *) &_dirbuf[offset];
+- iso9660_stat_t *iso9660_stat;
++ iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
++ iso9660_stat_t *p_iso9660_stat;
+
+- if (!iso9660_get_dir_len(iso9660_dir))
++ if (!iso9660_get_dir_len(p_iso9660_dir))
+ {
+ offset++;
+ continue;
+ }
+
+- iso9660_stat = _iso9660_dir_to_statbuf(iso9660_dir, is_mode2);
+- _cdio_list_append (retval, iso9660_stat);
++ p_iso9660_stat = _iso9660_dir_to_statbuf(p_iso9660_dir, b_mode2,
++ p_env->i_joliet_level);
++ _cdio_list_append (retval, p_iso9660_stat);
+
+- offset += iso9660_get_dir_len(iso9660_dir);
++ offset += iso9660_get_dir_len(p_iso9660_dir);
+ }
+
+- cdio_assert (offset == (stat->secsize * ISO_BLOCKSIZE));
++ cdio_assert (offset == (p_stat->secsize * ISO_BLOCKSIZE));
+
+ free (_dirbuf);
+- free (stat);
++ free (p_stat);
+ return retval;
+ }
+ }
+@@ -583,19 +1121,19 @@
+ Read pathname (a directory) and return a list of iso9660_stat_t
+ of the files inside that. The caller must free the returned result.
+ */
+-void *
+-iso9660_ifs_readdir (iso9660_t *iso, const char pathname[])
++CdioList *
++iso9660_ifs_readdir (iso9660_t *p_iso, const char pathname[])
+ {
+- iso9660_stat_t *stat;
++ iso9660_stat_t *p_stat;
+
+- if (NULL == iso) return NULL;
+- if (NULL == pathname) return NULL;
++ if (!p_iso) return NULL;
++ if (!pathname) return NULL;
+
+- stat = iso9660_ifs_stat (iso, pathname);
+- if (NULL == stat) return NULL;
++ p_stat = iso9660_ifs_stat (p_iso, pathname);
++ if (!p_stat) return NULL;
+
+- if (stat->type != _STAT_DIR) {
+- free(stat);
++ if (p_stat->type != _STAT_DIR) {
++ free(p_stat);
+ return NULL;
+ }
+
+@@ -605,47 +1143,48 @@
+ uint8_t *_dirbuf = NULL;
+ CdioList *retval = _cdio_list_new ();
+
+- if (stat->size != ISO_BLOCKSIZE * stat->secsize)
++ if (p_stat->size != ISO_BLOCKSIZE * p_stat->secsize)
+ {
+ cdio_warn ("bad size for ISO9660 directory (%ud) should be (%lu)!",
+- (unsigned) stat->size,
+- (unsigned long int) ISO_BLOCKSIZE * stat->secsize);
++ (unsigned int) p_stat->size,
++ (unsigned long int) ISO_BLOCKSIZE * p_stat->secsize);
+ }
+
+- _dirbuf = _cdio_malloc (stat->secsize * ISO_BLOCKSIZE);
++ _dirbuf = _cdio_malloc (p_stat->secsize * ISO_BLOCKSIZE);
+
+- ret = iso9660_iso_seek_read (iso, _dirbuf, stat->lsn, stat->secsize);
+- if (ret != ISO_BLOCKSIZE*stat->secsize) return NULL;
++ ret = iso9660_iso_seek_read (p_iso, _dirbuf, p_stat->lsn, p_stat->secsize);
++ if (ret != ISO_BLOCKSIZE*p_stat->secsize) return NULL;
+
+- while (offset < (stat->secsize * ISO_BLOCKSIZE))
++ while (offset < (p_stat->secsize * ISO_BLOCKSIZE))
+ {
+- const iso9660_dir_t *iso9660_dir = (void *) &_dirbuf[offset];
+- iso9660_stat_t *iso9660_stat;
++ iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
++ iso9660_stat_t *p_iso9660_stat;
+
+- if (!iso9660_get_dir_len(iso9660_dir))
++ if (!iso9660_get_dir_len(p_iso9660_dir))
+ {
+ offset++;
+ continue;
+ }
+
+- iso9660_stat = _iso9660_dir_to_statbuf(iso9660_dir, true);
+- _cdio_list_append (retval, iso9660_stat);
++ p_iso9660_stat = _iso9660_dir_to_statbuf(p_iso9660_dir, true,
++ p_iso->i_joliet_level);
++ _cdio_list_append (retval, p_iso9660_stat);
+
+- offset += iso9660_get_dir_len(iso9660_dir);
++ offset += iso9660_get_dir_len(p_iso9660_dir);
+ }
+
+- cdio_assert (offset == (stat->secsize * ISO_BLOCKSIZE));
++ cdio_assert (offset == (p_stat->secsize * ISO_BLOCKSIZE));
+
+ free (_dirbuf);
+- free (stat);
++ free (p_stat);
+ return retval;
+ }
+ }
+
+ static iso9660_stat_t *
+-find_fs_lsn_recurse (const CdIo *cdio, const char pathname[], lsn_t lsn)
++find_fs_lsn_recurse (CdIo *p_cdio, const char pathname[], lsn_t lsn)
+ {
+- CdioList *entlist = iso9660_fs_readdir (cdio, pathname, true);
++ CdioList *entlist = iso9660_fs_readdir (p_cdio, pathname, true);
+ CdioList *dirlist = _cdio_list_new ();
+ CdioListNode *entnode;
+
+@@ -686,7 +1225,7 @@
+ _CDIO_LIST_FOREACH (entnode, dirlist)
+ {
+ char *_fullname = _cdio_list_node_data (entnode);
+- iso9660_stat_t *ret_stat = find_fs_lsn_recurse (cdio, _fullname, lsn);
++ iso9660_stat_t *ret_stat = find_fs_lsn_recurse (p_cdio, _fullname, lsn);
+
+ if (NULL != ret_stat) {
+ _cdio_list_free (dirlist, true);
+@@ -705,8 +1244,17 @@
+ Returns stat_t of entry if we found lsn, or NULL otherwise.
+ */
+ iso9660_stat_t *
+-iso9660_find_fs_lsn(const CdIo *cdio, lsn_t lsn)
++iso9660_find_fs_lsn(CdIo *p_cdio, lsn_t i_lsn)
+ {
+- return find_fs_lsn_recurse (cdio, "/", lsn);
++ return find_fs_lsn_recurse (p_cdio, "/", i_lsn);
+ }
+
++/*!
++ Return true if ISO 9660 image has extended attrributes (XA).
++*/
++bool
++iso9660_ifs_is_xa (const iso9660_t * p_iso)
++{
++ if (!p_iso) return false;
++ return p_iso->b_xa;
++}
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/portable.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,74 @@
++/*
++ $Id: portable.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/*
++ This file contains definitions to fill in for differences or
++ deficiencies to OS or compiler irregularities. If this file is
++ included other routines can be more portable.
++*/
++
++#ifndef __CDIO_PORTABLE_H__
++#define __CDIO_PORTABLE_H__
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#if !defined(HAVE_FTRUNCATE)
++# if defined ( WIN32 )
++# define ftruncate chsize
++# endif
++#endif /*HAVE_FTRUNCATE*/
++
++#if !defined(HAVE_SNPRINTF)
++# if defined ( MSVC )
++# define snprintf _snprintf
++# endif
++#endif /*HAVE_SNPRINTF*/
++
++#if !defined(HAVE_VSNPRINTF)
++# if defined ( MSVC )
++# define snprintf _vsnprintf
++# endif
++#endif /*HAVE_SNPRINTF*/
++
++#ifdef MSVC
++# include <io.h>
++
++# ifndef S_ISBLK
++# define _S_IFBLK 0060000 /* Block Special */
++# define S_ISBLK(x) (x & _S_IFBLK)
++# endif
++
++# ifndef S_ISCHR
++# define _S_IFCHR 0020000 /* character special */
++# define S_ISCHR(x) (x & _S_IFCHR)
++# endif
++#endif /*MSVC*/
++
++#ifdef HAVE_MEMSET
++# define BZERO(ptr, size) memset(ptr, 0, size)
++#elif HAVE_BZERO
++# define BZERO(ptr, size) bzero(ptr, size)
++#else
++ Error -- you need either memset or bzero
++#endif
++
++#endif /* __CDIO_PORTABLE_H__ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/scsi_mmc.c 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,589 @@
++/* Common SCSI Multimedia Command (MMC) routines.
++
++ $Id: scsi_mmc.c,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <cdio/cdio.h>
++#include <cdio/logging.h>
++#include <cdio/scsi_mmc.h>
++#include "cdio_private.h"
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++
++#ifdef HAVE_ERRNO_H
++#include <errno.h>
++#endif
++
++/*!
++ On input a MODE_SENSE command was issued and we have the results
++ in p. We interpret this and return a bit mask set according to the
++ capabilities.
++ */
++void
++scsi_mmc_get_drive_cap_buf(const uint8_t *p,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ /* Reader */
++ if (p[2] & 0x01) *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_R;
++ if (p[2] & 0x02) *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_RW;
++ if (p[2] & 0x08) *p_read_cap |= CDIO_DRIVE_CAP_READ_DVD_ROM;
++ if (p[4] & 0x01) *p_read_cap |= CDIO_DRIVE_CAP_READ_AUDIO;
++ if (p[5] & 0x01) *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_DA;
++ if (p[5] & 0x10) *p_read_cap |= CDIO_DRIVE_CAP_READ_C2_ERRS;
++
++ /* Writer */
++ if (p[3] & 0x01) *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_R;
++ if (p[3] & 0x02) *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_RW;
++ if (p[3] & 0x10) *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_R;
++ if (p[3] & 0x20) *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RAM;
++ if (p[4] & 0x80) *p_misc_cap |= CDIO_DRIVE_CAP_WRITE_BURN_PROOF;
++
++ /* Misc */
++ if (p[4] & 0x40) *p_misc_cap |= CDIO_DRIVE_CAP_MISC_MULTI_SESSION;
++ if (p[6] & 0x01) *p_misc_cap |= CDIO_DRIVE_CAP_MISC_LOCK;
++ if (p[6] & 0x08) *p_misc_cap |= CDIO_DRIVE_CAP_MISC_EJECT;
++ if (p[6] >> 5 != 0)
++ *p_misc_cap |= CDIO_DRIVE_CAP_MISC_CLOSE_TRAY;
++}
++
++/*!
++ Return the number of length in bytes of the Command Descriptor
++ buffer (CDB) for a given SCSI MMC command. The length will be
++ either 6, 10, or 12.
++*/
++uint8_t
++scsi_mmc_get_cmd_len(uint8_t scsi_cmd)
++{
++ static const uint8_t scsi_cdblen[8] = {6, 10, 10, 12, 12, 12, 10, 10};
++ return scsi_cdblen[((scsi_cmd >> 5) & 7)];
++}
++
++/*!
++ Run a SCSI MMC command.
++
++ cdio CD structure set by cdio_open().
++ i_timeout time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ buf Buffer for data, both sending and receiving
++ len Size of buffer
++ e_direction direction the transfer is to go
++ cdb CDB bytes. All values that are needed should be set on
++ input. We'll figure out what the right CDB length should be.
++
++ We return 0 if command completed successfully and 1 if not.
++ */
++int
++scsi_mmc_run_cmd( const CdIo *p_cdio, unsigned int i_timeout_ms,
++ const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction, unsigned int i_buf,
++ /*in/out*/ void *p_buf )
++{
++ if (p_cdio && p_cdio->op.run_scsi_mmc_cmd) {
++ return p_cdio->op.run_scsi_mmc_cmd(p_cdio->env, i_timeout_ms,
++ scsi_mmc_get_cmd_len(p_cdb->field[0]),
++ p_cdb, e_direction, i_buf, p_buf);
++ } else
++ return 1;
++}
++
++#define DEFAULT_TIMEOUT_MS 6000
++
++/*!
++ * Eject using SCSI MMC commands. Return 0 if successful.
++ */
++int
++scsi_mmc_eject_media( const CdIo *cdio )
++{
++ int i_status;
++ scsi_mmc_cdb_t cdb = {{0, }};
++ uint8_t buf[1];
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd;
++
++ if ( ! cdio || ! cdio->op.run_scsi_mmc_cmd )
++ return -2;
++
++ run_scsi_mmc_cmd = cdio->op.run_scsi_mmc_cmd;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL);
++
++ i_status = run_scsi_mmc_cmd (cdio->env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_WRITE, 0, &buf);
++ if (0 != i_status)
++ return i_status;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_START_STOP);
++ cdb.field[4] = 1;
++ i_status = run_scsi_mmc_cmd (cdio->env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_WRITE, 0, &buf);
++ if (0 != i_status)
++ return i_status;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_START_STOP);
++ cdb.field[4] = 2; /* eject */
++
++ return run_scsi_mmc_cmd (cdio->env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_WRITE, 0, &buf);
++
++}
++
++/*! Packet driver to read mode2 sectors.
++ Can read only up to 25 blocks.
++*/
++int
++scsi_mmc_read_sectors ( const CdIo *cdio, void *p_buf, lba_t lba,
++ int sector_type, unsigned int nblocks )
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd;
++
++ if ( ! cdio || ! cdio->op.run_scsi_mmc_cmd )
++ return -2;
++
++ run_scsi_mmc_cmd = cdio->op.run_scsi_mmc_cmd;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_CD);
++ CDIO_MMC_SET_READ_TYPE (cdb.field, sector_type);
++ CDIO_MMC_SET_READ_LBA (cdb.field, lba);
++ CDIO_MMC_SET_READ_LENGTH24(cdb.field, nblocks);
++ CDIO_MMC_SET_MAIN_CHANNEL_SELECTION_BITS(cdb.field,
++ CDIO_MMC_MCSB_ALL_HEADERS);
++
++ return run_scsi_mmc_cmd (cdio->env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_READ,
++ CDIO_CD_FRAMESIZE_RAW * nblocks,
++ p_buf);
++}
++
++int
++scsi_mmc_set_blocksize_private ( const void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ unsigned int bsize)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++
++ struct
++ {
++ uint8_t reserved1;
++ uint8_t medium;
++ uint8_t reserved2;
++ uint8_t block_desc_length;
++ uint8_t density;
++ uint8_t number_of_blocks_hi;
++ uint8_t number_of_blocks_med;
++ uint8_t number_of_blocks_lo;
++ uint8_t reserved3;
++ uint8_t block_length_hi;
++ uint8_t block_length_med;
++ uint8_t block_length_lo;
++ } mh;
++
++ if ( ! p_env || ! run_scsi_mmc_cmd )
++ return -2;
++
++ memset (&mh, 0, sizeof (mh));
++ mh.block_desc_length = 0x08;
++ mh.block_length_hi = (bsize >> 16) & 0xff;
++ mh.block_length_med = (bsize >> 8) & 0xff;
++ mh.block_length_lo = (bsize >> 0) & 0xff;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SELECT_6);
++
++ cdb.field[1] = 1 << 4;
++ cdb.field[4] = 12;
++
++ return run_scsi_mmc_cmd (p_env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_WRITE, sizeof(mh), &mh);
++}
++
++int
++scsi_mmc_set_blocksize ( const CdIo *cdio, unsigned int bsize)
++{
++ if ( ! cdio ) return -2;
++ return
++ scsi_mmc_set_blocksize_private (cdio->env, cdio->op.run_scsi_mmc_cmd,
++ bsize);
++}
++
++
++/*!
++ Return the the kind of drive capabilities of device.
++ */
++void
++scsi_mmc_get_drive_cap_private (const void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ /* Largest buffer size we use. */
++#define BUF_MAX 2048
++ uint8_t buf[BUF_MAX] = { 0, };
++
++ scsi_mmc_cdb_t cdb = {{0, }};
++ int i_status;
++ uint16_t i_data = BUF_MAX;
++
++ if ( ! p_env || ! run_scsi_mmc_cmd )
++ return;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SENSE_10);
++ cdb.field[1] = 0x0;
++ cdb.field[2] = CDIO_MMC_ALL_PAGES;
++
++ retry:
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, 8);
++
++ /* In the first run we run MODE SENSE 10 we are trying to get the
++ length of the data features. */
++ i_status = run_scsi_mmc_cmd (p_env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), &buf);
++ if (0 == i_status) {
++ uint16_t i_data_try = (uint16_t) CDIO_MMC_GET_LEN16(buf);
++ if (i_data_try < BUF_MAX) i_data = i_data_try;
++ }
++
++ /* Now try getting all features with length set above, possibly
++ truncated or the default length if we couldn't get the proper
++ length. */
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, i_data);
++
++ i_status = run_scsi_mmc_cmd (p_env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), &buf);
++
++ if (0 != i_status && CDIO_MMC_CAPABILITIES_PAGE != cdb.field[2]) {
++ cdb.field[2] = CDIO_MMC_CAPABILITIES_PAGE;
++ goto retry;
++ }
++
++ if (0 == i_status) {
++ uint8_t *p;
++ uint8_t *p_max = buf + 256;
++
++ *p_read_cap = 0;
++ *p_write_cap = 0;
++ *p_misc_cap = 0;
++
++ /* set to first sense mask, and then walk through the masks */
++ p = buf + 8;
++ while( (p < &(buf[2+i_data])) && (p < p_max) ) {
++ uint8_t which_page;
++
++ which_page = p[0] & 0x3F;
++ switch( which_page )
++ {
++ case CDIO_MMC_AUDIO_CTL_PAGE:
++ case CDIO_MMC_R_W_ERROR_PAGE:
++ case CDIO_MMC_CDR_PARMS_PAGE:
++ /* Don't handle these yet. */
++ break;
++ case CDIO_MMC_CAPABILITIES_PAGE:
++ scsi_mmc_get_drive_cap_buf(p, p_read_cap, p_write_cap, p_misc_cap);
++ break;
++ default: ;
++ }
++ p += (p[1] + 2);
++ }
++ } else {
++ cdio_info("%s: %s\n", "error in MODE_SELECT", strerror(errno));
++ *p_read_cap = CDIO_DRIVE_CAP_ERROR;
++ *p_write_cap = CDIO_DRIVE_CAP_ERROR;
++ *p_misc_cap = CDIO_DRIVE_CAP_ERROR;
++ }
++ return;
++}
++
++void
++scsi_mmc_get_drive_cap (const CdIo *p_cdio,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ if ( ! p_cdio ) return;
++ scsi_mmc_get_drive_cap_private (p_cdio->env,
++ p_cdio->op.run_scsi_mmc_cmd,
++ p_read_cap, p_write_cap, p_misc_cap);
++}
++
++void
++scsi_mmc_get_drive_cap_generic (const void *p_user_data,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ const generic_img_private_t *p_env = p_user_data;
++ scsi_mmc_get_drive_cap( p_env->cdio,
++ p_read_cap, p_write_cap, p_misc_cap );
++}
++
++
++/*!
++ Get the DVD type associated with cd object.
++*/
++discmode_t
++scsi_mmc_get_dvd_struct_physical_private ( void *p_env, const
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ cdio_dvd_struct_t *s)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++ unsigned char buf[4 + 4 * 20], *base;
++ int i_status;
++ uint8_t layer_num = s->physical.layer_num;
++
++ cdio_dvd_layer_t *layer;
++
++ if ( ! p_env || ! run_scsi_mmc_cmd )
++ return -2;
++
++ if (layer_num >= CDIO_DVD_MAX_LAYERS)
++ return -EINVAL;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_DVD_STRUCTURE);
++ cdb.field[6] = layer_num;
++ cdb.field[7] = CDIO_DVD_STRUCT_PHYSICAL;
++ cdb.field[9] = sizeof(buf) & 0xff;
++
++ i_status = run_scsi_mmc_cmd(p_env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), &buf);
++ if (0 != i_status)
++ return CDIO_DISC_MODE_ERROR;
++
++ base = &buf[4];
++ layer = &s->physical.layer[layer_num];
++
++ /*
++ * place the data... really ugly, but at least we won't have to
++ * worry about endianess in userspace.
++ */
++ memset(layer, 0, sizeof(*layer));
++ layer->book_version = base[0] & 0xf;
++ layer->book_type = base[0] >> 4;
++ layer->min_rate = base[1] & 0xf;
++ layer->disc_size = base[1] >> 4;
++ layer->layer_type = base[2] & 0xf;
++ layer->track_path = (base[2] >> 4) & 1;
++ layer->nlayers = (base[2] >> 5) & 3;
++ layer->track_density = base[3] & 0xf;
++ layer->linear_density = base[3] >> 4;
++ layer->start_sector = base[5] << 16 | base[6] << 8 | base[7];
++ layer->end_sector = base[9] << 16 | base[10] << 8 | base[11];
++ layer->end_sector_l0 = base[13] << 16 | base[14] << 8 | base[15];
++ layer->bca = base[16] >> 7;
++
++ return 0;
++}
++
++
++/*!
++ Get the DVD type associated with cd object.
++*/
++discmode_t
++scsi_mmc_get_dvd_struct_physical ( const CdIo *p_cdio, cdio_dvd_struct_t *s)
++{
++ if ( ! p_cdio ) return -2;
++ return
++ scsi_mmc_get_dvd_struct_physical_private (p_cdio->env,
++ p_cdio->op.run_scsi_mmc_cmd,
++ s);
++}
++
++/*!
++ Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
++ False is returned if we had an error getting the information.
++*/
++bool
++scsi_mmc_get_hwinfo ( const CdIo *p_cdio,
++ /*out*/ cdio_hwinfo_t *hw_info )
++{
++ int i_status; /* Result of SCSI MMC command */
++ char buf[36] = { 0, }; /* Place to hold returned data */
++ scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Block */
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY);
++ cdb.field[4] = sizeof(buf);
++
++ if (! p_cdio || ! hw_info ) return false;
++
++ i_status = scsi_mmc_run_cmd(p_cdio, DEFAULT_TIMEOUT_MS,
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), &buf);
++ if (i_status == 0) {
++
++ memcpy(hw_info->psz_vendor,
++ buf + 8,
++ sizeof(hw_info->psz_vendor)-1);
++ hw_info->psz_vendor[sizeof(hw_info->psz_vendor)-1] = '\0';
++ memcpy(hw_info->psz_model,
++ buf + 8 + CDIO_MMC_HW_VENDOR_LEN,
++ sizeof(hw_info->psz_model)-1);
++ hw_info->psz_model[sizeof(hw_info->psz_model)-1] = '\0';
++ memcpy(hw_info->psz_revision,
++ buf + 8 + CDIO_MMC_HW_VENDOR_LEN + CDIO_MMC_HW_MODEL_LEN,
++ sizeof(hw_info->psz_revision)-1);
++ hw_info->psz_revision[sizeof(hw_info->psz_revision)-1] = '\0';
++ return true;
++ }
++ return false;
++}
++
++/*!
++ Return the media catalog number MCN.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++char *
++scsi_mmc_get_mcn_private ( void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd
++ )
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++ char buf[28] = { 0, };
++ int i_status;
++
++ if ( ! p_env || ! run_scsi_mmc_cmd )
++ return NULL;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_SUBCHANNEL);
++ cdb.field[1] = 0x0;
++ cdb.field[2] = 0x40;
++ cdb.field[3] = CDIO_SUBCHANNEL_MEDIA_CATALOG;
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, sizeof(buf));
++
++ i_status = run_scsi_mmc_cmd(p_env, DEFAULT_TIMEOUT_MS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), buf);
++ if(i_status == 0) {
++ return strdup(&buf[9]);
++ }
++ return NULL;
++}
++
++char *
++scsi_mmc_get_mcn ( const CdIo *p_cdio )
++{
++ if ( ! p_cdio ) return NULL;
++ return scsi_mmc_get_mcn_private (p_cdio->env,
++ p_cdio->op.run_scsi_mmc_cmd );
++}
++
++char *
++scsi_mmc_get_mcn_generic (const void *p_user_data)
++{
++ const generic_img_private_t *p_env = p_user_data;
++ return scsi_mmc_get_mcn( p_env->cdio );
++}
++
++/*
++ Read cdtext information for a CdIo object .
++
++ return true on success, false on error or CD-Text information does
++ not exist.
++*/
++bool
++scsi_mmc_init_cdtext_private ( void *p_user_data,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ set_cdtext_field_fn_t set_cdtext_field_fn
++ )
++{
++
++ generic_img_private_t *p_env = p_user_data;
++ scsi_mmc_cdb_t cdb = {{0, }};
++ unsigned char wdata[5000] = { 0, };
++ int i_status, i_errno;
++
++ if ( ! p_env || ! run_scsi_mmc_cmd || p_env->b_cdtext_error )
++ return false;
++
++ /* Operation code */
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC);
++
++ cdb.field[1] = CDIO_CDROM_MSF;
++ /* Format */
++ cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT;
++
++ /* Setup to read header, to get length of data */
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, 4);
++
++ errno = 0;
++
++/* Set read timeout 3 minues. */
++#define READ_TIMEOUT 3*60*1000
++
++ /* We may need to give CD-Text a little more time to complete. */
++ /* First off, just try and read the size */
++ i_status = run_scsi_mmc_cmd (p_env, READ_TIMEOUT,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ 4, &wdata);
++
++ if (i_status != 0) {
++ cdio_info ("CD-Text read failed for header: %s\n", strerror(errno));
++ i_errno = errno;
++ p_env->b_cdtext_error = true;
++ return false;
++ } else {
++ /* Now read the CD-Text data */
++ int i_cdtext = CDIO_MMC_GET_LEN16(wdata);
++
++ if (i_cdtext > sizeof(wdata)) i_cdtext = sizeof(wdata);
++
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, i_cdtext);
++ i_status = run_scsi_mmc_cmd (p_env, READ_TIMEOUT,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ i_cdtext, &wdata);
++ if (i_status != 0) {
++ cdio_info ("CD-Text read for text failed: %s\n", strerror(errno));
++ i_errno = errno;
++ p_env->b_cdtext_error = true;
++ return false;
++ }
++ p_env->b_cdtext_init = true;
++ return cdtext_data_init(p_env, p_env->i_first_track, wdata,
++ set_cdtext_field_fn);
++ }
++}
++
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/scsi_mmc_private.h 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,105 @@
++/* private MMC helper routines.
++
++ $Id: scsi_mmc_private.h,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#include <cdio/scsi_mmc.h>
++#include "cdtext_private.h"
++
++/*! Convert milliseconds to seconds taking the ceiling value, i.e.
++ 1002 milliseconds gets rounded to 2 seconds.
++*/
++#define SECS2MSECS 1000
++static inline unsigned int
++msecs2secs(unsigned int msecs)
++{
++ return (msecs+(SECS2MSECS-1)) / SECS2MSECS;
++}
++#undef SECS2MSECS
++
++typedef
++int (*scsi_mmc_run_cmd_fn_t) ( const void *p_user_data,
++ unsigned int i_timeout_ms,
++ unsigned int i_cdb,
++ const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf );
++
++int scsi_mmc_set_blocksize_mmc_private ( const void *p_env, const
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ unsigned int bsize );
++
++/*!
++ Get the DVD type associated with cd object.
++*/
++discmode_t
++scsi_mmc_get_dvd_struct_physical_private ( void *p_env, const
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ cdio_dvd_struct_t *s );
++
++
++int
++scsi_mmc_set_blocksize_private ( const void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ unsigned int bsize);
++
++char *scsi_mmc_get_mcn_private ( void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd
++ );
++
++char *scsi_mmc_get_mcn_generic (const void *p_user_data);
++
++bool scsi_mmc_init_cdtext_private ( void *user_data, const
++ scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ set_cdtext_field_fn_t set_cdtext_field_fn
++ );
++
++/*!
++ On input a MODE_SENSE command was issued and we have the results
++ in p. We interpret this and return a bit mask set according to the
++ capabilities.
++ */
++void scsi_mmc_get_drive_cap_buf(const uint8_t *p,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap);
++
++/*!
++ Return the the kind of drive capabilities of device.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ */
++void
++scsi_mmc_get_drive_cap_private (const void *p_env,
++ const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap);
++void
++scsi_mmc_get_drive_cap_generic (const void *p_user_data,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap);
++
++
++
++
++
+--- ./src/input/vcd/libcdio/sector.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/sector.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: sector.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: sector.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -24,6 +24,7 @@
+
+ #include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/logging.h>
+ #include "cdio_assert.h"
+
+ #include <stdio.h>
+@@ -31,76 +32,253 @@
+ #include <string.h>
+ #endif
+
++#include <ctype.h>
+
+-static const char _rcsid[] = "$Id: sector.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: sector.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+ lba_t
+ cdio_lba_to_lsn (lba_t lba)
+ {
++ if (CDIO_INVALID_LBA == lba) return CDIO_INVALID_LSN;
+ return lba - CDIO_PREGAP_SECTORS;
+ }
+
++/*
++ The below is adapted from cdparanoia code which claims it is
++ straight from the MMC3 spec.
++*/
++
+ void
+-cdio_lba_to_msf (lba_t lba, msf_t *msf)
++cdio_lsn_to_msf (lsn_t lsn, msf_t *msf)
+ {
++ int m, s, f;
++
+ cdio_assert (msf != 0);
+
+- msf->m = to_bcd8 (lba / (60 * 75));
+- msf->s = to_bcd8 ((lba / 75) % 60);
+- msf->f = to_bcd8 (lba % 75);
++ if ( lsn >= -CDIO_PREGAP_SECTORS ){
++ m = (lsn + CDIO_PREGAP_SECTORS) / CDIO_CD_FRAMES_PER_MIN;
++ lsn -= m * CDIO_CD_FRAMES_PER_MIN;
++ s = (lsn + CDIO_PREGAP_SECTORS) / CDIO_CD_FRAMES_PER_SEC;
++ lsn -= s * CDIO_CD_FRAMES_PER_SEC;
++ f = lsn + CDIO_PREGAP_SECTORS;
++ } else {
++ m = (lsn + CDIO_CD_MAX_LSN) / CDIO_CD_FRAMES_PER_MIN;
++ lsn -= m * (CDIO_CD_FRAMES_PER_MIN);
++ s = (lsn+CDIO_CD_MAX_LSN) / CDIO_CD_FRAMES_PER_SEC;
++ lsn -= s * CDIO_CD_FRAMES_PER_SEC;
++ f = lsn + CDIO_CD_MAX_LSN;
++ }
++
++ if (m > 99) {
++ cdio_warn ("number of minutes (%d) truncated to 99.", m);
++ m = 99;
++ }
++
++ msf->m = cdio_to_bcd8 (m);
++ msf->s = cdio_to_bcd8 (s);
++ msf->f = cdio_to_bcd8 (f);
+ }
+
+-/* warning, returns new allocated string */
++/*!
++ Convert an LBA into a string representation of the MSF.
++ \warning cdio_lba_to_msf_str returns new allocated string */
+ char *
+ cdio_lba_to_msf_str (lba_t lba)
+ {
+- char buf[16];
+- msf_t _msf = { .m = 0, .s = 0, .f = 0 };
+-
+- cdio_lba_to_msf (lba, &_msf);
+
+- snprintf (buf, sizeof (buf), "%.2x:%.2x.%.2x", _msf.m, _msf.s, _msf.f);
+-
+- return strdup (buf);
++ if (CDIO_INVALID_LBA == lba) {
++ return strdup("*INVALID");
++ } else {
++ msf_t msf;
++ msf.m = msf.s = msf.f = 0;
++ cdio_lba_to_msf (lba, &msf);
++ return cdio_msf_to_str(&msf);
++ }
+ }
+
++/*!
++ Convert an LSN into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
+ lba_t
+ cdio_lsn_to_lba (lsn_t lsn)
+ {
++ if (CDIO_INVALID_LSN == lsn) return CDIO_INVALID_LBA;
+ return lsn + CDIO_PREGAP_SECTORS;
+ }
+
++/*!
++ Convert an LBA into the corresponding MSF.
++*/
+ void
+-cdio_lsn_to_msf (lsn_t lsn, msf_t *msf)
++cdio_lba_to_msf (lba_t lba, msf_t *msf)
+ {
+ cdio_assert (msf != 0);
+- cdio_lba_to_msf(cdio_lsn_to_lba(lsn), msf);
++ cdio_lsn_to_msf(cdio_lba_to_lsn(lba), msf);
+ }
+
+-uint32_t
++/*!
++ Convert a MSF into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
++lba_t
+ cdio_msf_to_lba (const msf_t *msf)
+ {
+ uint32_t lba = 0;
+
+ cdio_assert (msf != 0);
+
+- lba = from_bcd8 (msf->m);
+- lba *= 60;
++ lba = cdio_from_bcd8 (msf->m);
++ lba *= CDIO_CD_SECS_PER_MIN;
+
+- lba += from_bcd8 (msf->s);
+- lba *= 75;
++ lba += cdio_from_bcd8 (msf->s);
++ lba *= CDIO_CD_FRAMES_PER_SEC;
+
+- lba += from_bcd8 (msf->f);
++ lba += cdio_from_bcd8 (msf->f);
+
+ return lba;
+ }
+
+-uint32_t
++/*!
++ Convert a MSF into the corresponding LSN.
++ CDIO_INVALID_LSN is returned if there is an error.
++*/
++lba_t
+ cdio_msf_to_lsn (const msf_t *msf)
+ {
+ return cdio_lba_to_lsn(cdio_msf_to_lba (msf));
+ }
+
++/*!
++ Convert an LBA into a string representation of the MSF.
++ \warning cdio_lba_to_msf_str returns new allocated string */
++char *
++cdio_msf_to_str (const msf_t *msf)
++{
++ char buf[16];
++
++ snprintf (buf, sizeof (buf), "%2.2x:%2.2x:%2.2x", msf->m, msf->s, msf->f);
++ return strdup (buf);
++}
++
++/*!
++ Convert a MSF - broken out as 3 integer components into the
++ corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
++lba_t
++cdio_msf3_to_lba (unsigned int minutes, unsigned int seconds,
++ unsigned int frames)
++{
++ return ((minutes * CDIO_CD_SECS_PER_MIN + seconds) * CDIO_CD_FRAMES_PER_SEC
++ + frames);
++}
++
++/*!
++ Convert a string of the form MM:SS:FF into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
++lba_t
++cdio_mmssff_to_lba (const char *psz_mmssff)
++{
++ int psz_field;
++ lba_t ret;
++ char c;
++
++ if (0 == strcmp (psz_mmssff, "0"))
++ return 0;
++
++ c = *psz_mmssff++;
++ if(c >= '0' && c <= '9')
++ psz_field = (c - '0');
++ else
++ return CDIO_INVALID_LBA;
++ while(':' != (c = *psz_mmssff++)) {
++ if(c >= '0' && c <= '9')
++ psz_field = psz_field * 10 + (c - '0');
++ else
++ return CDIO_INVALID_LBA;
++ }
++
++ ret = cdio_msf3_to_lba (psz_field, 0, 0);
++
++ c = *psz_mmssff++;
++ if(c >= '0' && c <= '9')
++ psz_field = (c - '0');
++ else
++ return CDIO_INVALID_LBA;
++ if(':' != (c = *psz_mmssff++)) {
++ if(c >= '0' && c <= '9') {
++ psz_field = psz_field * 10 + (c - '0');
++ c = *psz_mmssff++;
++ if(c != ':')
++ return CDIO_INVALID_LBA;
++ }
++ else
++ return CDIO_INVALID_LBA;
++ }
++
++ if(psz_field >= CDIO_CD_SECS_PER_MIN)
++ return CDIO_INVALID_LBA;
++
++ ret += cdio_msf3_to_lba (0, psz_field, 0);
++
++ c = *psz_mmssff++;
++ if (isdigit(c))
++ psz_field = (c - '0');
++ else
++ return -1;
++ if('\0' != (c = *psz_mmssff++)) {
++ if (isdigit(c)) {
++ psz_field = psz_field * 10 + (c - '0');
++ c = *psz_mmssff++;
++ }
++ else
++ return CDIO_INVALID_LBA;
++ }
++
++ if('\0' != c)
++ return CDIO_INVALID_LBA;
++
++ if(psz_field >= CDIO_CD_FRAMES_PER_SEC)
++ return CDIO_INVALID_LBA;
++
++ ret += psz_field;
++
++ return ret;
++}
++
++bool
++cdio_is_discmode_cdrom(discmode_t discmode)
++{
++ switch (discmode) {
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_NO_INFO:
++ return true;
++ default:
++ return false;
++ }
++}
++
++bool
++cdio_is_discmode_dvd(discmode_t discmode)
++{
++ switch (discmode) {
++ case CDIO_DISC_MODE_DVD_ROM:
++ case CDIO_DISC_MODE_DVD_RAM:
++ case CDIO_DISC_MODE_DVD_R:
++ case CDIO_DISC_MODE_DVD_RW:
++ case CDIO_DISC_MODE_DVD_PR:
++ case CDIO_DISC_MODE_DVD_PRW:
++ return true;
++ default:
++ return false;
++ }
++}
++
+
+ /*
+ * Local variables:
+--- ./src/input/vcd/libcdio/util.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/util.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: util.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: util.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
+@@ -28,10 +28,15 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#ifdef HAVE_INTTYPES_H
++#include "inttypes.h"
++#endif
++
+ #include "cdio_assert.h"
++#include <cdio/types.h>
+ #include <cdio/util.h>
+
+-static const char _rcsid[] = "$Id: util.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: util.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $";
+
+ size_t
+ _cdio_strlenv(char **str_array)
+@@ -169,15 +174,15 @@
+ }
+
+ uint8_t
+-to_bcd8 (uint8_t n)
++cdio_to_bcd8 (uint8_t n)
+ {
+- cdio_assert (n < 100);
++ /*cdio_assert (n < 100);*/
+
+ return ((n/10)<<4) | (n%10);
+ }
+
+ uint8_t
+-from_bcd8(uint8_t p)
++cdio_from_bcd8(uint8_t p)
+ {
+ return (0xf & p)+(10*(p >> 4));
+ }
+--- ./src/input/vcd/libcdio/xa.c 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/xa.c 3 Jan 2005 21:13:57 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: xa.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: xa.c,v 1.2.2.1 2005/01/03 21:13:57 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
+@@ -31,10 +31,10 @@
+ /* Public headers */
+ #include <cdio/iso9660.h>
+ #include <cdio/util.h>
++#include <cdio/bytesex.h>
+
+ /* Private headers */
+ #include "cdio_assert.h"
+-#include "bytesex.h"
+
+ #define BUF_COUNT 16
+ #define BUF_SIZE 80
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/FreeBSD/freebsd.c 3 Jan 2005 21:13:57 -0000 1.1.2.1
+@@ -0,0 +1,638 @@
++/*
++ $Id: freebsd.c,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $
++
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* This file contains FreeBSD-specific code and implements low-level
++ control of the CD drive. Culled initially I think from xine's or
++ mplayer's FreeBSD code with lots of modifications.
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++static const char _rcsid[] = "$Id: freebsd.c,v 1.1.2.1 2005/01/03 21:13:57 mroi Exp $";
++
++#include "freebsd.h"
++
++#ifdef HAVE_FREEBSD_CDROM
++
++#include <cdio/sector.h>
++
++static access_mode_t
++str_to_access_mode_freebsd(const char *psz_access_mode)
++{
++ const access_mode_t default_access_mode = DEFAULT_FREEBSD_AM;
++
++ if (NULL==psz_access_mode) return default_access_mode;
++
++ if (!strcmp(psz_access_mode, "ioctl"))
++ return _AM_IOCTL;
++ else if (!strcmp(psz_access_mode, "CAM"))
++ return _AM_CAM;
++ else {
++ cdio_warn ("unknown access type: %s. Default ioctl used.",
++ psz_access_mode);
++ return default_access_mode;
++ }
++}
++
++static void
++_free_freebsd (void *obj)
++{
++ _img_private_t *env = obj;
++
++ if (NULL == env) return;
++
++ if (NULL != env->device) free(env->device);
++
++ if (_AM_CAM == env->access_mode)
++ return free_freebsd_cam(env);
++ else
++ return cdio_generic_free(obj);
++}
++
++/* Check a drive to see if it is a CD-ROM
++ Return 1 if a CD-ROM. 0 if it exists but isn't a CD-ROM drive
++ and -1 if no device exists .
++*/
++static bool
++cdio_is_cdrom(char *drive, char *mnttype)
++{
++ return cdio_is_cdrom_freebsd_ioctl(drive, mnttype);
++}
++
++/*!
++ Reads nblocks of audio sectors from cd device into data starting from lsn.
++ Returns 0 if no error.
++ */
++static int
++_read_audio_sectors_freebsd (void *user_data, void *data, lsn_t lsn,
++ unsigned int nblocks)
++{
++ return read_audio_sectors_freebsd_ioctl(user_data, data, lsn, nblocks);
++}
++
++/*!
++ Reads a single mode2 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++static int
++_read_mode2_sector_freebsd (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
++{
++ _img_private_t *env = user_data;
++
++ if ( env->access_mode == _AM_CAM )
++ return read_mode2_sector_freebsd_cam(env, data, lsn, b_form2);
++ else
++ return read_mode2_sector_freebsd_ioctl(env, data, lsn, b_form2);
++}
++
++/*!
++ Reads nblocks of mode2 sectors from cd device into data starting
++ from lsn.
++ Returns 0 if no error.
++ */
++static int
++_read_mode2_sectors_freebsd (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
++{
++ _img_private_t *env = user_data;
++
++ if ( env->access_mode == _AM_CAM && b_form2) {
++ /* We have a routine that covers this case without looping. */
++ return read_mode2_sectors_freebsd_cam(env, data, lsn, nblocks);
++ } else {
++ unsigned int i;
++ unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
++
++ /* For each frame, pick out the data part we need */
++ for (i = 0; i < nblocks; i++) {
++ int retval = _read_mode2_sector_freebsd (env,
++ ((char *)data) +
++ (i_blocksize * i),
++ lsn + i, b_form2);
++ if (retval) return retval;
++ }
++ }
++ return 0;
++}
++
++/*!
++ Return the size of the CD in logical block address (LBA) units.
++ */
++static uint32_t
++_stat_size_freebsd (void *obj)
++{
++ _img_private_t *env = obj;
++
++ if (NULL == env) return CDIO_INVALID_LBA;
++
++ if (_AM_CAM == env->access_mode)
++ return stat_size_freebsd_cam(env);
++ else
++ return stat_size_freebsd_ioctl(env);
++}
++
++/*!
++ Set the key "arg" to "value" in source device.
++*/
++static int
++_set_arg_freebsd (void *user_data, const char key[], const char value[])
++{
++ _img_private_t *env = user_data;
++
++ if (!strcmp (key, "source"))
++ {
++ if (!value)
++ return -2;
++
++ free (env->gen.source_name);
++
++ env->gen.source_name = strdup (value);
++ }
++ else if (!strcmp (key, "access-mode"))
++ {
++ env->access_mode = str_to_access_mode_freebsd(value);
++ if (env->access_mode == _AM_CAM && !env->b_cam_init)
++ return init_freebsd_cam(env) ? 1 : -3;
++ return 0;
++ }
++ else
++ return -1;
++
++ return 0;
++}
++
++/*!
++ Read and cache the CD's Track Table of Contents and track info.
++ Return false if unsuccessful;
++*/
++static bool
++read_toc_freebsd (void *p_user_data)
++{
++ _img_private_t *p_env = p_user_data;
++ track_t i, j;
++
++ /* read TOC header */
++ if ( ioctl(p_env->gen.fd, CDIOREADTOCHEADER, &p_env->tochdr) == -1 ) {
++ cdio_warn("error in ioctl(CDIOREADTOCHEADER): %s\n", strerror(errno));
++ return false;
++ }
++
++ p_env->gen.i_first_track = p_env->tochdr.starting_track;
++ p_env->gen.i_tracks = p_env->tochdr.ending_track -
++ p_env->gen.i_first_track + 1;
++
++ j=0;
++ for (i=p_env->gen.i_first_track; i<=p_env->gen.i_tracks; i++, j++) {
++ p_env->tocent[j].track = i;
++ p_env->tocent[j].address_format = CD_LBA_FORMAT;
++
++ if ( ioctl(p_env->gen.fd, CDIOREADTOCENTRY, &(p_env->tocent[j]) ) ) {
++ cdio_warn("%s %d: %s\n",
++ "error in ioctl CDROMREADTOCENTRY for track",
++ i, strerror(errno));
++ return false;
++ }
++ }
++
++ p_env->tocent[j].track = CDIO_CDROM_LEADOUT_TRACK;
++ p_env->tocent[j].address_format = CD_LBA_FORMAT;
++ if ( ioctl(p_env->gen.fd, CDIOREADTOCENTRY, &(p_env->tocent[j]) ) ){
++ cdio_warn("%s: %s\n",
++ "error in ioctl CDROMREADTOCENTRY for leadout track",
++ strerror(errno));
++ return false;
++ }
++
++ p_env->gen.toc_init = true;
++ return true;
++}
++
++/*!
++ Eject media. Return 1 if successful, 0 otherwise.
++ */
++static int
++_eject_media_freebsd (void *user_data)
++{
++ _img_private_t *p_env = user_data;
++
++ return (p_env->access_mode == _AM_IOCTL)
++ ? eject_media_freebsd_ioctl(p_env)
++ : eject_media_freebsd_cam(p_env);
++}
++
++/*!
++ Return the value associated with the key "arg".
++*/
++static const char *
++_get_arg_freebsd (void *user_data, const char key[])
++{
++ _img_private_t *env = user_data;
++
++ if (!strcmp (key, "source")) {
++ return env->gen.source_name;
++ } else if (!strcmp (key, "access-mode")) {
++ switch (env->access_mode) {
++ case _AM_IOCTL:
++ return "ioctl";
++ case _AM_CAM:
++ return "CAM";
++ case _AM_NONE:
++ return "no access method";
++ }
++ }
++ return NULL;
++}
++
++/*!
++ Return the media catalog number MCN.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ FIXME: This is just a guess.
++
++ */
++static char *
++_get_mcn_freebsd (const void *p_user_data) {
++
++ const _img_private_t *p_env = p_user_data;
++
++ return (p_env->access_mode == _AM_IOCTL)
++ ? get_mcn_freebsd_ioctl(p_env)
++ : scsi_mmc_get_mcn(p_env->gen.cdio);
++
++}
++
++static void
++get_drive_cap_freebsd (const void *p_user_data,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap)
++{
++ const _img_private_t *p_env = p_user_data;
++
++ if (p_env->access_mode == _AM_CAM)
++ scsi_mmc_get_drive_cap_generic (p_user_data, p_read_cap, p_write_cap,
++ p_misc_cap);
++
++}
++
++/*!
++ Run a SCSI MMC command.
++
++ p_user_data internal CD structure.
++ i_timeout_ms time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ i_cdb Size of p_cdb
++ p_cdb CDB bytes.
++ e_direction direction the transfer is to go.
++ i_buf Size of buffer
++ p_buf Buffer for data, both sending and receiving
++
++ Return 0 if no error.
++ */
++static int
++run_scsi_cmd_freebsd( const void *p_user_data, unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
++{
++ const _img_private_t *p_env = p_user_data;
++
++ if (p_env->access_mode == _AM_CAM)
++ return run_scsi_cmd_freebsd_cam( p_user_data, i_timeout_ms, i_cdb, p_cdb,
++ e_direction, i_buf, p_buf );
++ else
++ return 2;
++}
++
++/*!
++ Get format of track.
++
++ FIXME: We're just guessing this from the GNU/Linux code.
++
++*/
++static track_format_t
++_get_track_format_freebsd(void *p_user_data, track_t i_track)
++{
++ _img_private_t *p_env = p_user_data;
++
++ if (!p_env->gen.toc_init) read_toc_freebsd (p_user_data) ;
++
++ if (i_track > TOTAL_TRACKS || i_track == 0)
++ return TRACK_FORMAT_ERROR;
++
++ i_track -= FIRST_TRACK_NUM;
++
++ /* This is pretty much copied from the "badly broken" cdrom_count_tracks
++ in linux/cdrom.c.
++ */
++ if (p_env->tocent[i_track].entry.control & CDIO_CDROM_DATA_TRACK) {
++ if (p_env->tocent[i_track].address_format == CDIO_CDROM_CDI_TRACK)
++ return TRACK_FORMAT_CDI;
++ else if (p_env->tocent[i_track].address_format == CDIO_CDROM_XA_TRACK)
++ return TRACK_FORMAT_XA;
++ else
++ return TRACK_FORMAT_DATA;
++ } else
++ return TRACK_FORMAT_AUDIO;
++
++}
++
++/*!
++ Return true if we have XA data (green, mode2 form1) or
++ XA data (green, mode2 form2). That is track begins:
++ sync - header - subheader
++ 12 4 - 8
++
++ FIXME: there's gotta be a better design for this and get_track_format?
++*/
++static bool
++_get_track_green_freebsd(void *user_data, track_t i_track)
++{
++ _img_private_t *p_env = user_data;
++
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1;
++
++ if (i_track > TOTAL_TRACKS+1 || i_track == 0)
++ return false;
++
++ /* FIXME: Dunno if this is the right way, but it's what
++ I was using in cdinfo for a while.
++ */
++ return ((p_env->tocent[i_track-FIRST_TRACK_NUM].entry.control & 2) != 0);
++}
++
++/*!
++ Return the starting LSN track number
++ i_track in obj. Track numbers start at 1.
++ The "leadout" track is specified either by
++ using i_track LEADOUT_TRACK or the total tracks+1.
++ CDIO_INVALID_LBA is returned if there is no track entry.
++*/
++static lba_t
++_get_track_lba_freebsd(void *user_data, track_t i_track)
++{
++ _img_private_t *p_env = user_data;
++
++ if (!p_env->gen.toc_init) read_toc_freebsd (p_env) ;
++
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1;
++
++ if (i_track > TOTAL_TRACKS+1 || i_track == 0 || !p_env->gen.toc_init) {
++ return CDIO_INVALID_LBA;
++ } else {
++ return cdio_lsn_to_lba(ntohl(p_env->tocent[i_track-FIRST_TRACK_NUM].entry.addr.lba));
++ }
++}
++
++#endif /* HAVE_FREEBSD_CDROM */
++
++/*!
++ Return an array of strings giving possible CD devices.
++ */
++char **
++cdio_get_devices_freebsd (void)
++{
++#ifndef HAVE_FREEBSD_CDROM
++ return NULL;
++#else
++ char drive[40];
++ char **drives = NULL;
++ unsigned int num_drives=0;
++ bool exists=true;
++ char c;
++
++ /* Scan the system for CD-ROM drives.
++ */
++
++#ifdef USE_ETC_FSTAB
++
++ struct fstab *fs;
++ setfsent();
++
++ /* Check what's in /etc/fstab... */
++ while ( (fs = getfsent()) )
++ {
++ if (strncmp(fs->fs_spec, "/dev/sr", 7))
++ cdio_add_device_list(&drives, fs->fs_spec, &num_drives);
++ }
++
++#endif
++
++ /* Scan the system for CD-ROM drives.
++ Not always 100% reliable, so use the USE_MNTENT code above first.
++ */
++
++ /* Scan SCSI and CAM devices */
++ for ( c='0'; exists && c <='9'; c++ ) {
++ sprintf(drive, "/dev/cd%c%s", c, DEVICE_POSTFIX);
++ exists = cdio_is_cdrom(drive, NULL);
++ if ( exists ) {
++ cdio_add_device_list(&drives, drive, &num_drives);
++ }
++ }
++
++ /* Scan are ATAPI devices */
++ for ( c='0'; exists && c <='9'; c++ ) {
++ sprintf(drive, "/dev/acd%c%s", c, DEVICE_POSTFIX);
++ exists = cdio_is_cdrom(drive, NULL);
++ if ( exists ) {
++ cdio_add_device_list(&drives, drive, &num_drives);
++ }
++ }
++ cdio_add_device_list(&drives, NULL, &num_drives);
++ return drives;
++#endif /*HAVE_FREEBSD_CDROM*/
++}
++
++/*!
++ Return a string containing the default CD device if none is specified.
++ */
++char *
++cdio_get_default_device_freebsd()
++{
++#ifndef HAVE_FREEBSD_CDROM
++ return NULL;
++#else
++ char drive[40];
++ bool exists=true;
++ char c;
++
++ /* Scan the system for CD-ROM drives.
++ */
++
++#ifdef USE_ETC_FSTAB
++
++ struct fstab *fs;
++ setfsent();
++
++ /* Check what's in /etc/fstab... */
++ while ( (fs = getfsent()) )
++ {
++ if (strncmp(fs->fs_spec, "/dev/sr", 7))
++ return strdup(fs->fs_spec);
++ }
++
++#endif
++
++ /* Scan the system for CD-ROM drives.
++ Not always 100% reliable, so use the USE_MNTENT code above first.
++ */
++
++ /* Scan SCSI and CAM devices */
++ for ( c='0'; exists && c <='9'; c++ ) {
++ sprintf(drive, "/dev/cd%c%s", c, DEVICE_POSTFIX);
++ exists = cdio_is_cdrom(drive, NULL);
++ if ( exists ) {
++ return strdup(drive);
++ }
++ }
++
++ /* Scan are ATAPI devices */
++ for ( c='0'; exists && c <='9'; c++ ) {
++ sprintf(drive, "/dev/acd%c%s", c, DEVICE_POSTFIX);
++ exists = cdio_is_cdrom(drive, NULL);
++ if ( exists ) {
++ return strdup(drive);
++ }
++ }
++ return NULL;
++#endif /*HAVE_FREEBSD_CDROM*/
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_freebsd (const char *psz_source_name)
++{
++ return cdio_open_am_freebsd(psz_source_name, NULL);
++}
++
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_freebsd (const char *psz_orig_source_name,
++ const char *psz_access_mode)
++{
++
++#ifdef HAVE_FREEBSD_CDROM
++ CdIo *ret;
++ _img_private_t *_data;
++ char *psz_source_name;
++
++ cdio_funcs _funcs = {
++ .eject_media = _eject_media_freebsd,
++ .free = _free_freebsd,
++ .get_arg = _get_arg_freebsd,
++ .get_cdtext = get_cdtext_generic,
++ .get_default_device = cdio_get_default_device_freebsd,
++ .get_devices = cdio_get_devices_freebsd,
++ .get_discmode = get_discmode_generic,
++ .get_drive_cap = get_drive_cap_freebsd,
++ .get_first_track_num= get_first_track_num_generic,
++ .get_mcn = _get_mcn_freebsd,
++ .get_num_tracks = get_num_tracks_generic,
++ .get_track_format = _get_track_format_freebsd,
++ .get_track_green = _get_track_green_freebsd,
++ .get_track_lba = _get_track_lba_freebsd,
++ .get_track_msf = NULL,
++ .lseek = cdio_generic_lseek,
++ .read = cdio_generic_read,
++ .read_audio_sectors = _read_audio_sectors_freebsd,
++ .read_mode2_sector = _read_mode2_sector_freebsd,
++ .read_mode2_sectors = _read_mode2_sectors_freebsd,
++ .read_toc = read_toc_freebsd,
++ .run_scsi_mmc_cmd = run_scsi_cmd_freebsd,
++ .set_arg = _set_arg_freebsd,
++ .stat_size = _stat_size_freebsd
++ };
++
++ _data = _cdio_malloc (sizeof (_img_private_t));
++ _data->access_mode = str_to_access_mode_freebsd(psz_access_mode);
++ _data->gen.init = false;
++ _data->gen.fd = -1;
++ _data->gen.toc_init = false;
++ _data->gen.b_cdtext_init = false;
++ _data->gen.b_cdtext_error = false;
++
++ if (NULL == psz_orig_source_name) {
++ psz_source_name=cdio_get_default_device_freebsd();
++ if (NULL == psz_source_name) return NULL;
++ _data->device = psz_source_name;
++ _set_arg_freebsd(_data, "source", psz_source_name);
++ } else {
++ if (cdio_is_device_generic(psz_orig_source_name)) {
++ _set_arg_freebsd(_data, "source", psz_orig_source_name);
++ _data->device = strdup(psz_orig_source_name);
++ } else {
++ /* The below would be okay if all device drivers worked this way. */
++#if 0
++ cdio_info ("source %s is a not a device", psz_orig_source_name);
++#endif
++ return NULL;
++ }
++ }
++
++ ret = cdio_new ((void *)_data, &_funcs);
++ if (ret == NULL) return NULL;
++
++ if (cdio_generic_init(_data))
++ if ( _data->access_mode == _AM_IOCTL ) {
++ return ret;
++ } else {
++ if (init_freebsd_cam(_data))
++ return ret;
++ else {
++ cdio_generic_free (_data);
++ return NULL;
++ }
++ }
++ else {
++ cdio_generic_free (_data);
++ return NULL;
++ }
++
++#else
++ return NULL;
++#endif /* HAVE_FREEBSD_CDROM */
++
++}
++
++bool
++cdio_have_freebsd (void)
++{
++#ifdef HAVE_FREEBSD_CDROM
++ return true;
++#else
++ return false;
++#endif /* HAVE_FREEBSD_CDROM */
++}
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/FreeBSD/freebsd.h 3 Jan 2005 21:13:58 -0000 1.1.2.1
+@@ -0,0 +1,232 @@
++/*
++ $Id: freebsd.h,v 1.1.2.1 2005/01/03 21:13:58 mroi Exp $
++
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* This file contains FreeBSD-specific code and implements low-level
++ control of the CD drive. Culled initially I think from xine's or
++ mplayer's FreeBSD code with lots of modifications.
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include <cdio/sector.h>
++#include "cdio_assert.h"
++#include "cdio_private.h"
++
++/*!
++ For ioctl access /dev/acd0c is preferred over /dev/cd0c.
++ For cam access /dev/cd0c is preferred. DEFAULT_CDIO_DEVICE and
++ DEFAULT_FREEBSD_AM should be consistent.
++ */
++
++#ifndef DEFAULT_CDIO_DEVICE
++#define DEFAULT_CDIO_DEVICE "/dev/cd0c"
++#endif
++
++#ifndef DEFUALT_FREEBSD_AM
++#define DEFAULT_FREEBSD_AM _AM_CAM
++#endif
++
++#include <string.h>
++
++#ifdef HAVE_FREEBSD_CDROM
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <unistd.h>
++#include <fcntl.h>
++
++#ifdef HAVE_SYS_CDIO_H
++# include <sys/cdio.h>
++#endif
++
++#ifndef CDIOCREADAUDIO
++struct ioc_read_audio
++{
++ u_char address_format;
++ union msf_lba address;
++ int nframes;
++ u_char* buffer;
++};
++
++#define CDIOCREADAUDIO _IOWR('c',31,struct ioc_read_audio)
++#endif
++
++#include <sys/cdrio.h>
++
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/param.h> /* for __FreeBSD_version */
++
++#if __FreeBSD_version < 500000
++#define DEVICE_POSTFIX "c"
++#else
++#define DEVICE_POSTFIX ""
++#endif
++
++#define HAVE_FREEBSD_CAM
++#ifdef HAVE_FREEBSD_CAM
++#include <camlib.h>
++
++#include <cam/scsi/scsi_message.h>
++#include <cam/scsi/scsi_pass.h>
++#include <errno.h>
++#define ERRCODE(s) ((((s)[2]&0x0F)<<16)|((s)[12]<<8)|((s)[13]))
++#define EMEDIUMTYPE EINVAL
++#define ENOMEDIUM ENODEV
++#define CREAM_ON_ERRNO(s) do { \
++ switch ((s)[12]) \
++ { case 0x04: errno=EAGAIN; break; \
++ case 0x20: errno=ENODEV; break; \
++ case 0x21: if ((s)[13]==0) errno=ENOSPC; \
++ else errno=EINVAL; \
++ break; \
++ case 0x30: errno=EMEDIUMTYPE; break; \
++ case 0x3A: errno=ENOMEDIUM; break; \
++ } \
++} while(0)
++#endif /*HAVE_FREEBSD_CAM*/
++
++#include <cdio/util.h>
++
++#define TOTAL_TRACKS ( p_env->tochdr.ending_track \
++ - p_env->tochdr.starting_track + 1)
++#define FIRST_TRACK_NUM (p_env->tochdr.starting_track)
++
++typedef enum {
++ _AM_NONE,
++ _AM_IOCTL,
++ _AM_CAM
++} access_mode_t;
++
++typedef struct {
++ /* Things common to all drivers like this.
++ This must be first. */
++ generic_img_private_t gen;
++
++#ifdef HAVE_FREEBSD_CAM
++ char *device;
++ struct cam_device *cam;
++ union ccb ccb;
++#endif
++
++ access_mode_t access_mode;
++
++ bool b_ioctl_init;
++ bool b_cam_init;
++
++ /* Track information */
++ struct ioc_toc_header tochdr;
++
++ /* Entry info for each track. Add 1 for leadout. */
++ struct ioc_read_toc_single_entry tocent[CDIO_CD_MAX_TRACKS+1];
++
++} _img_private_t;
++
++bool cdio_is_cdrom_freebsd_ioctl(char *drive, char *mnttype);
++
++track_format_t get_track_format_freebsd_ioctl(const _img_private_t *env,
++ track_t i_track);
++bool get_track_green_freebsd_ioctl(const _img_private_t *env,
++ track_t i_track);
++
++int eject_media_freebsd_ioctl (_img_private_t *env);
++int eject_media_freebsd_cam (_img_private_t *env);
++
++void get_drive_cap_freebsd_cam (const _img_private_t *p_env,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap);
++
++char *get_mcn_freebsd_ioctl (const _img_private_t *p_env);
++
++void free_freebsd_cam (void *obj);
++
++/*!
++ Using the ioctl method, r nblocks of audio sectors from cd device
++ into data starting from lsn. Returns 0 if no error.
++ */
++int read_audio_sectors_freebsd_ioctl (_img_private_t *env, void *data,
++ lsn_t lsn, unsigned int nblocks);
++/*!
++ Using the CAM method, reads nblocks of mode2 sectors from
++ cd device using into data starting from lsn. Returns 0 if no
++ error.
++*/
++int read_mode2_sector_freebsd_cam (_img_private_t *env, void *data,
++ lsn_t lsn, bool b_form2);
++
++/*!
++ Using the ioctl method, reads nblocks of mode2 sectors from
++ cd device using into data starting from lsn. Returns 0 if no
++ error.
++*/
++int read_mode2_sector_freebsd_ioctl (_img_private_t *env, void *data,
++ lsn_t lsn, bool b_form2);
++
++/*!
++ Using the CAM method, reads nblocks of mode2 form2 sectors from
++ cd device using into data starting from lsn. Returns 0 if no
++ error.
++
++ Note: if you want form1 sectors, the caller has to pick out the
++ appropriate piece.
++*/
++int read_mode2_sectors_freebsd_cam (_img_private_t *env, void *buf,
++ lsn_t lsn, unsigned int nblocks);
++
++bool read_toc_freebsd_ioctl (_img_private_t *env);
++
++/*!
++ Run a SCSI MMC command.
++
++ p_user_data internal CD structure.
++ i_timeout time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ i_cdb Size of p_cdb
++ p_cdb CDB bytes.
++ e_direction direction the transfer is to go.
++ i_buf Size of buffer
++ p_buf Buffer for data, both sending and receiving
++
++ Return 0 if no error.
++ */
++int run_scsi_cmd_freebsd_cam( const void *p_user_data,
++ unsigned int i_timeout_ms,
++ unsigned int i_cdb,
++ const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf,
++ /*in/out*/ void *p_buf );
++
++/*!
++ Return the size of the CD in logical block address (LBA) units.
++ */
++uint32_t stat_size_freebsd_cam (_img_private_t *env);
++uint32_t stat_size_freebsd_ioctl (_img_private_t *env);
++
++bool init_freebsd_cam (_img_private_t *env);
++void free_freebsd_cam (void *user_data);
++
++#endif /*HAVE_FREEBSD_CDROM*/
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/FreeBSD/freebsd_cam.c 3 Jan 2005 21:13:58 -0000 1.1.2.1
+@@ -0,0 +1,346 @@
++/*
++ $Id: freebsd_cam.c,v 1.1.2.1 2005/01/03 21:13:58 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* This file contains FreeBSD-specific code and implements low-level
++ control of the CD drive via SCSI emulation.
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.1.2.1 2005/01/03 21:13:58 mroi Exp $";
++
++#ifdef HAVE_FREEBSD_CDROM
++
++#include "freebsd.h"
++#include <cdio/scsi_mmc.h>
++
++/* Default value in seconds we will wait for a command to
++ complete. */
++#define DEFAULT_TIMEOUT_MSECS 10000
++
++/*!
++ Run a SCSI MMC command.
++
++ p_user_data internal CD structure.
++ i_timeout_ms time in milliseconds we will wait for the command
++ to complete. If this value is -1, use the default
++ time-out value.
++ i_cdb Size of p_cdb
++ p_cdb CDB bytes.
++ e_direction direction the transfer is to go.
++ i_buf Size of buffer
++ p_buf Buffer for data, both sending and receiving
++
++ Return 0 if no error.
++ */
++int
++run_scsi_cmd_freebsd_cam( const void *p_user_data, unsigned int i_timeout_ms,
++ unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction,
++ unsigned int i_buf, /*in/out*/ void *p_buf )
++{
++ const _img_private_t *p_env = p_user_data;
++ int i_status;
++ int direction = CAM_DEV_QFRZDIS;
++ union ccb ccb;
++
++ if (!p_env || !p_env->cam) return -2;
++
++ memset(&ccb, 0, sizeof(ccb));
++
++ ccb.ccb_h.path_id = p_env->cam->path_id;
++ ccb.ccb_h.target_id = p_env->cam->target_id;
++ ccb.ccb_h.target_lun = p_env->cam->target_lun;
++ ccb.ccb_h.timeout = i_timeout_ms;
++
++ if (!i_cdb)
++ direction |= CAM_DIR_NONE;
++ else
++ direction |= (e_direction == SCSI_MMC_DATA_READ)?CAM_DIR_IN : CAM_DIR_OUT;
++ cam_fill_csio (&(ccb.csio), 1, NULL,
++ direction | CAM_DEV_QFRZDIS, MSG_SIMPLE_Q_TAG, p_buf, i_buf,
++ sizeof(ccb.csio.sense_data), 0, 30*1000);
++
++ memcpy(ccb.csio.cdb_io.cdb_bytes, p_cdb, i_cdb);
++
++ ccb.csio.cdb_len =
++ scsi_mmc_get_cmd_len(ccb.csio.cdb_io.cdb_bytes[0]);
++
++ if ((i_status = cam_send_ccb(p_env->cam, &ccb)) < 0)
++ {
++ cdio_warn ("transport failed: %d", i_status);
++ return -1;
++ }
++ if ((ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
++ {
++ return 0;
++ }
++ errno = EIO;
++ i_status = ERRCODE(((unsigned char *)&ccb.csio.sense_data));
++ if (i_status == 0)
++ i_status = -1;
++ else
++ CREAM_ON_ERRNO(((unsigned char *)&ccb.csio.sense_data));
++ cdio_warn ("transport failed: %d", i_status);
++ return i_status;
++}
++
++bool
++init_freebsd_cam (_img_private_t *p_env)
++{
++ char pass[100];
++
++ p_env->cam=NULL;
++ memset (&p_env->ccb, 0, sizeof(p_env->ccb));
++ p_env->ccb.ccb_h.func_code = XPT_GDEVLIST;
++
++ if (-1 == p_env->gen.fd)
++ p_env->gen.fd = open (p_env->device, O_RDONLY, 0);
++
++ if (p_env->gen.fd < 0)
++ {
++ cdio_warn ("open (%s): %s", p_env->device, strerror (errno));
++ return false;
++ }
++
++ if (ioctl (p_env->gen.fd, CAMGETPASSTHRU, &p_env->ccb) < 0)
++ {
++ cdio_warn ("open: %s", strerror (errno));
++ return false;
++ }
++ sprintf (pass,"/dev/%.15s%u",
++ p_env->ccb.cgdl.periph_name,
++ p_env->ccb.cgdl.unit_number);
++ p_env->cam = cam_open_pass (pass,O_RDWR,NULL);
++ if (!p_env->cam) return false;
++
++ p_env->gen.init = true;
++ p_env->b_cam_init = true;
++ return true;
++}
++
++void
++free_freebsd_cam (void *user_data)
++{
++ _img_private_t *p_env = user_data;
++
++ if (NULL == p_env) return;
++
++ if (p_env->gen.fd > 0)
++ close (p_env->gen.fd);
++ p_env->gen.fd = -1;
++
++ if(p_env->cam)
++ cam_close_device(p_env->cam);
++
++ free (p_env);
++}
++
++static int
++_set_bsize (_img_private_t *p_env, unsigned int bsize)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++
++ struct
++ {
++ uint8_t reserved1;
++ uint8_t medium;
++ uint8_t reserved2;
++ uint8_t block_desc_length;
++ uint8_t density;
++ uint8_t number_of_blocks_hi;
++ uint8_t number_of_blocks_med;
++ uint8_t number_of_blocks_lo;
++ uint8_t reserved3;
++ uint8_t block_length_hi;
++ uint8_t block_length_med;
++ uint8_t block_length_lo;
++ } mh;
++
++ memset (&mh, 0, sizeof (mh));
++ mh.block_desc_length = 0x08;
++ mh.block_length_hi = (bsize >> 16) & 0xff;
++ mh.block_length_med = (bsize >> 8) & 0xff;
++ mh.block_length_lo = (bsize >> 0) & 0xff;
++
++ memset (&cdb, 0, sizeof (cdb));
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SELECT_6);
++
++ cdb.field[1] = 1 << 4;
++ cdb.field[4] = 12;
++
++ return run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_WRITE,
++ sizeof(mh), &mh);
++}
++
++int
++read_mode2_sector_freebsd_cam (_img_private_t *p_env, void *data, lsn_t lsn,
++ bool b_form2)
++{
++ if ( b_form2 )
++ return read_mode2_sectors_freebsd_cam(p_env, data, lsn, 1);
++ else {
++ /* Need to pick out the data portion from a mode2 form2 frame */
++ char buf[M2RAW_SECTOR_SIZE] = { 0, };
++ int retval = read_mode2_sectors_freebsd_cam(p_env, buf, lsn, 1);
++ if ( retval ) return retval;
++ memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
++ return 0;
++ }
++}
++
++/*!
++ Reads nblocks of mode2 sectors from cd device into data starting
++ from lsn.
++ Returns 0 if no error.
++ */
++int
++read_mode2_sectors_freebsd_cam (_img_private_t *p_env, void *p_buf,
++ lsn_t lsn, unsigned int nblocks)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++
++ bool b_read_10 = false;
++
++ CDIO_MMC_SET_READ_LBA(cdb.field, lsn);
++
++ if (b_read_10) {
++ int retval;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_10);
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, nblocks);
++ if ((retval = _set_bsize (p_env, M2RAW_SECTOR_SIZE)))
++ return retval;
++
++ if ((retval = run_scsi_cmd_freebsd_cam (p_env, 0,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb,
++ SCSI_MMC_DATA_READ,
++ M2RAW_SECTOR_SIZE * nblocks,
++ p_buf)))
++ {
++ _set_bsize (p_env, CDIO_CD_FRAMESIZE);
++ return retval;
++ }
++
++ if ((retval = _set_bsize (p_env, CDIO_CD_FRAMESIZE)))
++ return retval;
++ } else
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_CD);
++ CDIO_MMC_SET_READ_LENGTH24(cdb.field, nblocks);
++ cdb.field[1] = 0; /* sector size mode2 */
++ cdb.field[9] = 0x58; /* 2336 mode2 */
++ return run_scsi_cmd_freebsd_cam (p_env, 0,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb,
++ SCSI_MMC_DATA_READ,
++ M2RAW_SECTOR_SIZE * nblocks, p_buf);
++
++ return 0;
++}
++
++/*!
++ Return the size of the CD in logical block address (LBA) units.
++ */
++uint32_t
++stat_size_freebsd_cam (_img_private_t *p_env)
++{
++ scsi_mmc_cdb_t cdb = {{0, }};
++ uint8_t buf[12] = { 0, };
++
++ uint32_t retval;
++ int i_status;
++
++ /* Operation code */
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC);
++
++ cdb.field[1] = 0; /* lba; msf: 0x2 */
++
++ /* Format */
++ cdb.field[2] = CDIO_MMC_READTOC_FMT_TOC;
++
++ CDIO_MMC_SET_START_TRACK(cdb.field, CDIO_CDROM_LEADOUT_TRACK);
++
++ CDIO_MMC_SET_READ_LENGTH16(cdb.field, sizeof(buf));
++
++ p_env->ccb.csio.data_ptr = buf;
++ p_env->ccb.csio.dxfer_len = sizeof (buf);
++
++ i_status = run_scsi_cmd_freebsd_cam(p_env, DEFAULT_TIMEOUT_MSECS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_READ,
++ sizeof(buf), buf);
++ if (0 != i_status)
++ return 0;
++
++ {
++ int i;
++
++ retval = 0;
++ for (i = 8; i < 12; i++)
++ {
++ retval <<= 8;
++ retval += buf[i];
++ }
++ }
++
++ return retval;
++}
++
++/*!
++ * Eject using SCSI MMC commands. Return 0 if successful.
++ */
++int
++eject_media_freebsd_cam (_img_private_t *p_env)
++{
++ int i_status;
++ scsi_mmc_cdb_t cdb = {{0, }};
++ uint8_t buf[1];
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL);
++
++ i_status = run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb, SCSI_MMC_DATA_WRITE, 0, &buf);
++ if (0 != i_status)
++ return i_status;
++
++ cdb.field[4] = 1;
++ i_status = run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
++ scsi_mmc_get_cmd_len(cdb.field[0]), &cdb,
++ SCSI_MMC_DATA_WRITE, 0, &buf);
++ if (0 != i_status)
++ return i_status;
++
++ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_START_STOP);
++ cdb.field[4] = 2; /* eject */
++
++ return run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
++ scsi_mmc_get_cmd_len(cdb.field[0]),
++ &cdb,
++ SCSI_MMC_DATA_WRITE, 0, &buf);
++}
++
++#endif /* HAVE_FREEBSD_CDROM */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c 3 Jan 2005 21:13:58 -0000 1.1.2.1
+@@ -0,0 +1,267 @@
++/*
++ $Id: freebsd_ioctl.c,v 1.1.2.1 2005/01/03 21:13:58 mroi Exp $
++
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* This file contains FreeBSD-specific code and implements low-level
++ control of the CD drive. Culled initially I think from xine's or
++ mplayer's FreeBSD code with lots of modifications.
++*/
++
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++static const char _rcsid[] = "$Id: freebsd_ioctl.c,v 1.1.2.1 2005/01/03 21:13:58 mroi Exp $";
++
++#ifdef HAVE_FREEBSD_CDROM
++
++#include "freebsd.h"
++
++/* Check a drive to see if it is a CD-ROM
++ Return 1 if a CD-ROM. 0 if it exists but isn't a CD-ROM drive
++ and -1 if no device exists .
++*/
++bool
++cdio_is_cdrom_freebsd_ioctl(char *drive, char *mnttype)
++{
++ bool is_cd=false;
++ int cdfd;
++ struct ioc_toc_header tochdr;
++
++ /* If it doesn't exist, return -1 */
++ if ( !cdio_is_device_quiet_generic(drive) ) {
++ return(false);
++ }
++
++ /* If it does exist, verify that it's an available CD-ROM */
++ cdfd = open(drive, (O_RDONLY|O_EXCL|O_NONBLOCK), 0);
++
++ /* Should we want to test the condition in more detail:
++ ENOENT is the error for /dev/xxxxx does not exist;
++ ENODEV means there's no drive present. */
++
++ if ( cdfd >= 0 ) {
++ if ( ioctl(cdfd, CDIOREADTOCHEADER, &tochdr) != -1 ) {
++ is_cd = true;
++ }
++ close(cdfd);
++ }
++ /* Even if we can't read it, it might be mounted */
++ else if ( mnttype && (strcmp(mnttype, "iso9660") == 0) ) {
++ is_cd = true;
++ }
++ return(is_cd);
++}
++
++/*!
++ Reads a single mode2 sector from cd device into data starting from lsn.
++ Returns 0 if no error.
++ */
++int
++read_audio_sectors_freebsd_ioctl (_img_private_t *_obj, void *data, lsn_t lsn,
++ unsigned int nblocks)
++{
++ unsigned char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++ struct ioc_read_audio cdda;
++
++ cdda.address.lba = lsn;
++ cdda.buffer = buf;
++ cdda.nframes = nblocks;
++ cdda.address_format = CDIO_CDROM_LBA;
++
++ /* read a frame */
++ if(ioctl(_obj->gen.fd, CDIOCREADAUDIO, &cdda) < 0) {
++ perror("CDIOCREADAUDIO");
++ return 1;
++ }
++ memcpy (data, buf, CDIO_CD_FRAMESIZE_RAW);
++
++ return 0;
++}
++
++/*!
++ Reads a single mode2 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++int
++read_mode2_sector_freebsd_ioctl (_img_private_t *env, void *data, lsn_t lsn,
++ bool b_form2)
++{
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++ int retval;
++
++ if ( !b_form2 )
++ return cdio_generic_read_form1_sector (env, buf, lsn);
++
++ if ( (retval = read_audio_sectors_freebsd_ioctl (env, buf, lsn, 1)) )
++ return retval;
++
++ memcpy (data, buf + CDIO_CD_XA_SYNC_HEADER, M2RAW_SECTOR_SIZE);
++
++ return 0;
++}
++
++/*!
++ Return the size of the CD in logical block address (LBA) units.
++ */
++uint32_t
++stat_size_freebsd_ioctl (_img_private_t *_obj)
++{
++ struct ioc_read_toc_single_entry tocent;
++ uint32_t size;
++
++ tocent.track = CDIO_CDROM_LEADOUT_TRACK;
++ tocent.address_format = CDIO_CDROM_LBA;
++ if (ioctl (_obj->gen.fd, CDIOREADTOCENTRY, &tocent) == -1)
++ {
++ perror ("ioctl(CDROMREADTOCENTRY)");
++ exit (EXIT_FAILURE);
++ }
++
++ size = tocent.entry.addr.lba;
++
++ return size;
++}
++
++/*!
++ Eject media. Return 1 if successful, 0 otherwise.
++ */
++int
++eject_media_freebsd_ioctl (_img_private_t *env)
++{
++ _img_private_t *_obj = env;
++ int ret=2;
++ int fd;
++
++ if ((fd = open(_obj->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
++ ret = 1;
++ if (ioctl(fd, CDIOCALLOW) == -1) {
++ cdio_warn("ioctl(fd, CDIOCALLOW) failed: %s\n", strerror(errno));
++ } else if (ioctl(fd, CDIOCEJECT) == -1) {
++ cdio_warn("ioctl(CDIOCEJECT) failed: %s\n", strerror(errno));
++ } else {
++ ret = 0;
++ }
++ close(fd);
++ }
++
++ return ret;
++}
++
++/*!
++ Return the media catalog number MCN.
++
++ Note: string is malloc'd so caller should free() then returned
++ string when done with it.
++
++ FIXME: This is just a guess.
++
++ */
++char *
++get_mcn_freebsd_ioctl (const _img_private_t *env) {
++
++ struct ioc_read_subchannel subchannel;
++ struct cd_sub_channel_info subchannel_info;
++
++ subchannel.address_format = CDIO_CDROM_MSF;
++ subchannel.data_format = CDIO_SUBCHANNEL_MEDIA_CATALOG;
++ subchannel.track = 0;
++ subchannel.data_len = sizeof(subchannel_info);
++ subchannel.data = &subchannel_info;
++
++ if(ioctl(env->gen.fd, CDIOCREADSUBCHANNEL, &subchannel) < 0) {
++ perror("CDIOCREADSUBCHANNEL");
++ return NULL;
++ }
++
++ /* Probably need a loop over tracks rather than give up if we
++ can't find in track 0.
++ */
++ if (subchannel_info.what.media_catalog.mc_valid)
++ return strdup(subchannel_info.what.media_catalog.mc_number);
++ else
++ return NULL;
++}
++
++/*!
++ Get format of track.
++
++ FIXME: We're just guessing this from the GNU/Linux code.
++
++*/
++track_format_t
++get_track_format_freebsd_ioctl(const _img_private_t *env, track_t i_track)
++{
++ struct ioc_read_subchannel subchannel;
++ struct cd_sub_channel_info subchannel_info;
++
++ subchannel.address_format = CDIO_CDROM_LBA;
++ subchannel.data_format = CDIO_SUBCHANNEL_CURRENT_POSITION;
++ subchannel.track = i_track;
++ subchannel.data_len = 1;
++ subchannel.data = &subchannel_info;
++
++ if(ioctl(env->gen.fd, CDIOCREADSUBCHANNEL, &subchannel) < 0) {
++ perror("CDIOCREADSUBCHANNEL");
++ return 1;
++ }
++
++ if (subchannel_info.what.position.control == 0x04) {
++ if (subchannel_info.what.position.data_format == 0x10)
++ return TRACK_FORMAT_CDI;
++ else if (subchannel_info.what.position.data_format == 0x20)
++ return TRACK_FORMAT_XA;
++ else
++ return TRACK_FORMAT_DATA;
++ } else
++ return TRACK_FORMAT_AUDIO;
++}
++
++/*!
++ Return true if we have XA data (green, mode2 form1) or
++ XA data (green, mode2 form2). That is track begins:
++ sync - header - subheader
++ 12 4 - 8
++
++ FIXME: there's gotta be a better design for this and get_track_format?
++*/
++bool
++get_track_green_freebsd_ioctl(const _img_private_t *env, track_t i_track)
++{
++ struct ioc_read_subchannel subchannel;
++ struct cd_sub_channel_info subchannel_info;
++
++ subchannel.address_format = CDIO_CDROM_LBA;
++ subchannel.data_format = CDIO_SUBCHANNEL_CURRENT_POSITION;
++ subchannel.track = i_track;
++ subchannel.data_len = 1;
++ subchannel.data = &subchannel_info;
++
++ if(ioctl(env->gen.fd, CDIOCREADSUBCHANNEL, &subchannel) < 0) {
++ perror("CDIOCREADSUBCHANNEL");
++ return 1;
++ }
++
++ /* FIXME: Dunno if this is the right way, but it's what
++ I was using in cdinfo for a while.
++ */
++ return (subchannel_info.what.position.control & 2) != 0;
++}
++
++#endif /* HAVE_FREEBSD_CDROM */
+--- ./src/input/vcd/libcdio/cdio/Makefile.am 13 Oct 2003 17:51:38 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/Makefile.am 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,3 +1,19 @@
+ include $(top_srcdir)/misc/Makefile.common
+
+-noinst_HEADERS = cdio.h cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h
++noinst_HEADERS = \
++ bytesex.h \
++ bytesex_asm.h \
++ cdio.h \
++ cdtext.h \
++ cdtext.h \
++ cd_types.h \
++ ds.h \
++ dvd.h \
++ iso9660.h \
++ logging.h \
++ sector.h \
++ scsi_mmc.h \
++ types.h \
++ util.h \
++ version.h \
++ xa.h
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/bytesex.h 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -0,0 +1,196 @@
++/*
++ $Id: bytesex.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifndef __CDIO_BYTESEX_H__
++#define __CDIO_BYTESEX_H__
++
++#include <cdio/types.h>
++#include <cdio/bytesex_asm.h>
++#include <cdio/logging.h>
++
++/* generic byteswap routines */
++
++#define UINT16_SWAP_LE_BE_C(val) ((uint16_t) ( \
++ (((uint16_t) (val) & (uint16_t) 0x00ffU) << 8) | \
++ (((uint16_t) (val) & (uint16_t) 0xff00U) >> 8)))
++
++#define UINT32_SWAP_LE_BE_C(val) ((uint32_t) ( \
++ (((uint32_t) (val) & (uint32_t) 0x000000ffU) << 24) | \
++ (((uint32_t) (val) & (uint32_t) 0x0000ff00U) << 8) | \
++ (((uint32_t) (val) & (uint32_t) 0x00ff0000U) >> 8) | \
++ (((uint32_t) (val) & (uint32_t) 0xff000000U) >> 24)))
++
++#define UINT64_SWAP_LE_BE_C(val) ((uint64_t) ( \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000000000ff)) << 56) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000000000ff00)) << 40) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000000000ff0000)) << 24) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x00000000ff000000)) << 8) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x000000ff00000000)) >> 8) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x0000ff0000000000)) >> 24) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0x00ff000000000000)) >> 40) | \
++ (((uint64_t) (val) & (uint64_t) UINT64_C(0xff00000000000000)) >> 56)))
++
++#ifndef UINT16_SWAP_LE_BE
++# define UINT16_SWAP_LE_BE UINT16_SWAP_LE_BE_C
++#endif
++
++#ifndef UINT32_SWAP_LE_BE
++# define UINT32_SWAP_LE_BE UINT32_SWAP_LE_BE_C
++#endif
++
++#ifndef UINT64_SWAP_LE_BE
++# define UINT64_SWAP_LE_BE UINT64_SWAP_LE_BE_C
++#endif
++
++inline static
++uint16_t uint16_swap_le_be (const uint16_t val)
++{
++ return UINT16_SWAP_LE_BE (val);
++}
++
++inline static
++uint32_t uint32_swap_le_be (const uint32_t val)
++{
++ return UINT32_SWAP_LE_BE (val);
++}
++
++inline static
++uint64_t uint64_swap_le_be (const uint64_t val)
++{
++ return UINT64_SWAP_LE_BE (val);
++}
++
++# define UINT8_TO_BE(val) ((uint8_t) (val))
++# define UINT8_TO_LE(val) ((uint8_t) (val))
++#ifdef WORDS_BIGENDIAN
++# define UINT16_TO_BE(val) ((uint16_t) (val))
++# define UINT16_TO_LE(val) ((uint16_t) UINT16_SWAP_LE_BE(val))
++
++# define UINT32_TO_BE(val) ((uint32_t) (val))
++# define UINT32_TO_LE(val) ((uint32_t) UINT32_SWAP_LE_BE(val))
++
++# define UINT64_TO_BE(val) ((uint64_t) (val))
++# define UINT64_TO_LE(val) ((uint64_t) UINT64_SWAP_LE_BE(val))
++#else
++# define UINT16_TO_BE(val) ((uint16_t) UINT16_SWAP_LE_BE(val))
++# define UINT16_TO_LE(val) ((uint16_t) (val))
++
++# define UINT32_TO_BE(val) ((uint32_t) UINT32_SWAP_LE_BE(val))
++# define UINT32_TO_LE(val) ((uint32_t) (val))
++
++# define UINT64_TO_BE(val) ((uint64_t) UINT64_SWAP_LE_BE(val))
++# define UINT64_TO_LE(val) ((uint64_t) (val))
++#endif
++
++/* symmetric conversions */
++#define UINT8_FROM_BE(val) (UINT8_TO_BE (val))
++#define UINT8_FROM_LE(val) (UINT8_TO_LE (val))
++#define UINT16_FROM_BE(val) (UINT16_TO_BE (val))
++#define UINT16_FROM_LE(val) (UINT16_TO_LE (val))
++#define UINT32_FROM_BE(val) (UINT32_TO_BE (val))
++#define UINT32_FROM_LE(val) (UINT32_TO_LE (val))
++#define UINT64_FROM_BE(val) (UINT64_TO_BE (val))
++#define UINT64_FROM_LE(val) (UINT64_TO_LE (val))
++
++/* converter function template */
++#define CVT_TO_FUNC(bits) \
++ static inline uint ## bits ## _t \
++ uint ## bits ## _to_be (uint ## bits ## _t val) \
++ { return UINT ## bits ## _TO_BE (val); } \
++ static inline uint ## bits ## _t \
++ uint ## bits ## _to_le (uint ## bits ## _t val) \
++ { return UINT ## bits ## _TO_LE (val); } \
++
++CVT_TO_FUNC(8)
++CVT_TO_FUNC(16)
++CVT_TO_FUNC(32)
++CVT_TO_FUNC(64)
++
++#undef CVT_TO_FUNC
++
++#define uint8_from_be(val) (uint8_to_be (val))
++#define uint8_from_le(val) (uint8_to_le (val))
++#define uint16_from_be(val) (uint16_to_be (val))
++#define uint16_from_le(val) (uint16_to_le (val))
++#define uint32_from_be(val) (uint32_to_be (val))
++#define uint32_from_le(val) (uint32_to_le (val))
++#define uint64_from_be(val) (uint64_to_be (val))
++#define uint64_from_le(val) (uint64_to_le (val))
++
++/* ISO9660 related stuff */
++
++#define to_711(i) uint8_to_le(i)
++#define from_711(i) uint8_from_le(i)
++
++#define to_721(i) uint16_to_le(i)
++#define from_721(i) uint16_from_le(i)
++
++#define to_721(i) uint16_to_le(i)
++#define from_721(i) uint16_from_le(i)
++
++#define to_722(i) uint16_to_be(i)
++#define from_722(i) uint16_from_be(i)
++
++static inline uint32_t
++to_723(uint16_t i)
++{
++ return uint32_swap_le_be(i) | i;
++}
++
++static inline uint16_t
++from_723 (uint32_t p)
++{
++ if (uint32_swap_le_be (p) != p)
++ cdio_warn ("from_723: broken byte order");
++
++ return (0xFFFF & p);
++}
++
++#define to_731(i) uint32_to_le(i)
++#define from_731(i) uint32_from_le(i)
++
++#define to_732(i) uint32_to_be(i)
++#define from_732(i) uint32_from_be(i)
++
++static inline uint64_t
++to_733(uint32_t i)
++{
++ return uint64_swap_le_be(i) | i;
++}
++
++static inline uint32_t
++from_733 (uint64_t p)
++{
++ if (uint64_swap_le_be (p) != p)
++ cdio_warn ("from_733: broken byte order");
++
++ return (UINT32_C(0xFFFFFFFF) & p);
++}
++
++#endif /* __CDIO_BYTESEX_H__ */
++
++
++/*
++ * Local variables:
++ * c-file-style: "gnu"
++ * tab-width: 8
++ * indent-tabs-mode: nil
++ * End:
++ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/bytesex_asm.h 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -0,0 +1,123 @@
++/*
++ $Id: bytesex_asm.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2001 Sven Ottemann <ac-logic@freenet.de>
++ 2001, 2004 Herbert Valerio Riedel <hvr@gnu.org>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifndef __CDIO_BYTESEX_ASM_H__
++#define __CDIO_BYTESEX_ASM_H__
++#if !defined(DISABLE_ASM_OPTIMIZE)
++
++#include <cdio/types.h>
++
++#if defined(__powerpc__) && defined(__GNUC__)
++
++inline static
++uint32_t uint32_swap_le_be_asm(const uint32_t a)
++{
++ uint32_t b;
++
++ __asm__ ("lwbrx %0,0,%1"
++ :"=r"(b)
++ :"r"(&a), "m"(a));
++
++ return b;
++}
++
++inline static
++uint16_t uint16_swap_le_be_asm(const uint16_t a)
++{
++ uint32_t b;
++
++ __asm__ ("lhbrx %0,0,%1"
++ :"=r"(b)
++ :"r"(&a), "m"(a));
++
++ return b;
++}
++
++#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
++#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
++
++#elif defined(__mc68000__) && defined(__STORMGCC__)
++
++inline static
++uint32_t uint32_swap_le_be_asm(uint32_t a __asm__("d0"))
++{
++ /* __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); */
++
++ __asm__("move.l %1,d0;rol.w #8,d0;swap d0;rol.w #8,d0;move.l d0,%0"
++ :"=r"(a)
++ :"r"(a));
++
++ return(a);
++}
++
++inline static
++uint16_t uint16_swap_le_be_asm(uint16_t a __asm__("d0"))
++{
++ __asm__("move.l %1,d0;rol.w #8,d0;move.l d0,%0"
++ :"=r"(a)
++ :"r"(a));
++
++ return(a);
++}
++
++#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
++#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
++
++#elif 0 && defined(__i386__) && defined(__GNUC__)
++
++inline static
++uint32_t uint32_swap_le_be_asm(uint32_t a)
++{
++ __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */
++ "rorl $16,%0\n\t" /* swap words */
++ "xchgb %b0,%h0" /* swap higher bytes */
++ :"=q" (a)
++ : "0" (a));
++
++ return(a);
++}
++
++inline static
++uint16_t uint16_swap_le_be_asm(uint16_t a)
++{
++ __asm__("xchgb %b0,%h0" /* swap bytes */
++ : "=q" (a)
++ : "0" (a));
++
++ return(a);
++}
++
++#define UINT16_SWAP_LE_BE uint16_swap_le_be_asm
++#define UINT32_SWAP_LE_BE uint32_swap_le_be_asm
++
++#endif
++
++#endif /* !defined(DISABLE_ASM_OPTIMIZE) */
++#endif /* __CDIO_BYTESEX_ASM_H__ */
++
++
++/*
++ * Local variables:
++ * c-file-style: "gnu"
++ * tab-width: 8
++ * indent-tabs-mode: nil
++ * End:
++ */
+--- ./src/input/vcd/libcdio/cdio/cd_types.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/cd_types.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: cd_types.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: cd_types.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
+@@ -67,6 +67,15 @@
+ */
+ #define CDIO_FS_3DO 10
+
++/**
++ Microsoft X-BOX CD.
++ */
++#define CDIO_FS_XISO 11
++#define CDIO_FS_UDFX 12
++#define CDIO_FS_UDF 13
++#define CDIO_FS_ISO_UDF 14
++
++
+ #define CDIO_FS_MASK 15 /**< Note: this should be 2**n-1 and
+ and greater than the highest
+ CDIO_FS number above */
+@@ -82,20 +91,21 @@
+ * higher-level than the fs-type information above and may be determined
+ * based of the fs type information.
+ */
+-#define CDIO_FS_ANAL_XA 16 /**< eXtended Architecture format */
+-#define CDIO_FS_ANAL_MULTISESSION 32 /**< CD has multisesion */
+-#define CDIO_FS_ANAL_PHOTO_CD 64 /**< Is a Kodak Photo CD */
+-#define CDIO_FS_ANAL_HIDDEN_TRACK 128 /**< Hidden track at the
++#define CDIO_FS_ANAL_XA 0x0010 /**< eXtended Architecture format */
++#define CDIO_FS_ANAL_MULTISESSION 0x0020 /**< CD has multisesion */
++#define CDIO_FS_ANAL_PHOTO_CD 0x0040 /**< Is a Kodak Photo CD */
++#define CDIO_FS_ANAL_HIDDEN_TRACK 0x0080 /**< Hidden track at the
+ beginning of the CD */
+-#define CDIO_FS_ANAL_CDTV 256
+-#define CDIO_FS_ANAL_BOOTABLE 512 /**< CD is bootable */
+-#define CDIO_FS_ANAL_VIDEOCD 1024 /**< VCD 1.1 */
+-#define CDIO_FS_ANAL_ROCKRIDGE 2048 /**< Has Rock Ridge Extensions to
++#define CDIO_FS_ANAL_CDTV 0x0100
++#define CDIO_FS_ANAL_BOOTABLE 0x0200 /**< CD is bootable */
++#define CDIO_FS_ANAL_VIDEOCD 0x0400 /**< VCD 1.1 */
++#define CDIO_FS_ANAL_ROCKRIDGE 0x0800 /**< Has Rock Ridge Extensions to
+ ISO 9660 */
+-#define CDIO_FS_ANAL_JOLIET 4096 /**< Microsoft Joliet extensions
++#define CDIO_FS_ANAL_JOLIET 0x1000 /**< Microsoft Joliet extensions
+ to ISO 9660 */
+-#define CDIO_FS_ANAL_SVCD 8192 /**< Super VCD or Choiji Video CD */
+-#define CDIO_FS_ANAL_CVD 16384 /**< Choiji Video CD */
++#define CDIO_FS_ANAL_SVCD 0x2000 /**< Super VCD or Choiji Video CD */
++#define CDIO_FS_ANAL_CVD 0x4000 /**< Choiji Video CD */
++#define CDIO_FS_ANAL_XISO 0x8000 /**< XBOX CD */
+
+ /**
+ * Pattern which can be used by cdio_get_devices to specify matching
+@@ -117,6 +127,8 @@
+ char iso_label[33]; /**< This is 32 + 1 for null byte at the end in
+ formatting the string */
+ unsigned int isofs_size;
++ uint8_t UDFVerMinor; /**< For UDF filesystems only */
++ uint8_t UDFVerMajor; /**< For UDF filesystems only */
+ } cdio_iso_analysis_t;
+
+ /**
+--- ./src/input/vcd/libcdio/cdio/cdio.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/cdio.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /* -*- c -*-
+- $Id: cdio.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: cdio.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -30,7 +30,7 @@
+ /** Application Interface or Protocol version number. If the public
+ * interface changes, we increase this number.
+ */
+-#define CDIO_API_VERSION 1
++#define CDIO_API_VERSION 2
+
+ #include <cdio/version.h>
+
+@@ -44,26 +44,43 @@
+ #include <cdio/types.h>
+ #include <cdio/sector.h>
+
+-/* Flags specifying the category of device to open or is opened. */
++/**! Flags specifying the category of device to open or is opened. */
+
+ #define CDIO_SRC_IS_DISK_IMAGE_MASK 0x0001 /**< Read source is a CD image. */
+ #define CDIO_SRC_IS_DEVICE_MASK 0x0002 /**< Read source is a CD device. */
+-#define CDIO_SRC_IS_SCSI_MASK 0x0004
++#define CDIO_SRC_IS_SCSI_MASK 0x0004 /**< Read source SCSI device. */
+ #define CDIO_SRC_IS_NATIVE_MASK 0x0008
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+
+- /** This is an opaque structure. */
++/*! Size of fields returned by an INQUIRY command */
++#define CDIO_MMC_HW_VENDOR_LEN 8 /**< length of vendor field */
++#define CDIO_MMC_HW_MODEL_LEN 16 /**< length of model field */
++#define CDIO_MMC_HW_REVISION_LEN 4 /**< length of revision field */
++
++ /*! \brief Structure to return CD vendor, model, and revision-level
++ strings obtained via the INQUIRY command */
++ typedef struct cdio_hwinfo
++ {
++ char psz_vendor [CDIO_MMC_HW_VENDOR_LEN+1];
++ char psz_model [CDIO_MMC_HW_MODEL_LEN+1];
++ char psz_revision[CDIO_MMC_HW_REVISION_LEN+1];
++ } cdio_hwinfo_t;
++
++ /** This is an opaque structure for the CD object. */
+ typedef struct _CdIo CdIo;
+
++ /** This is an opaque structure for the CD-Text object. */
++ typedef struct cdtext cdtext_t;
++
+ /** The driver_id_t enumerations may be used to tag a specific driver
+ * that is opened or is desired to be opened. Note that this is
+ * different than what is available on a given host.
+ *
+ * Order is a little significant since the order is used in scans.
+- * We have to start with UNKNOWN and devices should come before
++ * We have to start with DRIVER_UNKNOWN and devices should come before
+ * disk-image readers. By putting something towards the top (a lower
+ * enumeration number), in an iterative scan we prefer that to
+ * something with a higher enumeration number.
+@@ -72,20 +89,33 @@
+ *
+ */
+ typedef enum {
+- DRIVER_UNKNOWN,
++ DRIVER_UNKNOWN, /**< Used as input when we don't care what kind
++ of driver to use. */
+ DRIVER_BSDI, /**< BSDI driver */
+- DRIVER_FREEBSD, /**< FreeBSD driver */
++ DRIVER_FREEBSD, /**< FreeBSD driver - includes CAM and ioctl access */
+ DRIVER_LINUX, /**< GNU/Linux Driver */
+ DRIVER_SOLARIS, /**< Sun Solaris Driver */
+ DRIVER_OSX, /**< Apple OSX Driver */
+- DRIVER_WIN32, /**< Microsoft Windows Driver */
+- DRIVER_BINCUE, /**< BIN/CUE format CD image. This is listed before NRG,
+- to make the code prefer BINCUE over NRG when both
+- exist. */
++ DRIVER_WIN32, /**< Microsoft Windows Driver. Includes ASPI and
++ ioctl acces. */
++ DRIVER_CDRDAO, /**< cdrdao format CD image. This is listed
++ before BIN/CUE, to make the code prefer cdrdao
++ over BIN/CUE when both exist. */
++ DRIVER_BINCUE, /**< CDRWIN BIN/CUE format CD image. This is
++ listed before NRG, to make the code prefer
++ BIN/CUE over NRG when both exist. */
+ DRIVER_NRG, /**< Nero NRG format CD image. */
+ DRIVER_DEVICE /**< Is really a set of the above; should come last */
+ } driver_id_t;
+
++ /** There will generally be only one hardware for a given
++ build/platform from the list above. You can use the variable
++ below to determine which you've got. If the build doesn't make an
++ hardware driver, then the value will be DRIVER_UNKNOWN.
++ */
++ extern const driver_id_t cdio_os_driver;
++
++
+ /** Make sure what's listed for CDIO_MIN_DRIVER is the last
+ enumeration in driver_id_t. Since we have a bogus (but useful) 0th
+ entry above we don't have to add one.
+@@ -106,51 +136,77 @@
+ TRACK_FORMAT_ERROR /**< Dunno what is, or some other error. */
+ } track_format_t;
+
++ extern const char *discmode2str[];
++
+ /*! Printable tags for track_format_t enumeration. */
+ extern const char *track_format2str[6];
+
+ /*!
+ Eject media in CD drive if there is a routine to do so.
+- Return 0 if success and 1 for failure, and 2 if no routine.
+- If the CD is ejected *obj is freed and obj set to NULL.
++
++ @param p_cdio the CD object to be acted upon.
++ @return 0 if success and 1 for failure, and 2 if no routine.
++ If the CD is ejected *p_cdio is freed and p_cdio set to NULL.
+ */
+- int cdio_eject_media (CdIo **obj);
++ int cdio_eject_media (CdIo **p_cdio);
+
+ /*!
+- Free any resources associated with obj.
++ Free any resources associated with p_cdio. Call this when done using p_cdio
++ and using CD reading/control operations.
++
++ @param p_cdio the CD object to eliminated.
+ */
+- void cdio_destroy (CdIo *obj);
++ void cdio_destroy (CdIo *p_cdio);
+
+ /*!
+ Free device list returned by cdio_get_devices or
+ cdio_get_devices_with_cap.
++
++ @param device_list list returned by cdio_get_devices or
++ cdio_get_devices_with_cap
++
++ @see cdio_get_devices, cdio_get_devices_with_cap
++
+ */
+ void cdio_free_device_list (char * device_list[]);
+
+ /*!
+- Return the value associatied with key. NULL is returned if obj is NULL
++ Get the value associatied with key.
++
++ @param p_cdio the CD object queried
++ @param key the key to retrieve
++ @return the value associatd with "key" or NULL if p_cdio is NULL
+ or "key" does not exist.
+ */
+- const char * cdio_get_arg (const CdIo *obj, const char key[]);
++ const char * cdio_get_arg (const CdIo *p_cdio, const char key[]);
++
++ /*!
++ Get CD-Text information for a CdIo object.
++
++ @param p_cdio the CD object that may contain CD-Text information.
++ @param i_track track for which we are requesting CD-Text information.
++ @return the CD-Text object or NULL if obj is NULL
++ or CD-Text information does not exist.
++
++ If i_track is 0 or CDIO_CDROM_LEADOUT_TRACK the track returned
++ is the information assocated with the CD.
++ */
++ const cdtext_t *cdio_get_cdtext (CdIo *p_cdio, track_t i_track);
+
+ /*!
+- Return an array of device names in search_devices that have at
+- least the capabilities listed by cap. If search_devices is NULL,
+- then we'll search all possible CD drives.
++ Get the default CD device.
++ if p_cdio is NULL (we haven't initialized a specific device driver),
++ then find a suitable one and return the default device for that.
+
+- If "any" is set false then every capability listed in the extended
+- portion of capabilities (i.e. not the basic filesystem) must be
+- satisified. If "any" is set true, then if any of the capabilities
+- matches, we call that a success.
+-
+- To find a CD-drive of any type, use the mask CDIO_FS_MATCH_ALL.
+-
+- NULL is returned if we couldn't get a default device.
+- It is also possible to return a non NULL but after dereferencing the
+- the value is NULL. This also means nothing was found.
++ @param p_cdio the CD object queried
++ @return a string containing the default CD device or NULL is
++ if we couldn't get a default device.
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+- char ** cdio_get_devices_with_cap (char* search_devices[],
+- cdio_fs_anal_t capabilities, bool any);
++ char * cdio_get_default_device (const CdIo *p_cdio);
+
+ /*! Return an array of device names. If you want a specific
+ devices for a driver, give that device. If you want hardware
+@@ -158,49 +214,153 @@
+ image drivers and hardware drivers give DRIVER_UNKNOWN.
+
+ NULL is returned if we couldn't return a list of devices.
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+- char ** cdio_get_devices (driver_id_t driver);
++ char ** cdio_get_devices (driver_id_t driver_id);
+
+ /*!
+- Return a string containing the default CD device.
+- if obj is NULL (we haven't initialized a specific device driver),
+- then find a suitable one and return the default device for that.
++ Get an array of device names in search_devices that have at least
++ the capabilities listed by the capabities parameter. If
++ search_devices is NULL, then we'll search all possible CD drives.
+
+- NULL is returned if we couldn't get a default device.
++ If "b_any" is set false then every capability listed in the
++ extended portion of capabilities (i.e. not the basic filesystem)
++ must be satisified. If "any" is set true, then if any of the
++ capabilities matches, we call that a success.
++
++ To find a CD-drive of any type, use the mask CDIO_FS_MATCH_ALL.
++
++ @return the array of device names or NULL if we couldn't get a
++ default device. It is also possible to return a non NULL but
++ after dereferencing the the value is NULL. This also means nothing
++ was found.
++ */
++ char ** cdio_get_devices_with_cap (char* ppsz_search_devices[],
++ cdio_fs_anal_t capabilities, bool b_any);
++
++ /*!
++ Like cdio_get_devices_with_cap but we return the driver we found
++ as well. This is because often one wants to search for kind of drive
++ and then *open* it afterwards. Giving the driver back facilitates this,
++ and speeds things up for libcdio as well.
++ */
++ char ** cdio_get_devices_with_cap_ret (/*out*/ char* ppsz_search_devices[],
++ cdio_fs_anal_t capabilities,
++ bool b_any,
++ /*out*/ driver_id_t *p_driver_id);
++
++ /*! Like cdio_get_devices, but we may change the p_driver_id if we
++ were given DRIVER_DEVICE or DRIVER_UNKNOWN. This is because
++ often one wants to get a drive name and then *open* it
++ afterwards. Giving the driver back facilitates this, and speeds
++ things up for libcdio as well.
++ */
++
++ char ** cdio_get_devices_ret (/*in/out*/ driver_id_t *p_driver_id);
++
++ /*!
++ Get disc mode - the kind of CD (CD-DA, CD-ROM mode 1, CD-MIXED, etc.
++ that we've got. The notion of "CD" is extended a little to include
++ DVD's.
+ */
+- char * cdio_get_default_device (const CdIo *obj);
++ discmode_t cdio_get_discmode (CdIo *p_cdio);
+
+ /*!
+- Return the media catalog number (MCN) from the CD or NULL if there
+- is none or we don't have the ability to get it.
++ Get the what kind of device we've got.
+
+- Note: string is malloc'd so caller has to free() the returned
+- string when done with it.
++ @param p_cdio the CD object queried
++ @param p_read_cap pointer to return read capabilities
++ @param p_write_cap pointer to return write capabilities
++ @param p_misc_cap pointer to return miscellaneous other capabilities
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
++ */
++ void cdio_get_drive_cap (const CdIo *p_cdio,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap);
++
++ /*!
++ Get the drive capabilities for a specified device.
++
++ @return a list of device capabilities.
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
++ */
++ void cdio_get_drive_cap_dev (const char *device,
++ cdio_drive_read_cap_t *p_read_cap,
++ cdio_drive_write_cap_t *p_write_cap,
++ cdio_drive_misc_cap_t *p_misc_cap);
++
++ /*!
++ Get a string containing the name of the driver in use.
++
++ @return a string with driver name or NULL if CdIo is NULL (we
++ haven't initialized a specific device.
+ */
+- char *cdio_get_mcn (const CdIo *obj);
++ const char * cdio_get_driver_name (const CdIo *p_cdio);
+
+ /*!
+- Return a string containing the name of the driver in use.
++ Get the driver id.
+ if CdIo is NULL (we haven't initialized a specific device driver),
+- then return NULL.
++ then return DRIVER_UNKNOWN.
++
++ @return the driver id..
+ */
+- const char * cdio_get_driver_name (const CdIo *obj);
++ driver_id_t cdio_get_driver_id (const CdIo *p_cdio);
+
+ /*!
+- Return the number of the first track.
+- CDIO_INVALID_TRACK is returned on error.
++ Get the number of the first track.
++
++ @return the track number or CDIO_INVALID_TRACK
++ on error.
+ */
+- track_t cdio_get_first_track_num(const CdIo *obj);
++ track_t cdio_get_first_track_num(const CdIo *p_cdio);
+
++ /*!
++ Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
++ False is returned if we had an error getting the information.
++ */
++ bool cdio_get_hwinfo ( const CdIo *p_cdio,
++ /* out*/ cdio_hwinfo_t *p_hw_info );
++
++
++ /*!
++ Return the Joliet level recognized for p_cdio.
++ */
++ uint8_t cdio_get_joliet_level(const CdIo *p_cdio);
++
++ /*!
++ Get the media catalog number (MCN) from the CD.
++
++ @return the media catalog number r NULL if there is none or we
++ don't have the ability to get it.
++
++ Note: string is malloc'd so caller has to free() the returned
++ string when done with it.
++
++ */
++ char * cdio_get_mcn (const CdIo *p_cdio);
++
+ /*!
+- Return a string containing the default CD device if none is specified.
++ Get the number of tracks on the CD.
++
++ @return the number of tracks, or CDIO_INVALID_TRACK if there is
++ an error.
+ */
+- track_t cdio_get_num_tracks (const CdIo *obj);
++ track_t cdio_get_num_tracks (const CdIo *p_cdio);
+
+ /*!
+ Get the format (audio, mode2, mode1) of track.
+ */
+- track_format_t cdio_get_track_format(const CdIo *obj, track_t track_num);
++ track_format_t cdio_get_track_format(const CdIo *p_cdio, track_t i_track);
+
+ /*!
+ Return true if we have XA data (green, mode2 form1) or
+@@ -210,110 +370,178 @@
+
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+- bool cdio_get_track_green(const CdIo *obj, track_t track_num);
++ bool cdio_get_track_green(const CdIo *p_cdio, track_t i_track);
+
+ /*!
+- Return the starting LBA for track number
+- track_num in obj. Tracks numbers start at 1.
++ Get the starting LBA for track number
++ i_track in p_cdio. Track numbers usually start at something
++ greater than 0, usually 1.
++
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
+- CDIO_INVALID_LBA is returned on error.
++ using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
++
++ @param p_cdio object to get information from
++ @param i_track the track number we want the LSN for
++ @return the starting LBA or CDIO_INVALID_LBA on error.
+ */
+- lba_t cdio_get_track_lba(const CdIo *obj, track_t track_num);
++ lba_t cdio_get_track_lba(const CdIo *p_cdio, track_t i_track);
+
+ /*!
+- Return the starting LSN for track number
+- track_num in obj. Tracks numbers start at 1.
++ Return the starting MSF (minutes/secs/frames) for track number
++ i_track in p_cdio. Track numbers usually start at something
++ greater than 0, usually 1.
++
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
+- CDIO_INVALID_LBA is returned on error.
++ using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
++
++ @param p_cdio object to get information from
++ @param i_track the track number we want the LSN for
++ @return the starting LSN or CDIO_INVALID_LSN on error.
+ */
+- lsn_t cdio_get_track_lsn(const CdIo *obj, track_t track_num);
++ lsn_t cdio_get_track_lsn(const CdIo *p_cdio, track_t i_track);
+
+ /*!
+ Return the starting MSF (minutes/secs/frames) for track number
+- track_num in obj. Track numbers start at 1.
++ i_track in p_cdio. Track numbers usually start at something
++ greater than 0, usually 1.
++
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
+- False is returned if there is no track entry.
++ using i_track CDIO_CDROM_LEADOUT_TRACK or the total tracks+1.
++
++ @return true if things worked or false if there is no track entry.
+ */
+- bool cdio_get_track_msf(const CdIo *obj, track_t track_num,
++ bool cdio_get_track_msf(const CdIo *p_cdio, track_t i_track,
+ /*out*/ msf_t *msf);
+
+ /*!
+- Return the number of sectors between this track an the next. This
++ Get the number of sectors between this track an the next. This
+ includes any pregap sectors before the start of the next track.
+- Tracks start at 1.
+- 0 is returned if there is an error.
++ Track numbers usually start at something
++ greater than 0, usually 1.
++
++ @return the number of sectors or 0 if there is an error.
+ */
+- unsigned int cdio_get_track_sec_count(const CdIo *obj, track_t track_num);
++ unsigned int cdio_get_track_sec_count(const CdIo *p_cdio, track_t i_track);
+
+ /*!
+- lseek - reposition read/write file offset
+- Returns (off_t) -1 on error.
++ Reposition read offset
+ Similar to (if not the same as) libc's lseek()
++
++ @param p_cdio object to get information from
++ @param offset amount to seek
++ @param whence like corresponding parameter in libc's lseek, e.g.
++ SEEK_SET or SEEK_END.
++ @return (off_t) -1 on error.
+ */
+- off_t cdio_lseek(const CdIo *obj, off_t offset, int whence);
++ off_t cdio_lseek(const CdIo *p_cdio, off_t offset, int whence);
+
+ /*!
+ Reads into buf the next size bytes.
+- Returns -1 on error.
+ Similar to (if not the same as) libc's read()
++
++ @return (ssize_t) -1 on error.
+ */
+- ssize_t cdio_read(const CdIo *obj, void *buf, size_t size);
++ ssize_t cdio_read(const CdIo *p_cdio, void *buf, size_t size);
+
+ /*!
+- Reads a audio sector from cd device into data starting
+- from lsn. Returns 0 if no error.
++ Read an audio sector
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_audio_sector (const CdIo *obj, void *buf, lsn_t lsn);
++ int cdio_read_audio_sector (const CdIo *p_cdio, void *buf, lsn_t lsn);
+
+ /*!
+- Reads a audio sector from cd device into data starting
+- from lsn. Returns 0 if no error.
++ Reads audio sectors
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++ @param i_sectors number of sectors to read
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_audio_sectors (const CdIo *obj, void *buf, lsn_t lsn,
+- unsigned int nblocks);
++ int cdio_read_audio_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn,
++ unsigned int i_sectors);
+
+ /*!
+- Reads a single mode1 sector from cd device into data starting
+- from lsn. Returns 0 if no error.
++ Reads a mode1 sector
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++ @param b_form2 true for reading mode1 form2 sectors or false for
++ mode1 form1 sectors.
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_mode1_sector (const CdIo *obj, void *buf, lsn_t lsn,
++ int cdio_read_mode1_sector (const CdIo *p_cdio, void *buf, lsn_t lsn,
+ bool b_form2);
+
+ /*!
+- Reads nblocks of mode1 sectors from cd device into data starting
+- from lsn. Returns 0 if no error.
++ Reads mode1 sectors
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++ @param b_form2 true for reading mode1 form2 sectors or false for
++ mode1 form1 sectors.
++ @param i_sectors number of sectors to read
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_mode1_sectors (const CdIo *obj, void *buf, lsn_t lsn,
+- bool b_form2, unsigned int num_sectors);
++ int cdio_read_mode1_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn,
++ bool b_form2, unsigned int i_sectors);
+
+ /*!
+- Reads a single mode2 sector from cd device into data starting
+- from lsn. Returns 0 if no error.
++ Reads a mode1 sector
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++ @param b_form2 true for reading mode1 form2 sectors or false for
++ mode1 form1 sectors.
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_mode2_sector (const CdIo *obj, void *buf, lsn_t lsn,
++ int cdio_read_mode2_sector (const CdIo *p_cdio, void *buf, lsn_t lsn,
+ bool b_form2);
+
+ /*!
+- Reads nblocks of mode2 sectors from cd device into data starting
+- from lsn.
+- Returns 0 if no error.
++ Reads mode2 sectors
++
++ @param p_cdio object to read from
++ @param buf place to read data into
++ @param lsn sector to read
++ @param b_form2 true for reading mode1 form2 sectors or false for
++ mode1 form1 sectors.
++ @param i_sectors number of sectors to read
++
++ @return 0 if no error, nonzero otherwise.
+ */
+- int cdio_read_mode2_sectors (const CdIo *obj, void *buf, lsn_t lsn,
+- bool b_form2, unsigned int num_sectors);
++ int cdio_read_mode2_sectors (const CdIo *p_cdio, void *buf, lsn_t lsn,
++ bool b_form2, unsigned int i_sectors);
+
+ /*!
+- Set the arg "key" with "value" in the source device.
+- 0 is returned if no error was found, and nonzero if there as an error.
++ Set the arg "key" with "value" in "obj".
++
++ @param p_cdio the CD object to set
++ @param key the key to set
++ @param value the value to assocaiate with key
++ @return 0 if no error was found, and nonzero otherwise.
+ */
+- int cdio_set_arg (CdIo *obj, const char key[], const char value[]);
++ int cdio_set_arg (CdIo *p_cdio, const char key[], const char value[]);
+
+ /*!
+- Return the size of the CD in logical block address (LBA) units.
++ Get the size of the CD in logical block address (LBA) units.
++
++ @param p_cdio the CD object queried
++ @return the size
+ */
+- uint32_t cdio_stat_size (const CdIo *obj);
++ uint32_t cdio_stat_size (const CdIo *p_cdio);
+
+ /*!
+ Initialize CD Reading and control routines. Should be called first.
+@@ -347,72 +575,148 @@
+ /*! True if BIN/CUE driver is available. */
+ bool cdio_have_bincue (void);
+
++ /*! True if cdrdao CDRDAO driver is available. */
++ bool cdio_have_cdrdao (void);
++
+ /*! Like cdio_have_xxx but uses an enumeration instead. */
+ bool cdio_have_driver (driver_id_t driver_id);
+
+- /*! Return a string decribing driver_id. */
++ /*!
++ Get a string decribing driver_id.
++
++ @param driver_id the driver you want the description for
++ @return a sring of driver description
++ */
+ const char *cdio_driver_describe (driver_id_t driver_id);
+
+ /*! Sets up to read from place specified by source_name and
+- driver_id This should be called before using any other routine,
+- except cdio_init. This will call cdio_init, if that hasn't been
+- done previously. to call one of the specific cdio_open_xxx
+- routines.
++ driver_id. This or cdio_open_* should be called before using any
++ other routine, except cdio_init. This will call cdio_init, if
++ that hasn't been done previously. to call one of the specific
++ cdio_open_xxx routines.
+
+- NULL is returned on error.
++ @return the cdio object or NULL on error or no device.
+ */
+ CdIo * cdio_open (const char *source_name, driver_id_t driver_id);
+
++ /*! Sets up to read from place specified by source_name, driver_id
++ and access mode. This or cdio_open should be called before using
++ any other routine, except cdio_init. This will call cdio_init, if
++ that hasn't been done previously. to call one of the specific
++ cdio_open_xxx routines.
++
++ @return the cdio object or NULL on error or no device.
++ */
++ CdIo * cdio_open_am (const char *psz_source_name,
++ driver_id_t driver_id, const char *psz_access_mode);
++
++ /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or
++ .cue file
++
++ @return the cdio object or NULL on error or no device.
++ */
++ CdIo * cdio_open_bincue (const char *psz_cue_name);
++
+ /*! Set up BIN/CUE CD disk-image for reading. Source is the .bin or
+ .cue file
+
+- NULL is returned on error.
++ @return the cdio object or NULL on error or no device..
++ */
++ CdIo * cdio_open_am_bincue (const char *psz_cue_name,
++ const char *psz_access_mode);
++
++ /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
++
++ @return the cdio object or NULL on error or no device.
+ */
+- CdIo * cdio_open_bincue (const char *bin_name);
++ CdIo * cdio_open_cdrdao (const char *psz_toc_name);
++
++ /*! Set up cdrdao CD disk-image for reading. Source is the .toc file
++
++ @return the cdio object or NULL on error or no device..
++ */
++ CdIo * cdio_open_am_cdrdao (const char *psz_toc_name,
++ const char *psz_access_mode);
+
+ /*! Return a string containing the default CUE file that would
+ be used when none is specified.
+
+- NULL is returned on error or there is no device.
++ @return the cdio object or NULL on error or no device.
+ */
+ char * cdio_get_default_device_bincue(void);
+
+ char **cdio_get_devices_bincue(void);
+
++ /*! Return a string containing the default CUE file that would
++ be used when none is specified.
++
++ NULL is returned on error or there is no device.
++ */
++ char * cdio_get_default_device_cdrdao(void);
++
++ char **cdio_get_devices_cdrdao(void);
++
+ /*! Set up CD-ROM for reading. The device_name is
+ the some sort of device name.
+
+- NULL is returned on error.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no driver for a some sort of hardware CD-ROM.
+ */
+ CdIo * cdio_open_cd (const char *device_name);
+
+- /*! cdrao BIN/CUE CD disk-image routines. Source is the .cue file
++ /*! Set up CD-ROM for reading. The device_name is
++ the some sort of device name.
+
+- NULL is returned on error.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no driver for a some sort of hardware CD-ROM.
++ */
++ CdIo * cdio_open_am_cd (const char *psz_device,
++ const char *psz_access_mode);
++
++ /*! CDRWIN BIN/CUE CD disc-image routines. Source is the .cue file
++
++ @return the cdio object for subsequent operations.
++ NULL on error.
+ */
+ CdIo * cdio_open_cue (const char *cue_name);
+
+ /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
+ the some sort of device name.
+
+- NULL is returned on error or there is no BSDI driver.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no BSDI driver.
+
+ @see cdio_open
+ */
+- CdIo * cdio_open_bsdi (const char *source_name);
++ CdIo * cdio_open_bsdi (const char *psz_source_name);
++
++ /*! Set up CD-ROM for reading using the BSDI driver. The device_name is
++ the some sort of device name.
++
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no BSDI driver.
++
++ @see cdio_open
++ */
++ CdIo * cdio_open_am_bsdi (const char *psz_source_name,
++ const char *psz_access_mode);
+
+ /*! Return a string containing the default device name that the
+ BSDI driver would use when none is specified.
+
+- NULL is returned on error or there is no CD-ROM device.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no BSDI driver.
+
+- @see cdio_open_cd
+- @see cdio_open
++ @see cdio_open_cd, cdio_open
+ */
+ char * cdio_get_default_device_bsdi(void);
+
+ /*! Return a list of all of the CD-ROM devices that the BSDI driver
+ can find.
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+ char **cdio_get_devices_bsdi(void);
+
+@@ -421,10 +725,19 @@
+
+ NULL is returned on error or there is no FreeBSD driver.
+
+- @see cdio_open_cd
+- @see cdio_open
++ @see cdio_open_cd, cdio_open
++ */
++ CdIo * cdio_open_freebsd (const char *paz_source_name);
++
++ /*! Set up CD-ROM for reading using the FreeBSD driver. The device_name is
++ the some sort of device name.
++
++ NULL is returned on error or there is no FreeBSD driver.
++
++ @see cdio_open_cd, cdio_open
+ */
+- CdIo * cdio_open_freebsd (const char *source_name);
++ CdIo * cdio_open_am_freebsd (const char *psz_source_name,
++ const char *psz_access_mode);
+
+ /*! Return a string containing the default device name that the
+ FreeBSD driver would use when none is specified.
+@@ -441,18 +754,35 @@
+ /*! Set up CD-ROM for reading using the GNU/Linux driver. The device_name is
+ the some sort of device name.
+
+- NULL is returned on error or there is no GNU/Linux driver.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no GNU/Linux driver.
++
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+ CdIo * cdio_open_linux (const char *source_name);
+
++ /*! Set up CD-ROM for reading using the GNU/Linux driver. The
++ device_name is the some sort of device name.
++
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no GNU/Linux driver.
++ */
++ CdIo * cdio_open_am_linux (const char *source_name,
++ const char *access_mode);
++
+ /*! Return a string containing the default device name that the
+ GNU/Linux driver would use when none is specified. A scan is made
+ for CD-ROM drives with CDs in them.
+
+ NULL is returned on error or there is no CD-ROM device.
+
+- @see cdio_open_cd
+- @see cdio_open
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
++
++ @see cdio_open_cd, cdio_open
+ */
+ char * cdio_get_default_device_linux(void);
+
+@@ -464,18 +794,31 @@
+ /*! Set up CD-ROM for reading using the Sun Solaris driver. The
+ device_name is the some sort of device name.
+
+- NULL is returned on error or there is no Solaris driver.
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no Solaris driver.
+ */
+ CdIo * cdio_open_solaris (const char *source_name);
+
++ /*! Set up CD-ROM for reading using the Sun Solaris driver. The
++ device_name is the some sort of device name.
++
++ @return the cdio object for subsequent operations.
++ NULL on error or there is no Solaris driver.
++ */
++ CdIo * cdio_open_am_solaris (const char *psz_source_name,
++ const char *psz_access_mode);
++
+ /*! Return a string containing the default device name that the
+ Solaris driver would use when none is specified. A scan is made
+ for CD-ROM drives with CDs in them.
+
+ NULL is returned on error or there is no CD-ROM device.
+
+- @see cdio_open_cd
+- @see cdio_open
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
++
++ @see cdio_open_cd, cdio_open
+ */
+ char * cdio_get_default_device_solaris(void);
+
+@@ -489,16 +832,31 @@
+
+ NULL is returned on error or there is no OSX driver.
+
+- @see cdio_open_cd
+- @see cdio_open
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
++
++ @see cdio_open_cd, cdio_open
+ */
+- CdIo * cdio_open_osx (const char *source_name);
++ CdIo * cdio_open_osx (const char *psz_source_name);
++
++ /*! Set up CD-ROM for reading using the Apple OSX driver. The
++ device_name is the some sort of device name.
++
++ NULL is returned on error or there is no OSX driver.
++
++ @see cdio_open_cd, cdio_open
++ */
++ CdIo * cdio_open_am_osx (const char *psz_source_name,
++ const char *psz_access_mode);
+
+ /*! Return a string containing the default device name that the
+ OSX driver would use when none is specified. A scan is made
+ for CD-ROM drives with CDs in them.
+
+- NULL is returned on error or there is no CD-ROM device
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+ char * cdio_get_default_device_osx(void);
+
+@@ -510,18 +868,29 @@
+ /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
+ device_name is the some sort of device name.
+
+- NULL is returned on error or there is no Microsof Windows driver.
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+ */
+ CdIo * cdio_open_win32 (const char *source_name);
+
++ /*! Set up CD-ROM for reading using the Microsoft Windows driver. The
++ device_name is the some sort of device name.
++
++ NULL is returned on error or there is no Microsof Windows driver.
++ */
++ CdIo * cdio_open_am_win32 (const char *psz_source_name,
++ const char *psz_access_mode);
++
+ /*! Return a string containing the default device name that the
+ Win32 driver would use when none is specified. A scan is made
+ for CD-ROM drives with CDs in them.
+
+- NULL is returned on error or there is no CD-ROM device.
++ In some situations of drivers or OS's we can't find a CD device if
++ there is no media in it and it is possible for this routine to return
++ NULL even though there may be a hardware CD-ROM.
+
+- @see cdio_open_cd
+- @see cdio_open
++ @see cdio_open_cd, cdio_open
+ */
+ char * cdio_get_default_device_win32(void);
+
+@@ -530,10 +899,18 @@
+ /*! Set up CD-ROM for reading using the Nero driver. The
+ device_name is the some sort of device name.
+
+- NULL is returned on error or there is no Nero driver.
++ @return true on success; NULL on error or there is no Nero driver.
+ */
+ CdIo * cdio_open_nrg (const char *source_name);
+
++ /*! Set up CD-ROM for reading using the Nero driver. The
++ device_name is the some sort of device name.
++
++ @return true on success; NULL on error or there is no Nero driver.
++ */
++ CdIo * cdio_open_am_nrg (const char *psz_source_name,
++ const char *psz_access_mode);
++
+ /*! Return a string containing the default device name that the
+ NRG driver would use when none is specified. A scan is made
+ for NRG disk images in the current directory..
+@@ -544,18 +921,50 @@
+
+ char **cdio_get_devices_nrg(void);
+
+- /*! Return corresponding BIN file if cue_name is a cue file or NULL
+- if not a CUE file.
++ /*!
++
++ Determine if bin_name is the bin file part of a CDRWIN CD disk image.
++
++ @param bin_name location of presumed CDRWIN bin image file.
++ @return the corresponding CUE file if bin_name is a BIN file or
++ NULL if not a BIN file.
++ */
++ char *cdio_is_binfile(const char *bin_name);
++
++ /*!
++ Determine if cue_name is the cue sheet for a CDRWIN CD disk image.
++
++ @return corresponding BIN file if cue_name is a CDRWIN cue file or
++ NULL if not a CUE file.
+ */
+ char *cdio_is_cuefile(const char *cue_name);
+
+- /*! Return corresponding CUE file if bin_name is a fin file or NULL
+- if not a BIN file. NOTE: when we handle TOC something will have to
+- change here....
++ /*!
++ Determine if psg_nrg is a Nero CD disk image.
++
++ @param psz_nrg location of presumed NRG image file.
++ @return true if psz_nrg is a Nero NRG image or false
++ if not a NRG image.
+ */
+- char *cdio_is_binfile(const char *bin_name);
++ bool cdio_is_nrg(const char *psz_nrg);
+
+- /*! Return true if source name is a device.
++ /*!
++ Determine if psg_toc is a TOC file for a cdrdao CD disk image.
++
++ @param psz_toc location of presumed TOC image file.
++ @return true if toc_name is a cdrdao TOC file or false
++ if not a TOC file.
++ */
++ bool cdio_is_tocfile(const char *psz_toc);
++
++ /*!
++ Determine if source_name refers to a real hardware CD-ROM.
++
++ @param source_name location name of object
++ @param driver_id driver for reading object. Use DRIVER_UNKNOWN if you
++ don't know what driver to use.
++ @return true if source_name is a device; If false is returned we
++ could have a CD disk image.
+ */
+ bool cdio_is_device(const char *source_name, driver_id_t driver_id);
+
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/cdtext.h 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -0,0 +1,108 @@
++/*
++ $Id: cdtext.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++ adapted from cuetools
++ Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++/*!
++ * \file cdtext.h
++ * \brief Header CD-Text information
++*/
++
++
++#ifndef __CDIO_CDTEXT_H__
++#define __CDIO_CDTEXT_H__
++
++#include <cdio/cdio.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++#define MAX_CDTEXT_FIELDS 13
++
++ /*! \brief structure for holding CD-Text information
++
++ @see cdtext_init, cdtext_destroy, cdtext_get, and cdtext_set.
++ */
++ struct cdtext {
++ char *field[MAX_CDTEXT_FIELDS];
++ };
++
++ /*! \brief A list of all of the CD-Text fields */
++ typedef enum {
++ CDTEXT_ARRANGER = 0, /**< name(s) of the arranger(s) */
++ CDTEXT_COMPOSER = 1, /**< name(s) of the composer(s) */
++ CDTEXT_DISCID = 2, /**< disc identification information */
++ CDTEXT_GENRE = 3, /**< genre identification and genre information */
++ CDTEXT_MESSAGE = 4, /**< ISRC code of each track */
++ CDTEXT_ISRC = 5, /**< message(s) from the content provider or artist */
++ CDTEXT_PERFORMER = 6, /**< name(s) of the performer(s) */
++ CDTEXT_SIZE_INFO = 7, /**< size information of the block */
++ CDTEXT_SONGWRITER = 8, /**< name(s) of the songwriter(s) */
++ CDTEXT_TITLE = 9, /**< title of album name or track titles */
++ CDTEXT_TOC_INFO = 10, /**< table of contents information */
++ CDTEXT_TOC_INFO2 = 11, /**< second table of contents information */
++ CDTEXT_UPC_EAN = 12,
++ CDTEXT_INVALID = MAX_CDTEXT_FIELDS
++ } cdtext_field_t;
++
++ /*! Return string representation of the enum values above */
++ const char *cdtext_field2str (cdtext_field_t i);
++
++ /*! Initialize a new cdtext structure.
++ When the structure is no longer needed, release the
++ resources using cdtext_delete.
++ */
++ void cdtext_init (cdtext_t *cdtext);
++
++ /*! Free memory assocated with cdtext*/
++ void cdtext_destroy (cdtext_t *cdtext);
++
++ /*! returns the string associated with the given field. NULL is
++ returned if key is CDTEXT_INVALID or the field is not set.
++
++ @see cdio_get_cdtext to retrieve the cdtext structure used as
++ input here.
++ */
++ const char *cdtext_get (cdtext_field_t key, const cdtext_t *cdtext);
++
++ /*!
++ returns enum of keyword if key is a CD-Text keyword,
++ returns MAX_CDTEXT_FIELDS non-zero otherwise.
++ */
++ cdtext_field_t cdtext_is_keyword (const char *key);
++
++ /*!
++ sets cdtext's keyword entry to field
++ */
++ void cdtext_set (cdtext_field_t key, const char *value, cdtext_t *cdtext);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __CDIO_CDTEXT_H__ */
++
++/*
++ * Local variables:
++ * c-file-style: "gnu"
++ * tab-width: 8
++ * indent-tabs-mode: nil
++ * End:
++ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/ds.h 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -0,0 +1,73 @@
++/*
++ $Id: ds.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++#ifndef __CDIO_DS_H__
++#define __CDIO_DS_H__
++
++#include <cdio/types.h>
++
++/* opaque... */
++typedef struct _CdioList CdioList;
++typedef struct _CdioListNode CdioListNode;
++
++typedef int (*_cdio_list_cmp_func) (void *data1, void *data2);
++
++typedef int (*_cdio_list_iterfunc) (void *data, void *user_data);
++
++/* methods */
++CdioList *_cdio_list_new (void);
++
++void _cdio_list_free (CdioList *list, int free_data);
++
++unsigned _cdio_list_length (const CdioList *list);
++
++void _cdio_list_prepend (CdioList *list, void *data);
++
++void _cdio_list_append (CdioList *list, void *data);
++
++void _cdio_list_foreach (CdioList *list, _cdio_list_iterfunc func, void *user_data);
++
++CdioListNode *_cdio_list_find (CdioList *list, _cdio_list_iterfunc cmp_func, void *user_data);
++
++#define _CDIO_LIST_FOREACH(node, list) \
++ for (node = _cdio_list_begin (list); node; node = _cdio_list_node_next (node))
++
++/* node ops */
++
++CdioListNode *_cdio_list_begin (const CdioList *list);
++
++CdioListNode *_cdio_list_end (CdioList *list);
++
++CdioListNode *_cdio_list_node_next (CdioListNode *node);
++
++void _cdio_list_node_free (CdioListNode *node, int free_data);
++
++void *_cdio_list_node_data (CdioListNode *node);
++
++#endif /* __CDIO_DS_H__ */
++
++/*
++ * Local variables:
++ * c-file-style: "gnu"
++ * tab-width: 8
++ * indent-tabs-mode: nil
++ * End:
++ */
++
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/dvd.h 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -0,0 +1,113 @@
++/*
++ $Id: dvd.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++ Modeled after GNU/Linux definitions in linux/cdrom.h
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/*!
++ \file dvd.h
++ \brief Definitions for DVD access.
++*/
++
++#ifndef __CDIO_DVD_H__
++#define __CDIO_DVD_H__
++
++#include <cdio/types.h>
++
++/*! Values used in a READ DVD STRUCTURE */
++
++#define CDIO_DVD_STRUCT_PHYSICAL 0x00
++#define CDIO_DVD_STRUCT_COPYRIGHT 0x01
++#define CDIO_DVD_STRUCT_DISCKEY 0x02
++#define CDIO_DVD_STRUCT_BCA 0x03
++#define CDIO_DVD_STRUCT_MANUFACT 0x04
++
++/*! Media definitions for "Book Type" */
++#define CDIO_DVD_BOOK_DVD_ROM 0
++#define CDIO_DVD_BOOK_DVD_RAM 1
++#define CDIO_DVD_BOOK_DVD_R 2 /**< DVD-R */
++#define CDIO_DVD_BOOK_DVD_RW 3 /**< DVD-RW */
++#define CDIO_DVD_BOOK_DVD_PR 8 /**< DVD+R */
++#define CDIO_DVD_BOOK_DVD_PRW 9 /**< DVD+RW */
++
++typedef struct cdio_dvd_layer {
++ uint8_t book_version : 4;
++ uint8_t book_type : 4;
++ uint8_t min_rate : 4;
++ uint8_t disc_size : 4;
++ uint8_t layer_type : 4;
++ uint8_t track_path : 1;
++ uint8_t nlayers : 2;
++ uint8_t track_density : 4;
++ uint8_t linear_density: 4;
++ uint8_t bca : 1;
++ uint32_t start_sector;
++ uint32_t end_sector;
++ uint32_t end_sector_l0;
++} cdio_dvd_layer_t;
++
++/*! Maximum number of layers in a DVD. */
++#define CDIO_DVD_MAX_LAYERS 4
++
++typedef struct cdio_dvd_physical {
++ uint8_t type;
++ uint8_t layer_num;
++ cdio_dvd_layer_t layer[CDIO_DVD_MAX_LAYERS];
++} cdio_dvd_physical_t;
++
++typedef struct cdio_dvd_copyright {
++ uint8_t type;
++
++ uint8_t layer_num;
++ uint8_t cpst;
++ uint8_t rmi;
++} cdio_dvd_copyright_t;
++
++typedef struct cdio_dvd_disckey {
++ uint8_t type;
++
++ unsigned agid : 2;
++ uint8_t value[2048];
++} cdio_dvd_disckey_t;
++
++typedef struct cdio_dvd_bca {
++ uint8_t type;
++
++ int len;
++ uint8_t value[188];
++} cdio_dvd_bca_t;
++
++typedef struct cdio_dvd_manufact {
++ uint8_t type;
++
++ uint8_t layer_num;
++ int len;
++ uint8_t value[2048];
++} cdio_dvd_manufact_t;
++
++typedef union {
++ uint8_t type;
++
++ cdio_dvd_physical_t physical;
++ cdio_dvd_copyright_t copyright;
++ cdio_dvd_disckey_t disckey;
++ cdio_dvd_bca_t bca;
++ cdio_dvd_manufact_t manufact;
++} cdio_dvd_struct_t;
++
++#endif /* __SCSI_MMC_H__ */
+--- ./src/input/vcd/libcdio/cdio/iso9660.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/iso9660.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: iso9660.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: iso9660.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -33,6 +33,7 @@
+ #define __CDIO_ISO9660_H__
+
+ #include <cdio/cdio.h>
++#include <cdio/ds.h>
+ #include <cdio/xa.h>
+
+ #include <time.h>
+@@ -56,14 +57,35 @@
+ = 38 chars
+ \endverbatim
+ */
+-#define LEN_ISONAME 31
+-#define MAX_ISONAME 37
+
++/*! size in bytes of the filename portion + null byte */
++#define LEN_ISONAME 31
++
++/*! Max # characters in the entire ISO 9660 filename. */
++#define MAX_ISONAME 37
++
++/*! Max # characters in the entire ISO 9660 filename. */
+ #define MAX_ISOPATHNAME 255
+
+-/*
+- * ISO 9660 directory flags.
+- */
++/*! Max # characters in an perparer id. */
++#define ISO_MAX_PREPARER_ID 128
++
++/*! Max # characters in an publisher id. */
++#define ISO_MAX_PUBLISHER_ID 128
++
++/*! Max # characters in an application id. */
++#define ISO_MAX_APPLICATION_ID 128
++
++/*! Max # characters in an system id. */
++#define ISO_MAX_SYSTEM_ID 32
++
++/*! Max # characters in an volume id. */
++#define ISO_MAX_VOLUME_ID 32
++
++/*! Max # characters in an volume-set id. */
++#define ISO_MAX_VOLUMESET_ID 128
++
++/**! ISO 9660 directory flags. */
+ #define ISO_FILE 0 /**< Not really a flag... */
+ #define ISO_EXISTENCE 1 /**< Do not make existence known (hidden) */
+ #define ISO_DIRECTORY 2 /**< This file is a directory */
+@@ -74,18 +96,23 @@
+ #define ISO_DRESERVED2 64 /**< Reserved bit 6 */
+ #define ISO_MULTIEXTENT 128 /**< Not final entry of a mult. ext. file */
+
+-/* Volume descriptor types */
++/**! Volume descriptor types */
+ #define ISO_VD_PRIMARY 1
+ #define ISO_VD_SUPPLEMENTARY 2 /**< Used by Joliet */
+ #define ISO_VD_END 255
+
+-#define ISO_PVD_SECTOR 16 /**< Sector of Primary Volume Descriptor */
+-#define ISO_EVD_SECTOR 17 /**< Sector of End Volume Descriptor */
++/*! Sector of Primary Volume Descriptor */
++#define ISO_PVD_SECTOR 16
++
++/*! Sector of End Volume Descriptor */
++#define ISO_EVD_SECTOR 17
++
++/*! String inside track identifying an ISO 9660 filesystem. */
++#define ISO_STANDARD_ID "CD001"
+
+-#define ISO_STANDARD_ID "CD001" /**< String inside track identifying an
+- ISO 9660 filesystem. */
+-#define ISO_BLOCKSIZE 2048 /**< Number of bytes in an ISO
+- 9660 block */
++
++/*! Number of bytes in an ISO 9660 block */
++#define ISO_BLOCKSIZE 2048
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -98,6 +125,10 @@
+ ISO9660_DCHARS
+ };
+
++#ifndef EMPTY_ARRAY_SIZE
++#define EMPTY_ARRAY_SIZE 0
++#endif
++
+ PRAGMA_BEGIN_PACKED
+
+ /*!
+@@ -144,33 +175,62 @@
+
+ typedef struct iso9660_ltime iso9660_ltime_t;
+
++/*! \brief Format of an ISO-9660 directory record
++
++ This structure may have an odd length depending on how many
++ characters there are in the filename! Some compilers (e.g. on
++ Sun3/mc68020) pad the structures to an even length. For this reason,
++ we cannot use sizeof (struct iso_path_table) or sizeof (struct
++ iso_directory_record) to compute on disk sizes. Instead, we use
++ offsetof(..., name) and add the name size. See mkisofs.h of the
++ cdrtools package.
++
++ @see iso9660_stat
++*/
++struct iso9660_dir {
++ uint8_t length; /*! 711 encoded */
++ uint8_t xa_length; /*! 711 encoded */
++ uint64_t extent; /*! 733 encoded */
++ uint64_t size; /*! 733 encoded */
++ iso9660_dtime_t recording_time; /*! 7 711-encoded units */
++ uint8_t file_flags;
++ uint8_t file_unit_size; /*! 711 encoded */
++ uint8_t interleave_gap; /*! 711 encoded */
++ uint32_t volume_sequence_number; /*! 723 encoded */
++ uint8_t filename_len; /*! 711 encoded */
++ char filename[EMPTY_ARRAY_SIZE];
++} GNUC_PACKED;
++
++typedef struct iso9660_dir iso9660_dir_t;
++
+ /*!
+ \brief ISO-9660 Primary Volume Descriptor.
+ */
+ struct iso9660_pvd {
+- uint8_t type; /**< 711 encoded */
++ uint8_t type; /**< 711 encoded */
+ char id[5];
+- uint8_t version; /**< 711 encoded */
++ uint8_t version; /**< 711 encoded */
+ char unused1[1];
+- char system_id[32]; /**< each char is an achar */
+- char volume_id[32]; /**< each char is a dchar */
++ char system_id[ISO_MAX_SYSTEM_ID]; /**< each char is an achar */
++ char volume_id[ISO_MAX_VOLUME_ID]; /**< each char is a dchar */
+ char unused2[8];
+- uint64_t volume_space_size; /**< 733 encoded */
+- char escape_sequences[32];
+- uint32_t volume_set_size; /**< 723 encoded */
+- uint32_t volume_sequence_number; /**< 723 encoded */
+- uint32_t logical_block_size; /**< 723 encoded */
+- uint64_t path_table_size; /**< 733 encoded */
+- uint32_t type_l_path_table; /**< 731 encoded */
+- uint32_t opt_type_l_path_table; /**< 731 encoded */
+- uint32_t type_m_path_table; /**< 732 encoded */
+- uint32_t opt_type_m_path_table; /**< 732 encoded */
+- char root_directory_record[34]; /**< See section 9.1 of
+- ISO 9660 spec. */
+- char volume_set_id[128]; /**< dchars */
+- char publisher_id[128]; /**< achars */
+- char preparer_id[128]; /**< achars */
+- char application_id[128]; /**< achars */
++ uint64_t volume_space_size; /**< 733 encoded */
++ char unused3[32];
++ uint32_t volume_set_size; /**< 723 encoded */
++ uint32_t volume_sequence_number; /**< 723 encoded */
++ uint32_t logical_block_size; /**< 723 encoded */
++ uint64_t path_table_size; /**< 733 encoded */
++ uint32_t type_l_path_table; /**< 731 encoded */
++ uint32_t opt_type_l_path_table; /**< 731 encoded */
++ uint32_t type_m_path_table; /**< 732 encoded */
++ uint32_t opt_type_m_path_table; /**< 732 encoded */
++ iso9660_dir_t root_directory_record; /**< See section 9.1 of
++ ISO 9660 spec. */
++ char root_directory_filename; /**< Is \0 */
++ char volume_set_id[ISO_MAX_VOLUMESET_ID]; /**< dchars */
++ char publisher_id[ISO_MAX_PUBLISHER_ID]; /**< achars */
++ char preparer_id[ISO_MAX_PREPARER_ID]; /**< achars */
++ char application_id[ISO_MAX_APPLICATION_ID]; /**< achars */
+ char copyright_file_id[37]; /**< See section 7.5 of
+ ISO 9660 spec. Each char is
+ a dchar */
+@@ -194,41 +254,63 @@
+ char unused5[653];
+ } GNUC_PACKED;
+
+-typedef struct iso9660_dir iso9660_dir_t;
+ typedef struct iso9660_pvd iso9660_pvd_t;
+-typedef struct iso9660_stat iso9660_stat_t;
+-
+-#ifndef EMPTY_ARRAY_SIZE
+-#define EMPTY_ARRAY_SIZE 0
+-#endif
+-
+-
+-/*! \brief Format of an ISO-9660 directory record
+
+- This structure may have an odd length depending on how many
+- characters there are in the filename! Some compilers (e.g. on
+- Sun3/mc68020) pad the structures to an even length. For this reason,
+- we cannot use sizeof (struct iso_path_table) or sizeof (struct
+- iso_directory_record) to compute on disk sizes. Instead, we use
+- offsetof(..., name) and add the name size. See mkisofs.h of the
+- cdrtools package.
++/*!
++ \brief ISO-9660 Supplementary Volume Descriptor.
+
+- @see iso9660_stat
++ This is used for Joliet Extentions and is almost the same as the
++ the primary descriptor but two unused fields, "unused1" and "unused3
++ become "flags and "escape_sequences" respectively.
+ */
+-struct iso9660_dir {
+- uint8_t length; /*! 711 encoded */
+- uint8_t xa_length; /*! 711 encoded */
+- uint64_t extent; /*! 733 encoded */
+- uint64_t size; /*! 733 encoded */
+- iso9660_dtime_t recording_time; /*! 7 711-encoded units */
+- uint8_t file_flags;
+- uint8_t file_unit_size; /*! 711 encoded */
+- uint8_t interleave_gap; /*! 711 encoded */
+- uint32_t volume_sequence_number; /*! 723 encoded */
+- uint8_t filename_len; /*! 711 encoded */
+- char filename[EMPTY_ARRAY_SIZE];
++struct iso9660_svd {
++ uint8_t type; /**< 711 encoded */
++ char id[5];
++ uint8_t version; /**< 711 encoded */
++ char flags; /**< 853 */
++ char system_id[ISO_MAX_SYSTEM_ID]; /**< each char is an achar */
++ char volume_id[ISO_MAX_VOLUME_ID]; /**< each char is a dchar */
++ char unused2[8];
++ uint64_t volume_space_size; /**< 733 encoded */
++ char escape_sequences[32]; /**< 856 */
++ uint32_t volume_set_size; /**< 723 encoded */
++ uint32_t volume_sequence_number; /**< 723 encoded */
++ uint32_t logical_block_size; /**< 723 encoded */
++ uint64_t path_table_size; /**< 733 encoded */
++ uint32_t type_l_path_table; /**< 731 encoded */
++ uint32_t opt_type_l_path_table; /**< 731 encoded */
++ uint32_t type_m_path_table; /**< 732 encoded */
++ uint32_t opt_type_m_path_table; /**< 732 encoded */
++ iso9660_dir_t root_directory_record; /**< See section 9.1 of
++ ISO 9660 spec. */
++ char volume_set_id[ISO_MAX_VOLUMESET_ID]; /**< dchars */
++ char publisher_id[ISO_MAX_PUBLISHER_ID]; /**< achars */
++ char preparer_id[ISO_MAX_PREPARER_ID]; /**< achars */
++ char application_id[ISO_MAX_APPLICATION_ID]; /**< achars */
++ char copyright_file_id[37]; /**< See section 7.5 of
++ ISO 9660 spec. Each char is
++ a dchar */
++ char abstract_file_id[37]; /**< See section 7.5 of
++ ISO 9660 spec. Each char is
++ a dchar */
++ char bibliographic_file_id[37]; /**< See section 7.5 of
++ ISO 9660 spec. Each char is
++ a dchar. */
++ iso9660_ltime_t creation_date; /**< See section 8.4.26.1 of
++ ISO 9660 spec. */
++ iso9660_ltime_t modification_date; /**< See section 8.4.26.1 of
++ ISO 9660 spec. */
++ iso9660_ltime_t expiration_date; /**< See section 8.4.26.1 of
++ ISO 9660 spec. */
++ iso9660_ltime_t effective_date; /**< See section 8.4.26.1 of
++ ISO 9660 spec. */
++ uint8_t file_structure_version; /**< 711 encoded */
++ char unused4[1];
++ char application_data[512];
++ char unused5[653];
+ } GNUC_PACKED;
+
++typedef struct iso9660_svd iso9660_svd_t;
+
+ PRAGMA_END_PACKED
+
+@@ -251,29 +333,88 @@
+ char filename[EMPTY_ARRAY_SIZE]; /**< filename */
+ };
+
++typedef struct iso9660_stat iso9660_stat_t;
++
++
++/** A mask used in iso9660_ifs_read_vd which allows what kinds
++ of extensions we allow, eg. Joliet, Rock Ridge, etc. */
++typedef uint8_t iso_extension_mask_t;
++
++#define ISO_EXTENSION_JOLIET_LEVEL1 0x01
++#define ISO_EXTENSION_JOLIET_LEVEL2 0x02
++#define ISO_EXTENSION_JOLIET_LEVEL3 0x04
++#define ISO_EXTENSION_ROCK_RIDGE 0x08
++#define ISO_EXTENSION_HIGH_SIERRA 0x10
++
++#define ISO_EXTENSION_ALL 0xFF
++#define ISO_EXTENSION_NONE 0x00
++#define ISO_EXTENSION_JOLIET \
++ (ISO_EXTENSION_JOLIET_LEVEL1 | \
++ ISO_EXTENSION_JOLIET_LEVEL2 | \
++ ISO_EXTENSION_JOLIET_LEVEL3 )
++
+
+ /** This is an opaque structure. */
+ typedef struct _iso9660 iso9660_t;
+
+ /*!
+ Open an ISO 9660 image for reading. Maybe in the future we will have
+- flags and mode. NULL is returned on error.
++ a mode. NULL is returned on error.
+ */
+- iso9660_t *iso9660_open (const char *pathname /*flags, mode */);
++ iso9660_t *iso9660_open (const char *psz_pathname /*flags, mode */);
++
++/*!
++ Open an ISO 9660 image for reading allowing various ISO 9660
++ extensions. Maybe in the future we will have a mode. NULL is
++ returned on error.
++*/
++ iso9660_t *iso9660_open_ext (const char *psz_pathname,
++ iso_extension_mask_t iso_extension_mask);
+
+ /*!
+ Close previously opened ISO 9660 image.
+ True is unconditionally returned. If there was an error false would
+ be returned.
+ */
+- bool iso9660_close (iso9660_t * iso);
++ bool iso9660_close (iso9660_t * p_iso);
+
+
+ /*!
+ Seek to a position and then read n bytes. Size read is returned.
+ */
+- long int iso9660_iso_seek_read (iso9660_t *iso, void *ptr, lsn_t start,
+- long int size);
++ long int iso9660_iso_seek_read (const iso9660_t *p_iso, void *ptr,
++ lsn_t start, long int i_size);
++
++/*!
++ Read the Primary Volume Descriptor for a CD.
++ True is returned if read, and false if there was an error.
++*/
++ bool iso9660_fs_read_pvd ( const CdIo *p_cdio,
++ /*out*/ iso9660_pvd_t *p_pvd );
++
++/*!
++ Read the Primary Volume Descriptor for an ISO 9660 image.
++ True is returned if read, and false if there was an error.
++*/
++ bool iso9660_ifs_read_pvd (const iso9660_t *p_iso,
++ /*out*/ iso9660_pvd_t *p_pvd);
++
++/*!
++ Read the Super block of an ISO 9660 image. This is the
++ Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume
++ Descriptor if (Joliet) extensions are acceptable.
++*/
++ bool iso9660_fs_read_superblock (CdIo *p_cdio,
++ iso_extension_mask_t iso_extension_mask);
++
++/*!
++ Read the Supper block of an ISO 9660 image. This is the
++ Primary Volume Descriptor (PVD) and perhaps a Supplemental Volume
++ Descriptor if (Joliet) extensions are acceptable.
++*/
++ bool iso9660_ifs_read_superblock (iso9660_t *p_iso,
++ iso_extension_mask_t iso_extension_mask);
++
+
+ /*====================================================
+ Time conversion
+@@ -289,7 +430,7 @@
+ Set "long" time in format used in ISO 9660 primary volume descriptor
+ from a Unix time structure. */
+ void iso9660_set_ltime (const struct tm *_tm,
+- /*out*/ iso9660_ltime_t *pvd_date);
++ /*out*/ iso9660_ltime_t *p_pvd_date);
+
+ /*!
+ Get Unix time structure from format use in an ISO 9660 directory index
+@@ -323,13 +464,24 @@
+ /*!
+ Convert ISO-9660 file name that stored in a directory entry into
+ what's usually listed as the file name in a listing.
+- Lowercase name, and drop deal with trailing ;1's or .;1's or
+- ; version numbers.
++ Lowercase name, and remove trailing ;1's or .;1's and
++ turn the other ;'s into version numbers.
+
+ The length of the translated string is returned.
+ */
+-int iso9660_name_translate(const char *old, char *new);
++int iso9660_name_translate(const char *psz_oldname, char *psz_newname);
+
++/*!
++ Convert ISO-9660 file name that stored in a directory entry into
++ what's usually listed as the file name in a listing. Lowercase
++ name if not using Joliet extension. Remove trailing ;1's or .;1's and
++ turn the other ;'s into version numbers.
++
++ The length of the translated string is returned.
++*/
++int iso9660_name_translate_ext(const char *old, char *new,
++ uint8_t i_joliet_level);
++
+ /*!
+ Pad string src with spaces to size len and copy this to dst. If
+ len is less than the length of src, dst will be truncated to the
+@@ -366,7 +518,7 @@
+ number. For example, mydir/file.ext -> MYDIR/FILE.EXT;1 for version
+ 1. The resulting ISO-9660 pathname is returned.
+ */
+-char *iso9660_pathname_isofy (const char pathname[], uint16_t version);
++char *iso9660_pathname_isofy (const char pathname[], uint16_t i_version);
+
+ /*!
+ Check that pathname is a valid ISO-9660 pathname.
+@@ -412,7 +564,7 @@
+
+ Returns stat_t of entry if we found lsn, or NULL otherwise.
+ */
+-iso9660_stat_t *iso9660_find_fs_lsn(const CdIo *cdio, lsn_t lsn);
++iso9660_stat_t *iso9660_find_fs_lsn(CdIo *p_cdio, lsn_t i_lsn);
+
+
+ /*!
+@@ -421,14 +573,14 @@
+
+ Returns stat_t of entry if we found lsn, or NULL otherwise.
+ */
+-iso9660_stat_t *iso9660_find_ifs_lsn(const iso9660_t *iso, lsn_t lsn);
++iso9660_stat_t *iso9660_find_ifs_lsn(const iso9660_t *p_iso, lsn_t i_lsn);
+
+
+ /*!
+ Get file status for pathname into stat. NULL is returned on error.
+ */
+-iso9660_stat_t *iso9660_fs_stat (const CdIo *obj, const char pathname[],
+- bool is_mode2);
++iso9660_stat_t *iso9660_fs_stat (CdIo *p_cdio, const char pathname[]);
++
+
+ /*!
+ Get file status for pathname into stat. NULL is returned on error.
+@@ -436,14 +588,14 @@
+ name are dropped, i.e. ;1 is removed and if level 1 ISO-9660 names
+ are lowercased.
+ */
+-iso9660_stat_t *iso9660_fs_stat_translate (const CdIo *obj,
++iso9660_stat_t *iso9660_fs_stat_translate (CdIo *p_cdio,
+ const char pathname[],
+- bool is_mode2);
++ bool b_mode2);
+
+ /*!
+ Get file status for pathname into stat. NULL is returned on error.
+ */
+-void *iso9660_ifs_stat (iso9660_t *iso, const char pathname[]);
++iso9660_stat_t *iso9660_ifs_stat (iso9660_t *p_iso, const char pathname[]);
+
+
+ /*!
+@@ -452,28 +604,46 @@
+ name are dropped, i.e. ;1 is removed and if level 1 ISO-9660 names
+ are lowercased.
+ */
+-void *iso9660_ifs_stat_translate (iso9660_t *iso, const char pathname[]);
+-
+-
++iso9660_stat_t *iso9660_ifs_stat_translate (iso9660_t *p_iso,
++ const char pathname[]);
+
+ /*!
+ Read pathname (a directory) and return a list of iso9660_stat_t
+ of the files inside that. The caller must free the returned result.
+ */
+-void * iso9660_fs_readdir (const CdIo *obj, const char pathname[], bool mode2);
++CdioList * iso9660_fs_readdir (CdIo *p_cdio, const char pathname[],
++ bool b_mode2);
+
+ /*!
+ Read pathname (a directory) and return a list of iso9660_stat_t
+ of the files inside that. The caller must free the returned result.
+ */
+-void * iso9660_ifs_readdir (iso9660_t *iso, const char pathname[]);
++CdioList * iso9660_ifs_readdir (iso9660_t *p_iso, const char pathname[]);
+
+-uint8_t iso9660_get_dir_len(const iso9660_dir_t *idr);
++/*!
++ Return the PVD's application ID.
++ NULL is returned if there is some problem in getting this.
++*/
++char * iso9660_get_application_id(iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the application ID. psz_app_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_application_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_app_id);
++
++/*!
++ Return the Joliet level recognized for p_iso.
++*/
++uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso);
++
++uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr);
+
+ #if FIXME
+-uint8_t iso9660_get_dir_size(const iso9660_dir_t *idr);
++uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr);
+
+-lsn_t iso9660_get_dir_extent(const iso9660_dir_t *idr);
++lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
+ #endif
+
+ /*!
+@@ -481,25 +651,90 @@
+
+ A string is allocated: the caller must deallocate.
+ */
+-char * iso9660_dir_to_name (const iso9660_dir_t *iso9660_dir);
++char * iso9660_dir_to_name (const iso9660_dir_t *p_iso9660_dir);
+
+-uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *pvd);
++/*!
++ Return a string containing the preparer id with trailing
++ blanks removed.
++*/
++char *iso9660_get_preparer_id(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the preparer ID. psz_preparer_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_preparer_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_preparer_id);
++
++/*!
++ Return a string containing the PVD's publisher id with trailing
++ blanks removed.
++*/
++char *iso9660_get_publisher_id(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the publisher ID. psz_publisher_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_publisher_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_publisher_id);
++
++uint8_t iso9660_get_pvd_type(const iso9660_pvd_t *p_pvd);
+
+-const char * iso9660_get_pvd_id(const iso9660_pvd_t *pvd);
++const char * iso9660_get_pvd_id(const iso9660_pvd_t *p_pvd);
+
+-int iso9660_get_pvd_space_size(const iso9660_pvd_t *pvd);
++int iso9660_get_pvd_space_size(const iso9660_pvd_t *p_pvd);
+
+-int iso9660_get_pvd_block_size(const iso9660_pvd_t *pvd) ;
++int iso9660_get_pvd_block_size(const iso9660_pvd_t *p_pvd) ;
+
+ /*! Return the primary volume id version number (of pvd).
+ If there is an error 0 is returned.
+ */
+ int iso9660_get_pvd_version(const iso9660_pvd_t *pvd) ;
+
++/*!
++ Return a string containing the PVD's system id with trailing
++ blanks removed.
++*/
++char *iso9660_get_system_id(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the system ID. psz_system_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_system_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_system_id);
++
++
+ /*! Return the LSN of the root directory for pvd.
+ If there is an error CDIO_INVALID_LSN is returned.
+ */
+-lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *pvd);
++lsn_t iso9660_get_root_lsn(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Return the PVD's volume ID.
++*/
++char *iso9660_get_volume_id(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the system ID. psz_system_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_volume_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_volume_id);
++
++/*!
++ Return the PVD's volumeset ID.
++ NULL is returned if there is some problem in getting this.
++*/
++char *iso9660_get_volumeset_id(const iso9660_pvd_t *p_pvd);
++
++/*!
++ Get the systemset ID. psz_systemset_id is set to NULL if there
++ is some problem in getting this and false is returned.
++*/
++bool iso9660_ifs_get_volumeset_id(iso9660_t *p_iso,
++ /*out*/ char **p_psz_volumeset_id);
+
+ /* pathtable */
+
+@@ -530,6 +765,12 @@
+ void
+ iso9660_set_evd (void *pd);
+
++/*!
++ Return true if ISO 9660 image has extended attrributes (XA).
++*/
++bool iso9660_ifs_is_xa (const iso9660_t * p_iso);
++
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+--- ./src/input/vcd/libcdio/cdio/logging.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/logging.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,8 +1,8 @@
+ /*
+- $Id: logging.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: logging.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000, Herbert Valerio Riedel <hvr@gnu.org>
+- Copyright (C) 2003, Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -29,6 +29,10 @@
+
+ #include <cdio/types.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /**
+ * The different log levels supported.
+ */
+@@ -75,7 +79,7 @@
+ cdio_log_handler_t cdio_log_set_handler (cdio_log_handler_t new_handler);
+
+ /**
+- * Handle an message with the given log level
++ * Handle an message with the given log level.
+ *
+ * @see cdio_debug
+ * @see cdio_info
+@@ -111,12 +115,16 @@
+ void cdio_warn (const char format[], ...) GNUC_PRINTF(1,2);
+
+ /**
+- * Handle an error message.
++ * Handle an error message. Execution is terminated.
+ *
+ * @see cdio_log for a more generic routine.
+ */
+ void cdio_error (const char format[], ...) GNUC_PRINTF(1,2);
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* __LOGGING_H__ */
+
+
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/cdio/scsi_mmc.h 1 Jan 2005 02:43:58 -0000 1.1.2.1
+@@ -0,0 +1,415 @@
++/*
++ $Id: scsi_mmc.h,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
++
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/*!
++ \file scsi_mmc.h
++ \brief Common definitions for SCSI MMC (Multi-Media Commands).
++*/
++
++#ifndef __SCSI_MMC_H__
++#define __SCSI_MMC_H__
++
++#include <cdio/cdio.h>
++#include <cdio/types.h>
++#include <cdio/dvd.h>
++
++/*! The generic packet command opcodes for CD/DVD Logical Units. */
++
++#define CDIO_MMC_GPCMD_INQUIRY 0x12
++#define CDIO_MMC_GPCMD_MODE_SELECT_6 0x15
++#define CDIO_MMC_GPCMD_MODE_SENSE 0x1a
++#define CDIO_MMC_GPCMD_START_STOP 0x1b
++#define CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL 0x1e
++#define CDIO_MMC_GPCMD_READ_10 0x28
++
++/*!
++ Group 2 Commands
++ */
++#define CDIO_MMC_GPCMD_READ_SUBCHANNEL 0x42
++#define CDIO_MMC_GPCMD_READ_TOC 0x43
++#define CDIO_MMC_GPCMD_READ_HEADER 0x44
++#define CDIO_MMC_GPCMD_PLAY_AUDIO_10 0x45
++#define CDIO_MMC_GPCMD_GET_CONFIGURATION 0x46
++#define CDIO_MMC_GPCMD_PLAY_AUDIO_MSF 0x47
++#define CDIO_MMC_GPCMD_PLAY_AUDIO_TI 0x48
++#define CDIO_MMC_GPCMD_PLAY_TRACK_REL_10 0x49
++#define CDIO_MMC_GPCMD_PAUSE_RESUME 0x4b
++
++#define CDIO_MMC_GPCMD_READ_DISC_INFO 0x51
++#define CDIO_MMC_GPCMD_MODE_SELECT 0x55
++#define CDIO_MMC_GPCMD_MODE_SENSE_10 0x5a
++
++/*!
++ Group 5 Commands
++ */
++#define CDIO_MMC_GPCMD_PLAY_AUDIO_12 0xa5
++#define CDIO_MMC_GPCMD_READ_12 0xa8
++#define CDIO_MMC_GPCMD_PLAY_TRACK_REL_12 0xa9
++#define CDIO_MMC_GPCMD_READ_DVD_STRUCTURE 0xad
++#define CDIO_MMC_GPCMD_READ_CD 0xbe
++#define CDIO_MMC_GPCMD_READ_MSF 0xb9
++
++/*!
++ Group 6 Commands
++ */
++
++#define CDIO_MMC_GPCMD_CD_PLAYBACK_STATUS 0xc4 /**< SONY unique command */
++#define CDIO_MMC_GPCMD_PLAYBACK_CONTROL 0xc9 /**< SONY unique command */
++#define CDIO_MMC_GPCMD_READ_CDDA 0xd8 /**< Vendor unique command */
++#define CDIO_MMC_GPCMD_READ_CDXA 0xdb /**< Vendor unique command */
++#define CDIO_MMC_GPCMD_READ_ALL_SUBCODES 0xdf /**< Vendor unique command */
++
++
++
++/*! Level values that can go into READ_CD */
++#define CDIO_MMC_READ_TYPE_ANY 0 /**< All types */
++#define CDIO_MMC_READ_TYPE_CDDA 1 /**< Only CD-DA sectors */
++#define CDIO_MMC_READ_TYPE_MODE1 2 /**< mode1 sectors (user data = 2048) */
++#define CDIO_MMC_READ_TYPE_MODE2 3 /**< mode2 sectors form1 or form2 */
++#define CDIO_MMC_READ_TYPE_M2F1 4 /**< mode2 sectors form1 */
++#define CDIO_MMC_READ_TYPE_M2F2 5 /**< mode2 sectors form2 */
++
++/*! Format values for READ_TOC */
++#define CDIO_MMC_READTOC_FMT_TOC 0
++#define CDIO_MMC_READTOC_FMT_SESSION 1
++#define CDIO_MMC_READTOC_FMT_FULTOC 2
++#define CDIO_MMC_READTOC_FMT_PMA 3 /**< Q subcode data */
++#define CDIO_MMC_READTOC_FMT_ATIP 4 /**< includes media type */
++#define CDIO_MMC_READTOC_FMT_CDTEXT 5 /**< CD-TEXT info */
++
++/*! Page codes for MODE SENSE and MODE SET. */
++#define CDIO_MMC_R_W_ERROR_PAGE 0x01
++#define CDIO_MMC_WRITE_PARMS_PAGE 0x05
++#define CDIO_MMC_AUDIO_CTL_PAGE 0x0e
++#define CDIO_MMC_CDR_PARMS_PAGE 0x0d
++#define CDIO_MMC_POWER_PAGE 0x1a
++#define CDIO_MMC_FAULT_FAIL_PAGE 0x1c
++#define CDIO_MMC_TO_PROTECT_PAGE 0x1d
++#define CDIO_MMC_CAPABILITIES_PAGE 0x2a
++#define CDIO_MMC_ALL_PAGES 0x3f
++
++/*! Return type codes for GET_CONFIGURATION. */
++#define CDIO_MMC_GET_CONF_ALL_FEATURES 0 /**< all features without regard
++ to currency. */
++#define CDIO_MMC_GET_CONF_CURRENT_FEATURES 1 /**< features which are currently
++ in effect (e.g. based on
++ medium inserted). */
++#define CDIO_MMC_GET_CONF_NAMED_FEATURE 2 /**< just the feature named in
++ the GET_CONFIGURATION
++ cdb. */
++
++/*! FEATURE codes used in GET CONFIGURATION. */
++
++#define CDIO_MMC_FEATURE_PROFILE_LIST 0x000 /**< Profile List Feature */
++#define CDIO_MMC_FEATURE_CORE 0x001
++#define CDIO_MMC_FEATURE_REMOVABLE_MEDIUM 0x002 /**< Removable Medium
++ Feature */
++#define CDIO_MMC_FEATURE_WRITE_PROTECT 0x003 /**< Write Protect
++ Feature */
++#define CDIO_MMC_FEATURE_RANDOM_READABLE 0x010 /**< Random Readable
++ Feature */
++#define CDIO_MMC_FEATURE_MULTI_READ 0x01D /**< Multi-Read
++ Feature */
++#define CDIO_MMC_FEATURE_CD_READ 0x01E /**< CD Read
++ Feature */
++#define CDIO_MMC_FEATURE_DVD_READ 0x01F /**< DVD Read
++ Feature */
++#define CDIO_MMC_FEATURE_RANDOM_WRITABLE 0x020 /**< Random Writable
++ Feature */
++#define CDIO_MMC_FEATURE_INCR_WRITE 0x021 /**< Incremental
++ Streaming Writable
++ Feature */
++#define CDIO_MMC_FEATURE_SECTOR_ERASE 0x022 /**< Sector Erasable
++ Feature */
++#define CDIO_MMC_FEATURE_FORMATABLE 0x023 /**< Formattable
++ Feature */
++#define CDIO_MMC_FEATURE_DEFECT_MGMT 0x024 /**< Management
++ Ability of the
++ Logical Unit/media
++ system to provide
++ an apparently
++ defect-free
++ space.*/
++#define CDIO_MMC_FEATURE_WRITE_ONCE 0x025 /**< Write Once
++ Feature */
++#define CDIO_MMC_FEATURE_RESTRICT_OVERW 0x026 /**< Restricted
++ Overwrite
++ Feature */
++#define CDIO_MMC_FEATURE_CD_RW_CAV 0x027 /**< CD-RW CAV Write
++ Feature */
++#define CDIO_MMC_FEATURE_MRW 0x028 /**< MRW Feature */
++#define CDIO_MMC_FEATURE_DVD_PRW 0x02A /**< DVD+RW Feature */
++#define CDIO_MMC_FEATURE_DVD_PR 0x02B /**< DVD+R Feature */
++#define CDIO_MMC_FEATURE_CD_TAO 0x02D
++#define CDIO_MMC_FEATURE_CD_SAO 0x02E
++#define CDIO_MMC_FEATURE_POWER_MGMT 0x100 /**< Initiator and
++ device directed
++ power management */
++#define CDIO_MMC_FEATURE_CDDA_EXT_PLAY 0x103 /**< Ability to play
++ audio CDs via the
++ Logical Unit s own
++ analog output */
++#define CDIO_MMC_FEATURE_MCODE_UPGRADE 0x104 /* Ability for the
++ device to accept
++ new microcode via
++ the interface */
++#define CDIO_MMC_FEATURE_TIME_OUT 0x105 /**< Ability to
++ respond to all
++ commands within a
++ specific time */
++#define CDIO_MMC_FEATURE_DVD_CSS 0x106 /**< Ability to
++ perform DVD
++ CSS/CPPM
++ authentication and
++ RPC */
++#define CDIO_MMC_FEATURE_RT_STREAMING 0x107 /**< Ability to read
++ and write using
++ Initiator requested
++ performance
++ parameters
++ */
++#define CDIO_MMC_FEATURE_LU_SN 0x108 /**< The Logical Unit
++ has a unique
++ identifier. */
++#define CDIO_MMC_FEATURE_FIRMWARE_DATE 0x1FF /**< Firmware creation
++ date report */
++
++/*! Profile codes used in GET_CONFIGURATION - PROFILE LIST. */
++#define CDIO_MMC_FEATURE_PROF_NON_REMOVABLE 0x0001 /**< Re-writable
++ disk, capable of
++ changing
++ behavior */
++#define CDIO_MMC_FEATURE_PROF_REMOVABLE 0x0002 /**< disk
++ Re-writable;
++ with removable
++ media */
++#define CDIO_MMC_FEATURE_PROF_MO_ERASABLE 0x0003 /**< Erasable
++ Magneto-Optical
++ disk with sector
++ erase
++ capability */
++#define CDIO_MMC_FEATURE_PROF_MO_WRITE_ONCE 0x0004 /**< Write Once
++ Magneto-Optical
++ write once */
++#define CDIO_MMC_FEATURE_PROF_AS_MO 0x0005 /**< Advance
++ Storage
++ Magneto-Optical */
++#define CDIO_MMC_FEATURE_PROF_CD_ROM 0x0008 /**< Read only
++ Compact Disc
++ capable */
++#define CDIO_MMC_FEATURE_PROF_CD_R 0x0009 /**< Write once
++ Compact Disc
++ capable */
++#define CDIO_MMC_FEATURE_PROF_CD_RW 0x000A /**< CD-RW
++ Re-writable
++ Compact Disc
++ capable */
++#define CDIO_MMC_FEATURE_PROF_DVD_ROM 0x0010 /**< Read only
++ DVD */
++#define CDIO_MMC_FEATURE_PROF_DVD_R_SEQ 0x0011 /**< Re-recordable
++ DVD using
++ Sequential
++ recording */
++#define CDIO_MMC_FEATURE_PROF_DVD_RAM 0x0012 /**< Re-writable
++ DVD */
++#define CDIO_MMC_FEATURE_PROF_DVD_RW_RO 0x0013 /**< Re-recordable
++ DVD using
++ Restricted
++ Overwrite */
++#define CDIO_MMC_FEATURE_PROF_DVD_RW_SEQ 0x0014 /**< Re-recordable
++ DVD using
++ Sequential
++ recording */
++#define CDIO_MMC_FEATURE_PROF_DVD_PRW 0x001A /**< DVD+RW - DVD
++ ReWritable */
++#define CDIO_MMC_FEATURE_PROF_DVD_PR 0x001B /**< DVD+R - DVD
++ Recordable */
++#define CDIO_MMC_FEATURE_PROF_DDCD_ROM 0x0020 /**< Read only
++ DDCD */
++#define CDIO_MMC_FEATURE_PROF_DDCD_R 0x0021 /**< DDCD-R Write
++ only DDCD */
++#define CDIO_MMC_FEATURE_PROF_DDCD_RW 0x0022 /**< Re-Write only
++ DDCD */
++#define CDIO_MMC_FEATURE_PROF_NON_CONFORM 0xFFFF /**< The Logical
++ Unit does not
++ conform to any
++ Profile. */
++
++/*! This is listed as optional in ATAPI 2.6, but is (curiously)
++ missing from Mt. Fuji, Table 57. It _is_ mentioned in Mt. Fuji
++ Table 377 as an MMC command for SCSi devices though... Most ATAPI
++ drives support it. */
++#define CDIO_MMC_GPCMD_SET_SPEED 0xbb
++
++
++/*! The largest Command Descriptor Buffer (CDB) size.
++ The possible sizes are 6, 10, and 12 bytes.
++ */
++#define MAX_CDB_LEN 12
++
++/*! \brief A Command Descriptor Buffer (CDB) used in sending SCSI MMC
++ commands.
++ */
++typedef struct scsi_mmc_cdb {
++ uint8_t field[MAX_CDB_LEN];
++} scsi_mmc_cdb_t;
++
++/*! \brief Format of header block in data returned from a SCSI-MMC
++ GET_CONFIGURATION command.
++ */
++typedef struct scsi_mmc_feature_list_header {
++ unsigned char length_msb;
++ unsigned char length_1sb;
++ unsigned char length_2sb;
++ unsigned char length_lsb;
++ unsigned char reserved1;
++ unsigned char reserved2;
++ unsigned char profile_msb;
++ unsigned char profile_lsb;
++} scs_mmc_feature_list_header_t;
++
++/*! An enumeration indicating whether a SCSI MMC command is sending
++ data or getting data.
++ */
++typedef enum scsi_mmc_direction {
++ SCSI_MMC_DATA_READ,
++ SCSI_MMC_DATA_WRITE
++} scsi_mmc_direction_t;
++
++#define CDIO_MMC_SET_COMMAND(cdb, command) \
++ cdb[0] = command
++
++#define CDIO_MMC_SET_READ_TYPE(cdb, sector_type) \
++ cdb[1] = (sector_type << 2)
++
++#define CDIO_MMC_GET_LEN16(p) \
++ (p[0]<<8) + p[1]
++
++#define CDIO_MMC_GET_LEN32(p) \
++ (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3];
++
++#define CDIO_MMC_SET_LEN16(cdb, pos, len) \
++ cdb[pos ] = (len >> 8) & 0xff; \
++ cdb[pos+1] = (len ) & 0xff
++
++#define CDIO_MMC_SET_READ_LBA(cdb, lba) \
++ cdb[2] = (lba >> 24) & 0xff; \
++ cdb[3] = (lba >> 16) & 0xff; \
++ cdb[4] = (lba >> 8) & 0xff; \
++ cdb[5] = (lba ) & 0xff
++
++#define CDIO_MMC_SET_START_TRACK(cdb, command) \
++ cdb[6] = command
++
++#define CDIO_MMC_SET_READ_LENGTH24(cdb, len) \
++ cdb[6] = (len >> 16) & 0xff; \
++ cdb[7] = (len >> 8) & 0xff; \
++ cdb[8] = (len ) & 0xff
++
++#define CDIO_MMC_SET_READ_LENGTH16(cdb, len) \
++ CDIO_MMC_SET_LEN16(cdb, 7, len)
++
++#define CDIO_MMC_SET_READ_LENGTH8(cdb, len) \
++ cdb[8] = (len ) & 0xff
++
++#define CDIO_MMC_MCSB_ALL_HEADERS 0x78
++
++#define CDIO_MMC_SET_MAIN_CHANNEL_SELECTION_BITS(cdb, val) \
++ cdb[9] = val;
++
++/*!
++ Return the number of length in bytes of the Command Descriptor
++ buffer (CDB) for a given SCSI MMC command. The length will be
++ either 6, 10, or 12.
++*/
++uint8_t scsi_mmc_get_cmd_len(uint8_t scsi_cmd);
++
++
++/*!
++ Run a SCSI MMC command.
++
++ cdio CD structure set by cdio_open().
++ i_timeout_ms time in milliseconds we will wait for the command
++ to complete.
++ p_cdb CDB bytes. All values that are needed should be set on
++ input. We'll figure out what the right CDB length should be.
++ e_direction direction the transfer is to go.
++ i_buf Size of buffer
++ p_buf Buffer for data, both sending and receiving.
++
++ Returns 0 if command completed successfully.
++ */
++int scsi_mmc_run_cmd( const CdIo *p_cdio, unsigned int i_timeout_ms,
++ const scsi_mmc_cdb_t *p_cdb,
++ scsi_mmc_direction_t e_direction, unsigned int i_buf,
++ /*in/out*/ void *p_buf );
++
++/*!
++ * Eject using SCSI MMC commands. Return 0 if successful.
++ */
++int scsi_mmc_eject_media( const CdIo *p_cdio);
++
++/*! Packet driver to read mode2 sectors.
++ Can read only up to 25 blocks.
++*/
++int scsi_mmc_read_sectors ( const CdIo *p_cdio, void *p_buf, lba_t lba,
++ int sector_type, unsigned int nblocks);
++
++/*!
++ Set the block size for subsequest read requests, via a SCSI MMC
++ MODE_SELECT 6 command.
++ */
++int scsi_mmc_set_blocksize ( const CdIo *p_cdio, unsigned int bsize);
++
++/*!
++ Return the the kind of drive capabilities of device.
++ */
++void scsi_mmc_get_drive_cap (const CdIo *p_cdio,
++ /*out*/ cdio_drive_read_cap_t *p_read_cap,
++ /*out*/ cdio_drive_write_cap_t *p_write_cap,
++ /*out*/ cdio_drive_misc_cap_t *p_misc_cap);
++
++/*!
++ Get the DVD type associated with cd object.
++*/
++discmode_t scsi_mmc_get_dvd_struct_physical ( const CdIo *p_cdio,
++ cdio_dvd_struct_t *s);
++
++/*!
++ Get the CD-ROM hardware info via a SCSI MMC INQUIRY command.
++ False is returned if we had an error getting the information.
++*/
++bool scsi_mmc_get_hwinfo ( const CdIo *p_cdio,
++ /* out*/ cdio_hwinfo_t *p_hw_info );
++
++
++/*!
++ Get the media catalog number (MCN) from the CD via MMC.
++
++ @return the media catalog number r NULL if there is none or we
++ don't have the ability to get it.
++
++ Note: string is malloc'd so caller has to free() the returned
++ string when done with it.
++
++*/
++char *scsi_mmc_get_mcn ( const CdIo *p_cdio );
++
++#endif /* __SCSI_MMC_H__ */
+--- ./src/input/vcd/libcdio/cdio/sector.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/sector.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,8 +1,8 @@
+ /*
+- $Id: sector.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: sector.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+- Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -67,7 +67,60 @@
+
+ #include <cdio/types.h>
+
+-#define CDIO_PREGAP_SECTORS 150
++/*! track modes (Table 350)
++ reference: MMC-3 draft revsion - 10g
++*/
++typedef enum {
++ AUDIO, /**< 2352 byte block length */
++ MODE1, /**< 2048 byte block length */
++ MODE1_RAW, /**< 2352 byte block length */
++ MODE2, /**< 2336 byte block length */
++ MODE2_FORM1, /**< 2048 byte block length */
++ MODE2_FORM2, /**< 2324 byte block length */
++ MODE2_FORM_MIX, /**< 2336 byte block length */
++ MODE2_RAW /**< 2352 byte block length */
++} trackmode_t;
++
++/*! disc modes. The first combined from MMC-3 5.29.2.8 (Send CUESHEET)
++ and GNU/Linux /usr/include/linux/cdrom.h and we've added DVD.
++ */
++typedef enum {
++ CDIO_DISC_MODE_CD_DA, /**< CD-DA */
++ CDIO_DISC_MODE_CD_DATA, /**< CD-ROM form 1 */
++ CDIO_DISC_MODE_CD_XA, /**< CD-ROM XA form2 */
++ CDIO_DISC_MODE_CD_MIXED, /**< Some combo of above. */
++ CDIO_DISC_MODE_DVD_ROM, /**< DVD ROM (e.g. movies) */
++ CDIO_DISC_MODE_DVD_RAM, /**< DVD-RAM */
++ CDIO_DISC_MODE_DVD_R, /**< DVD-R */
++ CDIO_DISC_MODE_DVD_RW, /**< DVD-RW */
++ CDIO_DISC_MODE_DVD_PR, /**< DVD+R */
++ CDIO_DISC_MODE_DVD_PRW, /**< DVD+RW */
++ CDIO_DISC_MODE_DVD_OTHER, /**< Unknown/unclassified DVD type */
++ CDIO_DISC_MODE_NO_INFO,
++ CDIO_DISC_MODE_ERROR
++} discmode_t;
++
++/*! Information that can be obtained through a Read Subchannel
++ command.
++ */
++#define CDIO_SUBCHANNEL_SUBQ_DATA 0
++#define CDIO_SUBCHANNEL_CURRENT_POSITION 1
++#define CDIO_SUBCHANNEL_MEDIA_CATALOG 2
++#define CDIO_SUBCHANNEL_TRACK_ISRC 3
++
++/*! track flags
++ * Q Sub-channel Control Field (4.2.3.3)
++ */
++typedef enum {
++ NONE = 0x00, /* no flags set */
++ PRE_EMPHASIS = 0x01, /* audio track recorded with pre-emphasis */
++ COPY_PERMITTED = 0x02, /* digital copy permitted */
++ DATA = 0x04, /* data track */
++ FOUR_CHANNEL_AUDIO = 0x08, /* 4 audio channels */
++ SCMS = 0x10 /* SCMS (5.29.2.7) */
++} flag_t;
++
++#define CDIO_PREGAP_SECTORS 150
+ #define CDIO_POSTGAP_SECTORS 150
+
+ /*
+@@ -75,25 +128,28 @@
+ This is from linux.h - not to slight other OS's. This was the first
+ place I came across such useful stuff.
+ */
+-#define CDIO_CD_MINS 74 /**< max. minutes per CD, not really
+- a limit */
+-#define CDIO_CD_SECS_PER_MIN 60 /**< seconds per minute */
+-#define CDIO_CD_FRAMES_PER_SEC 75 /**< frames per second */
+-#define CDIO_CD_SYNC_SIZE 12 /**< 12 sync bytes per raw data frame */
+-#define CDIO_CD_CHUNK_SIZE 24 /**< lowest-level "data bytes piece" */
+-#define CDIO_CD_NUM_OF_CHUNKS 98 /**< chunks per frame */
+-#define CDIO_CD_FRAMESIZE_SUB 96 /**< subchannel data "frame" size */
+-#define CDIO_CD_HEADER_SIZE 4 /**< header (address) bytes per raw
+- data frame */
+-#define CDIO_CD_SUBHEADER_SIZE 8 /**< subheader bytes per raw XA data frame */
+-#define CDIO_CD_EDC_SIZE 4 /**< bytes EDC per most raw data
+- frame types */
+-#define CDIO_CD_M1F1_ZERO_SIZE 8 /**< bytes zero per yellow book mode
+- 1 frame */
+-#define CDIO_CD_ECC_SIZE 276 /**< bytes ECC per most raw data frame types */
+-#define CDIO_CD_FRAMESIZE 2048 /**< bytes per frame, "cooked" mode */
+-#define CDIO_CD_FRAMESIZE_RAW 2352/**< bytes per frame, "raw" mode */
+-#define CDIO_CD_FRAMESIZE_RAWER 2646 /**< The maximum possible returned bytes */
++#define CDIO_CD_MINS 74 /**< max. minutes per CD, not really
++ a limit */
++#define CDIO_CD_SECS_PER_MIN 60 /**< seconds per minute */
++#define CDIO_CD_FRAMES_PER_SEC 75 /**< frames per second */
++#define CDIO_CD_SYNC_SIZE 12 /**< 12 sync bytes per raw data frame */
++#define CDIO_CD_CHUNK_SIZE 24 /**< lowest-level "data bytes piece" */
++#define CDIO_CD_NUM_OF_CHUNKS 98 /**< chunks per frame */
++#define CDIO_CD_FRAMESIZE_SUB 96 /**< subchannel data "frame" size */
++#define CDIO_CD_HEADER_SIZE 4 /**< header (address) bytes per raw
++ data frame */
++#define CDIO_CD_SUBHEADER_SIZE 8 /**< subheader bytes per raw XA data
++ frame */
++#define CDIO_CD_EDC_SIZE 4 /**< bytes EDC per most raw data
++ frame types */
++#define CDIO_CD_M1F1_ZERO_SIZE 8 /**< bytes zero per yellow book mode
++ 1 frame */
++#define CDIO_CD_ECC_SIZE 276 /**< bytes ECC per most raw data frame
++ types */
++#define CDIO_CD_FRAMESIZE 2048 /**< bytes per frame, "cooked" mode */
++#define CDIO_CD_FRAMESIZE_RAW 2352 /**< bytes per frame, "raw" mode */
++#define CDIO_CD_FRAMESIZE_RAWER 2646 /**< The maximum possible returned
++ bytes */
+ #define CDIO_CD_FRAMESIZE_RAW1 (CDIO_CD_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE) /*2340*/
+ #define CDIO_CD_FRAMESIZE_RAW0 (CDIO_CD_FRAMESIZE_RAW-CDIO_CD_SYNC_SIZE-CDIO_CD__HEAD_SIZE) /*2336*/
+
+@@ -106,22 +162,43 @@
+ /*! "before data" sync bytes + header of XA (green, mode2) frame */
+ #define CDIO_CD_XA_SYNC_HEADER (CDIO_CD_SYNC_SIZE+CDIO_CD_XA_HEADER)
+
+-/* CD-ROM address types (Linux cdrom_tocentry.cdte_format) */
++/*! CD-ROM address types (GNU/Linux e.g. cdrom_tocentry.cdte_format) */
+ #define CDIO_CDROM_LBA 0x01 /**< "logical block": first frame is #0 */
+ #define CDIO_CDROM_MSF 0x02 /**< "minute-second-frame": binary, not
+ BCD here! */
+
++/*! CD-ROM track format types (GNU/Linux cdte_ctrl) */
+ #define CDIO_CDROM_DATA_TRACK 0x04
++#define CDIO_CDROM_CDI_TRACK 0x10
++#define CDIO_CDROM_XA_TRACK 0x20
+
+-/*! The leadout track is always 0xAA, regardless of # of tracks on disc */
++/*! The leadout track is always 0xAA, regardless of # of tracks on
++ disc, or what value may be used internally. For example although
++ OS X uses a different value for the lead-out track internally than
++ given below, programmers should use CDIO_CDROM_LEADOUT_TRACK and
++ not worry about this.
++ */
+ #define CDIO_CDROM_LEADOUT_TRACK 0xAA
+
+ #define M2F2_SECTOR_SIZE 2324
+ #define M2SUB_SECTOR_SIZE 2332
+ #define M2RAW_SECTOR_SIZE 2336
+
+-#define CDIO_CD_MAX_TRACKS 99
+-#define CDIO_CD_MIN_TRACK_NO 1
++/*! Largest CD track number */
++#define CDIO_CD_MAX_TRACKS 99
++/*! Smallest CD track number */
++#define CDIO_CD_MIN_TRACK_NO 1
++
++/*! Largest CD session number */
++#define CDIO_CD_MAX_SESSIONS 99
++/*! Smallest CD session number */
++#define CDIO_CD_MIN_SESSION_NO 1
++
++/*! Largest LSN in a CD */
++#define CDIO_CD_MAX_LSN 450150
++/*! Smallest LSN in a CD */
++#define CDIO_CD_MIN_LSN -450150
++
+
+ #define CDIO_CD_FRAMES_PER_MIN \
+ (CDIO_CD_FRAMES_PER_SEC*CDIO_CD_SECS_PER_MIN)
+@@ -141,6 +218,11 @@
+ char *cdio_lba_to_msf_str (lba_t lba);
+
+ /*!
++ Convert an MSF into a string representation of the MSF.
++ \warning cdio_msf_to_msf_str returns new allocated string */
++char *cdio_msf_to_str (const msf_t *msf);
++
++/*!
+ Convert an LBA into the corresponding LSN.
+ */
+ lba_t cdio_lba_to_lsn (lba_t lba);
+@@ -152,6 +234,7 @@
+
+ /*!
+ Convert an LSN into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
+ */
+ lba_t cdio_lsn_to_lba (lsn_t lsn);
+
+@@ -162,20 +245,75 @@
+
+ /*!
+ Convert a MSF into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
+ */
+-lba_t
+-cdio_msf_to_lba (const msf_t *msf);
++lba_t cdio_msf_to_lba (const msf_t *msf);
+
+ /*!
+ Convert a MSF into the corresponding LSN.
++ CDIO_INVALID_LSN is returned if there is an error.
+ */
+-lsn_t
+-cdio_msf_to_lsn (const msf_t *msf);
++lsn_t cdio_msf_to_lsn (const msf_t *msf);
++
++/*!
++ Convert a MSF - broken out as 3 integer components into the
++ corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
++lba_t cdio_msf3_to_lba (unsigned int minutes, unsigned int seconds,
++ unsigned int frames);
++
++/*!
++ Convert a string of the form MM:SS:FF into the corresponding LBA.
++ CDIO_INVALID_LBA is returned if there is an error.
++*/
++lba_t cdio_mmssff_to_lba (const char *psz_mmssff);
++
++/*!
++ Return true if discmode is some sort of CD.
++*/
++bool cdio_is_discmode_cdrom (discmode_t discmode);
++
++/*!
++ Return true if discmode is some sort of DVD.
++*/
++bool cdio_is_discmode_dvd (discmode_t discmode);
++
+
+ #ifdef __cplusplus
+ }
+ #endif
+
++static inline bool discmode_is_cd(discmode_t discmode)
++{
++ switch (discmode) {
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ return true;
++ default:
++ return false;
++ }
++}
++
++static inline bool discmode_is_dvd(discmode_t discmode)
++{
++ switch (discmode) {
++ case CDIO_DISC_MODE_DVD_ROM:
++ case CDIO_DISC_MODE_DVD_RAM:
++ case CDIO_DISC_MODE_DVD_R:
++ case CDIO_DISC_MODE_DVD_RW:
++ case CDIO_DISC_MODE_DVD_PR:
++ case CDIO_DISC_MODE_DVD_PRW:
++ case CDIO_DISC_MODE_DVD_OTHER:
++ return true;
++ default:
++ return false;
++ }
++}
++
++
+ #endif /* _CDIO_SECTOR_H_ */
+
+
+--- ./src/input/vcd/libcdio/cdio/types.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/types.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: types.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: types.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -106,11 +106,11 @@
+ {
+ false = 0,
+ true = 1
+- } _Bool;
++ } _cdio_Bool;
+
+ # define false false
+ # define true true
+-# define bool _Bool
++# define bool _cdio_Bool
+ # endif
+ #endif
+
+@@ -204,16 +204,21 @@
+ typedef uint8_t bitfield_t;
+ #endif
+
+- /*! The type of a Logical Block Address.
++ /*! The type of a Logical Block Address. We allow for an lba to be
++ negative to be consistent with an lba, although I'm not sure this
++ this is possible.
++
++ */
++ typedef int32_t lba_t;
++
++ /*! The type of a Logical Sector Number. Note that an lba lsn be negative
++ and the MMC3 specs allow for a conversion of a negative lba
+
+ @see msf_t
+ */
+- typedef uint32_t lba_t;
++ typedef int32_t lsn_t;
+
+- /*! The type of an Logical Sector Number. */
+- typedef uint32_t lsn_t;
+-
+- /*! The type of an track number 0..99. */
++ /*! The type of a track number 0..99. */
+ typedef uint8_t track_t;
+
+ /*!
+@@ -221,17 +226,142 @@
+ */
+ #define CDIO_INVALID_TRACK 0xFF
+
++ /*! The type of a session number 0..99. */
++ typedef uint8_t session_t;
++
++ /*!
++ Constant for invalid session number
++ */
++#define CDIO_INVALID_SESSION 0xFF
++
+ /*!
+- Constant for invalid LBA
++ Constant for invalid LBA. It is 151 less than the most negative
++ LBA -45150. This provide slack for the 150-frame offset in
++ LBA to LSN 150 conversions
+ */
+-#define CDIO_INVALID_LBA 0xFFFFFFFF
++#define CDIO_INVALID_LBA -45301
+
+ /*!
+ Constant for invalid LSN
+ */
+-#define CDIO_INVALID_LSN 0xFFFFFFFF
++#define CDIO_INVALID_LSN CDIO_INVALID_LBA
++
++ /*!
++ Number of ASCII bytes in a media catalog number (MCN).
++ */
++#define CDIO_MCN_SIZE 13
++
++ /*!
++ Type to hold ASCII bytes in a media catalog number (MCN).
++ We include an extra 0 byte so these can be used as C strings.
++ */
++ typedef char cdio_mcn_t[CDIO_MCN_SIZE+1];
++
++
++ /*!
++ Number of ASCII bytes in International Standard Recording Codes (ISRC)
++ */
++#define CDIO_ISRC_SIZE 12
++
++ /*!
++ Type to hold ASCII bytes in a media catalog number (MCN).
++ We include an extra 0 byte so these can be used as C strings.
++ */
++ typedef char cdio_isrc_t[CDIO_ISRC_SIZE+1];
++
++ typedef int cdio_fs_anal_t;
+
+-typedef int cdio_fs_anal_t;
++ /*! The type of an drive capability bit mask. See below for values*/
++ typedef uint32_t cdio_drive_read_cap_t;
++ typedef uint32_t cdio_drive_write_cap_t;
++ typedef uint32_t cdio_drive_misc_cap_t;
++
++ /*!
++ \brief Drive types returned by cdio_get_drive_cap()
++
++ NOTE: Setting a bit here means the presence of a capability.
++ */
++
++#define CDIO_DRIVE_CAP_ERROR 0x40000 /**< Error */
++#define CDIO_DRIVE_CAP_UNKNOWN 0x80000 /**< Dunno. It can be on if we
++ have only partial information
++ or are not completely certain
++ */
++
++#define CDIO_DRIVE_CAP_MISC_CLOSE_TRAY 0x00001 /**< caddy systems can't
++ close... */
++#define CDIO_DRIVE_CAP_MISC_EJECT 0x00002 /**< but can eject. */
++#define CDIO_DRIVE_CAP_MISC_LOCK 0x00004 /**< disable manual eject */
++#define CDIO_DRIVE_CAP_MISC_SELECT_SPEED 0x00008 /**< programmable speed */
++#define CDIO_DRIVE_CAP_MISC_SELECT_DISC 0x00010 /**< select disc from
++ juke-box */
++#define CDIO_DRIVE_CAP_MISC_MULTI_SESSION 0x00020 /**< read sessions>1 */
++#define CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED 0x00080 /**< media changed */
++#define CDIO_DRIVE_CAP_MISC_RESET 0x00100 /**< hard reset device */
++#define CDIO_DRIVE_CAP_MCN 0x00200 /**< can read MCN */
++#define CDIO_DRIVE_CAP_ISRC 0x00200 /**< can read ISRC */
++#define CDIO_DRIVE_CAP_MISC_FILE 0x20000 /**< drive is really a file,
++ i.e a CD file image */
++
++ /*! Reading masks.. */
++#define CDIO_DRIVE_CAP_READ_AUDIO 0x00001 /**< drive can play CD audio */
++#define CDIO_DRIVE_CAP_READ_CD_DA 0x00002 /**< drive can read CD-DA */
++#define CDIO_DRIVE_CAP_READ_CD_G 0x00004 /**< drive can read CD+G */
++#define CDIO_DRIVE_CAP_READ_CD_R 0x00008 /**< drive can read CD-R */
++#define CDIO_DRIVE_CAP_READ_CD_RW 0x00010 /**< drive can read CD-RW */
++#define CDIO_DRIVE_CAP_READ_DVD_R 0x00020 /**< drive can read DVD-R */
++#define CDIO_DRIVE_CAP_READ_DVD_PR 0x00040 /**< drive can read DVD+R */
++#define CDIO_DRIVE_CAP_READ_DVD_RAM 0x00080 /**< drive can read DVD-RAM */
++#define CDIO_DRIVE_CAP_READ_DVD_ROM 0x00100 /**< drive can read DVD-ROM */
++#define CDIO_DRIVE_CAP_READ_DVD_RW 0x00200 /**< drive can read DVD-RW */
++#define CDIO_DRIVE_CAP_READ_DVD_RPW 0x00400 /**< drive can read DVD+RW */
++#define CDIO_DRIVE_CAP_READ_C2_ERRS 0x00800 /**< has C2 error correction */
++
++ /*! Writing masks.. */
++#define CDIO_DRIVE_CAP_WRITE_CD_R 0x00001 /**< drive can write CD-R */
++#define CDIO_DRIVE_CAP_WRITE_CD_RW 0x00002 /**< drive can write CD-R */
++#define CDIO_DRIVE_CAP_WRITE_DVD_R 0x00004 /**< drive can write DVD-R */
++#define CDIO_DRIVE_CAP_WRITE_DVD_PR 0x00008 /**< drive can write DVD+R */
++#define CDIO_DRIVE_CAP_WRITE_DVD_RAM 0x00010 /**< drive can write DVD-RAM */
++#define CDIO_DRIVE_CAP_WRITE_DVD_RW 0x00020 /**< drive can write DVD-RW */
++#define CDIO_DRIVE_CAP_WRITE_DVD_RPW 0x00040 /**< drive can write DVD+RW */
++#define CDIO_DRIVE_CAP_WRITE_MT_RAINIER 0x00080 /**< Mount Rainier */
++#define CDIO_DRIVE_CAP_WRITE_BURN_PROOF 0x00100 /**< burn proof */
++
++/**< Masks derived from above... */
++#define CDIO_DRIVE_CAP_WRITE_CD ( \
++ CDIO_DRIVE_CAP_WRITE_CD_R \
++ | CDIO_DRIVE_CAP_WRITE_CD_RW \
++ )
++/**< Has some sort of CD writer ability */
++
++/**< Masks derived from above... */
++#define CDIO_DRIVE_CAP_WRITE_DVD ( \
++ | CDIO_DRIVE_CAP_WRITE_DVD_R \
++ | CDIO_DRIVE_CAP_WRITE_DVD_PR \
++ | CDIO_DRIVE_CAP_WRITE_DVD_RAM \
++ | CDIO_DRIVE_CAP_WRITE_DVD_RW \
++ | CDIO_DRIVE_CAP_WRITE_DVD_RPW \
++ )
++/**< Has some sort of DVD writer ability */
++
++#define CDIO_DRIVE_CAP_WRITE \
++ (CDIO_DRIVE_CAP_WRITE_CD | CDIO_DRIVE_CAP_WRITE_DVD)
++/**< Has some sort of DVD or CD writing ability */
++
++ /*!
++ track flags
++ Q Sub-channel Control Field (4.2.3.3)
++ */
++ typedef enum {
++ CDIO_TRACK_FLAG_NONE = 0x00, /**< no flags set */
++ CDIO_TRACK_FLAG_PRE_EMPHASIS = 0x01, /**< audio track recorded with
++ pre-emphasis */
++ CDIO_TRACK_FLAG_COPY_PERMITTED = 0x02, /**< digital copy permitted */
++ CDIO_TRACK_FLAG_DATA = 0x04, /**< data track */
++ CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO = 0x08, /**< 4 audio channels */
++ CDIO_TRACK_FLAG_SCMS = 0x10 /**< SCMS (5.29.2.7) */
++} cdio_track_flag;
+
+ #ifdef __cplusplus
+ }
+--- ./src/input/vcd/libcdio/cdio/util.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/util.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,7 +1,8 @@
+ /*
+- $Id: util.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: util.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -71,6 +72,16 @@
+ return offset;
+ }
+
++static inline const char *
++_cdio_bool_str (bool b)
++{
++ return b ? "yes" : "no";
++}
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void *
+ _cdio_malloc (size_t size);
+
+@@ -92,16 +103,26 @@
+ char **
+ _cdio_strsplit(const char str[], char delim);
+
+-static inline const char *
+-_cdio_bool_str (bool b)
+-{
+- return b ? "yes" : "no";
+-}
++uint8_t cdio_to_bcd8(uint8_t n);
++uint8_t cdio_from_bcd8(uint8_t p);
+
+-/* BCD */
++#if defined(__GNUC__) && __GNUC__ >= 3
++static inline __attribute__((deprecated))
++uint8_t to_bcd8(uint8_t n) {
++ return cdio_to_bcd8(n);
++}
++static inline __attribute__((deprecated))
++uint8_t from_bcd8(uint8_t p) {
++ return cdio_from_bcd8(p);
++}
++#else
++#define to_bcd8 cdio_to_bcd8
++#define from_bcd8 cdio_from_bcd8
++#endif
+
+-uint8_t to_bcd8(uint8_t n);
+-uint8_t from_bcd8(uint8_t p);
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __CDIO_UTIL_H__ */
+
+--- ./src/input/vcd/libcdio/cdio/xa.h 11 Apr 2004 12:20:31 -0000 1.2
++++ ./src/input/vcd/libcdio/cdio/xa.h 3 Jan 2005 21:13:59 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: xa.h,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
++ $Id: xa.h,v 1.2.2.1 2005/01/03 21:13:59 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+@@ -66,7 +66,7 @@
+ #define XA_FORM1_FILE (XA_ATTR_MODE2FORM1 | XA_PERM_ALL_ALL)
+ #define XA_FORM2_FILE (XA_ATTR_MODE2FORM2 | XA_PERM_ALL_ALL)
+
+-/*! \brief "Extended Architecture according t the Philips Yellow Book.
++/*! \brief "Extended Architecture according to the Philips Yellow Book.
+
+ CD-ROM EXtended Architecture is a modification to the CD-ROM
+ specification that defines two new types of sectors. CD-ROM XA was
+--- ./src/input/vcd/libcdio/image/bincue.c 11 Apr 2004 12:20:32 -0000 1.1
++++ ./src/input/vcd/libcdio/image/bincue.c 3 Jan 2005 21:13:59 -0000 1.1.2.1
+@@ -1,8 +1,10 @@
+ /*
+- $Id: bincue.c,v 1.1 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: bincue.c,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $
+
+- Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
++ cue parsing routine adapted from cuetools
++ Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -24,15 +26,16 @@
+ (*.cue).
+ */
+
+-static const char _rcsid[] = "$Id: bincue.c,v 1.1 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: bincue.c,v 1.1.2.1 2005/01/03 21:13:59 mroi Exp $";
+
++#include "image.h"
+ #include "cdio_assert.h"
+ #include "cdio_private.h"
+ #include "_cdio_stdio.h"
+
+ #include <cdio/logging.h>
+-#include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/version.h>
+
+ #ifdef HAVE_STDIO_H
+ #include <stdio.h>
+@@ -46,124 +49,81 @@
+ #ifdef HAVE_STRINGS_H
+ #include <strings.h>
+ #endif
++#ifdef HAVE_ERRNO_H
++#include <errno.h>
++#endif
+ #ifdef HAVE_GLOB_H
+ #include <glob.h>
+ #endif
+ #include <ctype.h>
+
+-/* FIXME: should put in a common definition somewhere. */
+-#ifdef HAVE_MEMSET
+-#define BZERO(ptr, size) memset(ptr, 0, size)
+-#elif HAVE_BZERO
+-#define BZERO(ptr, size) bzero(ptr, size)
+-#else
+- Error -- you need either memset or bzero
+-#endif
+-
++#include "portable.h"
+ /* reader */
+
+ #define DEFAULT_CDIO_DEVICE "videocd.bin"
+ #define DEFAULT_CDIO_CUE "videocd.cue"
+
+ typedef struct {
+- track_t track_num; /* Probably is index+1 */
+- msf_t start_msf;
+- lba_t start_lba;
+- int start_index;
+- int sec_count; /* Number of sectors in this track. Does not
+- include pregap */
+- int num_indices;
+- int flags; /* "DCP", "4CH", "PRE" */
+- track_format_t track_format;
+- bool track_green;
+- uint16_t datasize; /* How much is in the portion we return back? */
+- uint16_t datastart; /* Offset from begining that data starts */
+- uint16_t endsize; /* How much stuff at the end to skip over. This
+- stuff may have error correction (EDC, or ECC).*/
+- uint16_t blocksize; /* total block size = start + size + end */
+-
+-
+-} track_info_t;
+-
+-typedef struct {
+ /* Things common to all drivers like this.
+ This must be first. */
+ generic_img_private_t gen;
+ internal_position_t pos;
+
+- bool sector_2336; /* Playstation (PSX) uses 2336-byte sectors */
+-
+- char *cue_name;
+- char *mcn; /* Media catalog number. */
+- track_info_t tocent[100]; /* entry info for each track */
+- track_t total_tracks; /* number of tracks in image */
+- track_t first_track_num; /* track number of first track */
+- bool have_cue;
++ char *psz_cue_name;
++ char *psz_mcn; /* Media Catalog Number (5.22.3)
++ exactly 13 bytes */
++ track_info_t tocent[CDIO_CD_MAX_TRACKS+1]; /* entry info for each track
++ add 1 for leadout. */
++ discmode_t disc_mode;
+ } _img_private_t;
+
+-static bool _cdio_image_read_cue (_img_private_t *_obj);
+-static uint32_t _cdio_stat_size (void *env);
++static uint32_t _stat_size_bincue (void *user_data);
++static bool parse_cuefile (_img_private_t *cd, const char *toc_name);
++
++#define NEED_MEDIA_EJECT_IMAGE
++#include "image_common.h"
+
+ /*!
+ Initialize image structures.
+ */
+ static bool
+-_cdio_init (_img_private_t *_obj)
++_init_bincue (_img_private_t *env)
+ {
+ lsn_t lead_lsn;
+
+- if (_obj->gen.init)
++ if (env->gen.init)
+ return false;
+
+- if (!(_obj->gen.data_source = cdio_stdio_new (_obj->gen.source_name))) {
++ if (!(env->gen.data_source = cdio_stdio_new (env->gen.source_name))) {
+ cdio_warn ("init failed");
+ return false;
+ }
+
+- /* Have to set init before calling _cdio_stat_size() or we will
++ /* Have to set init before calling _stat_size_bincue() or we will
+ get into infinite recursion calling passing right here.
+ */
+- _obj->gen.init = true;
++ env->gen.init = true;
++ env->gen.i_first_track = 1;
++ env->psz_mcn = NULL;
++ env->disc_mode = CDIO_DISC_MODE_NO_INFO;
+
+- lead_lsn = _cdio_stat_size( (_img_private_t *) _obj);
++ cdtext_init (&(env->gen.cdtext));
+
+- if (-1 == lead_lsn)
+- return false;
++ lead_lsn = _stat_size_bincue( (_img_private_t *) env);
+
+- /* Read in CUE sheet. */
+- if ((_obj->cue_name != NULL)) {
+- _obj->have_cue = _cdio_image_read_cue(_obj);
+- }
++ if (-1 == lead_lsn) return false;
+
+- if (!_obj->have_cue ) {
+- /* Time to fake things...
+- Make one big track, track 0 and 1 are the same.
+- We are guessing stuff starts at msf 00:04:00 - 2 for the 150
+- sector pregap and 2 for the cue information.
+- */
+- track_info_t *this_track=&(_obj->tocent[0]);
+- int blocksize = _obj->sector_2336
+- ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE_RAW;
+-
+- _obj->total_tracks = 2;
+- _obj->first_track_num = 1;
+- this_track->start_msf.m = to_bcd8(0);
+- this_track->start_msf.s = to_bcd8(4);
+- this_track->start_msf.f = to_bcd8(0);
+- this_track->start_lba = cdio_msf_to_lba(&this_track->start_msf);
+- this_track->blocksize = blocksize;
+- this_track->track_format= TRACK_FORMAT_XA;
+- this_track->track_green = true;
++ if ((env->psz_cue_name == NULL)) return false;
+
++ /* Read in CUE sheet. */
++ if ( !parse_cuefile(env, env->psz_cue_name) ) return false;
+
+- _obj->tocent[1] = _obj->tocent[0];
+- }
+-
+ /* Fake out leadout track and sector count for last track*/
+- cdio_lsn_to_msf (lead_lsn, &_obj->tocent[_obj->total_tracks].start_msf);
+- _obj->tocent[_obj->total_tracks].start_lba = cdio_lsn_to_lba(lead_lsn);
+- _obj->tocent[_obj->total_tracks-1].sec_count =
+- cdio_lsn_to_lba(lead_lsn - _obj->tocent[_obj->total_tracks-1].start_lba);
++ cdio_lsn_to_msf (lead_lsn, &env->tocent[env->gen.i_tracks].start_msf);
++ env->tocent[env->gen.i_tracks].start_lba = cdio_lsn_to_lba(lead_lsn);
++ env->tocent[env->gen.i_tracks - env->gen.i_first_track].sec_count =
++ cdio_lsn_to_lba(lead_lsn -
++ env->tocent[env->gen.i_tracks - env->gen.i_first_track].start_lba);
+
+ return true;
+ }
+@@ -175,9 +135,9 @@
+ information in each sector.
+ */
+ static off_t
+-_cdio_lseek (void *env, off_t offset, int whence)
++_lseek_bincue (void *user_data, off_t offset, int whence)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+ /* real_offset is the real byte offset inside the disk image
+ The number below was determined empirically. I'm guessing
+@@ -187,30 +147,30 @@
+
+ unsigned int i;
+
+- _obj->pos.lba = 0;
+- for (i=0; i<_obj->total_tracks; i++) {
+- track_info_t *this_track=&(_obj->tocent[i]);
+- _obj->pos.index = i;
++ env->pos.lba = 0;
++ for (i=0; i<env->gen.i_tracks; i++) {
++ track_info_t *this_track=&(env->tocent[i]);
++ env->pos.index = i;
+ if ( (this_track->sec_count*this_track->datasize) >= offset) {
+ int blocks = offset / this_track->datasize;
+ int rem = offset % this_track->datasize;
+ int block_offset = blocks * this_track->blocksize;
+ real_offset += block_offset + rem;
+- _obj->pos.buff_offset = rem;
+- _obj->pos.lba += blocks;
++ env->pos.buff_offset = rem;
++ env->pos.lba += blocks;
+ break;
+ }
+ real_offset += this_track->sec_count*this_track->blocksize;
+ offset -= this_track->sec_count*this_track->datasize;
+- _obj->pos.lba += this_track->sec_count;
++ env->pos.lba += this_track->sec_count;
+ }
+
+- if (i==_obj->total_tracks) {
++ if (i==env->gen.i_tracks) {
+ cdio_warn ("seeking outside range of disk image");
+ return -1;
+ } else {
+- real_offset += _obj->tocent[i].datastart;
+- return cdio_stream_seek(_obj->gen.data_source, real_offset, whence);
++ real_offset += env->tocent[i].datastart;
++ return cdio_stream_seek(env->gen.data_source, real_offset, whence);
+ }
+ }
+
+@@ -222,20 +182,20 @@
+ boundaries.
+ */
+ static ssize_t
+-_cdio_read (void *env, void *data, size_t size)
++_read_bincue (void *user_data, void *data, size_t size)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+ char *p = data;
+ ssize_t final_size=0;
+ ssize_t this_size;
+- track_info_t *this_track=&(_obj->tocent[_obj->pos.index]);
++ track_info_t *this_track=&(env->tocent[env->pos.index]);
+ ssize_t skip_size = this_track->datastart + this_track->endsize;
+
+ while (size > 0) {
+- int rem = this_track->datasize - _obj->pos.buff_offset;
+- if (size <= rem) {
+- this_size = cdio_stream_read(_obj->gen.data_source, buf, size, 1);
++ long int rem = this_track->datasize - env->pos.buff_offset;
++ if ((long int) size <= rem) {
++ this_size = cdio_stream_read(env->gen.data_source, buf, size, 1);
+ final_size += this_size;
+ memcpy (p, buf, this_size);
+ break;
+@@ -245,24 +205,24 @@
+ cdio_warn ("Reading across block boundaries not finished");
+
+ size -= rem;
+- this_size = cdio_stream_read(_obj->gen.data_source, buf, rem, 1);
++ this_size = cdio_stream_read(env->gen.data_source, buf, rem, 1);
+ final_size += this_size;
+ memcpy (p, buf, this_size);
+ p += this_size;
+- this_size = cdio_stream_read(_obj->gen.data_source, buf, rem, 1);
++ this_size = cdio_stream_read(env->gen.data_source, buf, rem, 1);
+
+ /* Skip over stuff at end of this sector and the beginning of the next.
+ */
+- cdio_stream_read(_obj->gen.data_source, buf, skip_size, 1);
++ cdio_stream_read(env->gen.data_source, buf, skip_size, 1);
+
+ /* Get ready to read another sector. */
+- _obj->pos.buff_offset=0;
+- _obj->pos.lba++;
++ env->pos.buff_offset=0;
++ env->pos.lba++;
+
+ /* Have gone into next track. */
+- if (_obj->pos.lba >= _obj->tocent[_obj->pos.index+1].start_lba) {
+- _obj->pos.index++;
+- this_track=&(_obj->tocent[_obj->pos.index]);
++ if (env->pos.lba >= env->tocent[env->pos.index+1].start_lba) {
++ env->pos.index++;
++ this_track=&(env->tocent[env->pos.index]);
+ skip_size = this_track->datastart + this_track->endsize;
+ }
+ }
+@@ -273,21 +233,17 @@
+ Return the size of the CD in logical block address (LBA) units.
+ */
+ static uint32_t
+-_cdio_stat_size (void *env)
++_stat_size_bincue (void *user_data)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ long size;
+- int blocksize = _obj->sector_2336
+- ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE_RAW;
+
+- _cdio_init (_obj);
+-
+- size = cdio_stream_stat (_obj->gen.data_source);
++ size = cdio_stream_stat (env->gen.data_source);
+
+- if (size % blocksize)
++ if (size % CDIO_CD_FRAMESIZE_RAW)
+ {
+ cdio_warn ("image %s size (%ld) not multiple of blocksize (%d)",
+- _obj->gen.source_name, size, blocksize);
++ env->gen.source_name, size, CDIO_CD_FRAMESIZE_RAW);
+ if (size % M2RAW_SECTOR_SIZE == 0)
+ cdio_warn ("this may be a 2336-type disc image");
+ else if (size % CDIO_CD_FRAMESIZE_RAW == 0)
+@@ -295,177 +251,539 @@
+ /* exit (EXIT_FAILURE); */
+ }
+
+- size /= blocksize;
++ size /= CDIO_CD_FRAMESIZE_RAW;
+
+ return size;
+ }
+
+-#define MAXLINE 512
++#define MAXLINE 4096 /* maximum line length + 1 */
+
+ static bool
+-_cdio_image_read_cue (_img_private_t *_obj)
++parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
+ {
++ /* The below declarations may be common in other image-parse routines. */
+ FILE *fp;
+- char line[MAXLINE];
++ char psz_line[MAXLINE]; /* text of current line read in file fp. */
++ unsigned int i_line=0; /* line number in file of psz_line. */
++ int i = -1; /* Position in tocent. Same as
++ cd->gen.i_tracks - 1 */
++ char *psz_keyword, *psz_field;
++ cdio_log_level_t log_level = (NULL == cd) ? CDIO_LOG_INFO : CDIO_LOG_WARN;
++ cdtext_field_t cdtext_key;
+
+- int track_num;
+- int min,sec,frame;
+- int blocksize;
++ /* The below declarations may be unique to this image-parse routine. */
+ int start_index;
+- bool seen_first_index_for_track=false;
++ bool b_first_index_for_track=false;
++
++ if (NULL == psz_cue_name)
++ return false;
++
++ fp = fopen (psz_cue_name, "r");
++ if (fp == NULL) {
++ cdio_log(log_level, "error opening %s for reading: %s",
++ psz_cue_name, strerror(errno));
++ return false;
++ }
+
+- if ( _obj == NULL || _obj->cue_name == NULL ) return false;
++ if (cd) {
++ cd->gen.i_tracks=0;
++ cd->gen.i_first_track=1;
++ cd->gen.b_cdtext_init = true;
++ cd->gen.b_cdtext_error = false;
++ cd->psz_mcn=NULL;
++ }
++
++ while ((fgets(psz_line, MAXLINE, fp)) != NULL) {
+
+- fp = fopen (_obj->cue_name, "r");
+- if (fp == NULL) return false;
++ i_line++;
+
+- _obj->total_tracks=0;
+- _obj->first_track_num=1;
+- _obj->mcn=NULL;
+-
+- while ((fgets(line, MAXLINE, fp)) != NULL) {
+- char s[80];
+- char *p;
+- /*printf("Retrieved line of length %zu :\n", read);
+- printf("%s", line); */
+- for (p=line; isspace(*p); p++) ;
+- if (1==sscanf(p, "FILE \"%80s[^\"]", s)) {
+- /* Should expand file name based on cue file basename.
+- free(_obj->bin_file);
+- _obj->bin_file = strdup(s);
+- */
+- /* printf("Found file name %s\n", s); */
+- } else if (1==sscanf(p, "CATALOG %80s", s)) {
+- _obj->mcn = strdup(s);
+- } else if (2==sscanf(p, "TRACK %d MODE2/%d", &track_num, &blocksize)) {
+- track_info_t *this_track=&(_obj->tocent[_obj->total_tracks]);
+- this_track->track_num = track_num;
+- this_track->num_indices = 0;
+- this_track->track_format= TRACK_FORMAT_XA;
+- this_track->track_green = true;
+- _obj->total_tracks++;
+- seen_first_index_for_track=false;
+- /*printf("Added track %d with blocksize %d\n", track_num, blocksize);*/
+-
+- this_track->blocksize = blocksize;
+- switch(blocksize) {
+- case 2336:
+- this_track->datastart = CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE;
+- this_track->datasize = M2RAW_SECTOR_SIZE;
+- this_track->endsize = 0;
+- break;
+- default:
+- cdio_warn ("Unknown MODE2 size %d. Assuming 2352", blocksize);
+- case 2352:
+- if (_obj->sector_2336) {
+- this_track->datastart = 0;
+- this_track->datasize = M2RAW_SECTOR_SIZE;
+- this_track->endsize = blocksize - 2336;
++ if (NULL != (psz_keyword = strtok (psz_line, " \t\n\r"))) {
++ /* REM remarks ... */
++ if (0 == strcmp ("REM", psz_keyword)) {
++ ;
++
++ /* global section */
++ /* CATALOG ddddddddddddd */
++ } else if (0 == strcmp ("CATALOG", psz_keyword)) {
++ if (-1 == i) {
++ if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG: ",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "expecting 13-digit media catalog number, got nothing.");
++ goto err_exit;
++ }
++ if (strlen(psz_field) != 13) {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG: ",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Token %s has length %ld. Should be 13 digits.",
++ psz_field, (long int) strlen(psz_field));
++ goto err_exit;
++ } else {
++ /* Check that we have all digits*/
++ unsigned int i;
++ for (i=0; i<13; i++) {
++ if (!isdigit(psz_field[i])) {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Character \"%c\" at postition %i of token \"%s\" "
++ "is not all digits.",
++ psz_field[i], i+1, psz_field);
++ goto err_exit;
++ }
++ }
++ }
++
++ if (cd) cd->psz_mcn = strdup (psz_field);
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
+ } else {
+- this_track->datastart = CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE +
+- CDIO_CD_SUBHEADER_SIZE;
+- this_track->datasize = CDIO_CD_FRAMESIZE;
+- this_track->endsize = CDIO_CD_SYNC_SIZE + CDIO_CD_ECC_SIZE;
++ goto not_in_global_section;
+ }
+- break;
+- }
+-
+- } else if (2==sscanf(p, "TRACK %d MODE1/%d", &track_num, &blocksize)) {
+- track_info_t *this_track=&(_obj->tocent[_obj->total_tracks]);
+- this_track->blocksize = blocksize;
+- switch(blocksize) {
+- case 2048:
+- /* Is the below correct? */
+- this_track->datastart = 0;
+- this_track->datasize = CDIO_CD_FRAMESIZE;
+- this_track->endsize = 0;
+- break;
+- default:
+- cdio_warn ("Unknown MODE1 size %d. Assuming 2352", blocksize);
+- case 2352:
+- this_track->datastart = CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE;
+- this_track->datasize = CDIO_CD_FRAMESIZE;
+- this_track->endsize = CDIO_CD_EDC_SIZE + CDIO_CD_M1F1_ZERO_SIZE
+- + CDIO_CD_ECC_SIZE;
+- }
+-
+- this_track->track_num = track_num;
+- this_track->num_indices = 0;
+- this_track->track_format = TRACK_FORMAT_DATA;
+- this_track->track_green = false;
+- _obj->total_tracks++;
+- seen_first_index_for_track=false;
+- /*printf("Added track %d with blocksize %d\n", track_num, blocksize);*/
+-
+- } else if (1==sscanf(p, "TRACK %d AUDIO", &track_num)) {
+- track_info_t *this_track=&(_obj->tocent[_obj->total_tracks]);
+- this_track->blocksize = CDIO_CD_FRAMESIZE_RAW;
+- this_track->datasize = CDIO_CD_FRAMESIZE_RAW;
+- this_track->datastart = 0;
+- this_track->endsize = 0;
+- this_track->track_num = track_num;
+- this_track->num_indices = 0;
+- this_track->track_format = TRACK_FORMAT_AUDIO;
+- this_track->track_green = false;
+- _obj->total_tracks++;
+- seen_first_index_for_track=false;
+-
+- } else if (4==sscanf(p, "INDEX %d %d:%d:%d",
+- &start_index, &min, &sec, &frame)) {
+- track_info_t *this_track=&(_obj->tocent[_obj->total_tracks-1]);
+- /* FIXME! all of this is a big hack.
+- If start_index == 0, then this is the "last_cue" information.
+- The +2 below seconds is to adjust for the 150 pregap.
+- */
+- if (start_index != 0) {
+- if (!seen_first_index_for_track) {
+- this_track->start_index = start_index;
+- sec += 2;
+- if (sec >= 60) {
+- min++;
+- sec -= 60;
+- }
+- this_track->start_msf.m = to_bcd8 (min);
+- this_track->start_msf.s = to_bcd8 (sec);
+- this_track->start_msf.f = to_bcd8 (frame);
+- this_track->start_lba = cdio_msf_to_lba(&this_track->start_msf);
+- seen_first_index_for_track=true;
++
++ /* FILE "<filename>" <BINARY|WAVE|other?> */
++ } else if (0 == strcmp ("FILE", psz_keyword)) {
++ if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
++ if (cd) cd->tocent[i + 1].filename = strdup (psz_field);
++ } else {
++ goto format_error;
++ }
++
++ /* TRACK N <mode> */
++ } else if (0 == strcmp ("TRACK", psz_keyword)) {
++ int i_track;
++
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (1!=sscanf(psz_field, "%d", &i_track)) {
++ cdio_log(log_level,
++ "%s line %d after word TRACK:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Expecting a track number, got %s", psz_field);
++ goto err_exit;
++ }
+ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ track_info_t *this_track=NULL;
+
+- if (_obj->total_tracks > 1) {
+- /* Figure out number of sectors for previous track */
+- track_info_t *prev_track=&(_obj->tocent[_obj->total_tracks-2]);
+- if ( this_track->start_lba < prev_track->start_lba ) {
+- cdio_warn("track %d at LBA %lu starts before track %d at LBA %lu",
+- _obj->total_tracks,
+- (unsigned long int) this_track->start_lba,
+- _obj->total_tracks-1,
+- (unsigned long int) prev_track->start_lba);
+- prev_track->sec_count = 0;
+- } else if ( this_track->start_lba >= prev_track->start_lba
+- + CDIO_PREGAP_SECTORS ) {
+- prev_track->sec_count = this_track->start_lba -
+- prev_track->start_lba - CDIO_PREGAP_SECTORS ;
++ if (cd) {
++ this_track = &(cd->tocent[cd->gen.i_tracks]);
++ this_track->track_num = cd->gen.i_tracks;
++ this_track->num_indices = 0;
++ b_first_index_for_track = false;
++ cdtext_init (&(cd->gen.cdtext_track[cd->gen.i_tracks]));
++ cd->gen.i_tracks++;
++ }
++ i++;
++
++ if (0 == strcmp ("AUDIO", psz_field)) {
++ if (cd) {
++ this_track->mode = AUDIO;
++ this_track->blocksize = CDIO_CD_FRAMESIZE_RAW;
++ this_track->datasize = CDIO_CD_FRAMESIZE_RAW;
++ this_track->datastart = 0;
++ this_track->endsize = 0;
++ this_track->track_format = TRACK_FORMAT_AUDIO;
++ this_track->track_green = false;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DA;
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE1/2048", psz_field)) {
++ if (cd) {
++ this_track->mode = MODE1;
++ this_track->blocksize = 2048;
++ this_track->track_format= TRACK_FORMAT_DATA;
++ this_track->track_green = false;
++ /* Is the below correct? */
++ this_track->datastart = 0;
++ this_track->datasize = CDIO_CD_FRAMESIZE;
++ this_track->endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE1/2352", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2352;
++ this_track->track_format= TRACK_FORMAT_DATA;
++ this_track->track_green = false;
++ this_track->datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ this_track->datasize = CDIO_CD_FRAMESIZE;
++ this_track->endsize = CDIO_CD_EDC_SIZE
++ + CDIO_CD_M1F1_ZERO_SIZE + CDIO_CD_ECC_SIZE;
++ this_track->mode = MODE1_RAW;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2/2336", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2336;
++ this_track->track_format= TRACK_FORMAT_XA;
++ this_track->track_green = true;
++ this_track->mode = MODE2;
++ this_track->datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ this_track->datasize = M2RAW_SECTOR_SIZE;
++ this_track->endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2/2048", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2048;
++ this_track->track_format= TRACK_FORMAT_XA;
++ this_track->track_green = true;
++ this_track->mode = MODE2_FORM1;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2/2324", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2324;
++ this_track->track_format= TRACK_FORMAT_XA;
++ this_track->track_green = true;
++ this_track->mode = MODE2_FORM2;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2/2336", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2336;
++ this_track->track_format= TRACK_FORMAT_XA;
++ this_track->track_green = true;
++ this_track->mode = MODE2_FORM_MIX;
++ this_track->datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ this_track->datasize = M2RAW_SECTOR_SIZE;
++ this_track->endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2/2352", psz_field)) {
++ if (cd) {
++ this_track->blocksize = 2352;
++ this_track->track_format= TRACK_FORMAT_XA;
++ this_track->track_green = true;
++ this_track->mode = MODE2_RAW;
++ this_track->datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
++ this_track->datasize = CDIO_CD_FRAMESIZE;
++ this_track->endsize = CDIO_CD_SYNC_SIZE + CDIO_CD_ECC_SIZE;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
+ } else {
+- cdio_warn ("%lu fewer than pregap (%d) sectors in track %d",
+- (long unsigned int)
+- this_track->start_lba - prev_track->start_lba,
+- CDIO_PREGAP_SECTORS,
+- _obj->total_tracks-1);
+- /* Include pregap portion in sec_count. Maybe the pregap
+- was omitted. */
+- prev_track->sec_count = this_track->start_lba -
+- prev_track->start_lba;
++ cdio_log(log_level,
++ "%s line %d after word TRACK:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Unknown track mode %s", psz_field);
++ goto err_exit;
+ }
++ } else {
++ goto format_error;
+ }
+- this_track->num_indices++;
++
++ /* FLAGS flag1 flag2 ... */
++ } else if (0 == strcmp ("FLAGS", psz_keyword)) {
++ if (0 <= i) {
++ while (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (0 == strcmp ("PRE", psz_field)) {
++ if (cd) cd->tocent[i].flags |= PRE_EMPHASIS;
++ } else if (0 == strcmp ("DCP", psz_field)) {
++ if (cd) cd->tocent[i].flags |= COPY_PERMITTED;
++ } else if (0 == strcmp ("4CH", psz_field)) {
++ if (cd) cd->tocent[i].flags |= FOUR_CHANNEL_AUDIO;
++ } else if (0 == strcmp ("SCMS", psz_field)) {
++ if (cd) cd->tocent[i].flags |= SCMS;
++ } else {
++ goto format_error;
++ }
++ }
++ } else {
++ goto format_error;
++ }
++
++ /* ISRC CCOOOYYSSSSS */
++ } else if (0 == strcmp ("ISRC", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (cd) cd->tocent[i].isrc = strdup (psz_field);
++ } else {
++ goto format_error;
++ }
++ } else {
++ goto in_global_section;
++ }
++
++ /* PREGAP MM:SS:FF */
++ } else if (0 == strcmp ("PREGAP", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ lba_t lba = cdio_lsn_to_lba(cdio_mmssff_to_lba (psz_field));
++ if (CDIO_INVALID_LBA == lba) {
++ cdio_log(log_level, "%s line %d: after word PREGAP:",
++ psz_cue_name, i_line);
++ cdio_log(log_level, "Invalid MSF string %s",
++ psz_field);
++ goto err_exit;
++ }
++ if (cd) {
++ cd->tocent[i].pregap = lba;
++ }
++ } else {
++ goto format_error;
++ } if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else {
++ goto in_global_section;
++ }
++
++ /* INDEX [##] MM:SS:FF */
++ } else if (0 == strcmp ("INDEX", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r")))
++ if (1!=sscanf(psz_field, "%d", &start_index)) {
++ cdio_log(log_level,
++ "%s line %d after word INDEX:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "expecting an index number, got %s",
++ psz_field);
++ goto err_exit;
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ lba_t lba = cdio_mmssff_to_lba (psz_field);
++ if (CDIO_INVALID_LBA == lba) {
++ cdio_log(log_level, "%s line %d: after word INDEX:",
++ psz_cue_name, i_line);
++ cdio_log(log_level, "Invalid MSF string %s",
++ psz_field);
++ goto err_exit;
++ }
++ if (cd) {
++#if FIXED_ME
++ cd->tocent[i].indexes[cd->tocent[i].nindex++] = lba;
++#else
++ track_info_t *this_track=
++ &(cd->tocent[cd->gen.i_tracks - cd->gen.i_first_track]);
++
++ if (start_index != 0) {
++ if (!b_first_index_for_track) {
++ lba += CDIO_PREGAP_SECTORS;
++ cdio_lba_to_msf(lba, &(this_track->start_msf));
++ b_first_index_for_track = true;
++ this_track->start_lba = lba;
++ }
++
++ if (cd->gen.i_tracks > 1) {
++ /* Figure out number of sectors for previous track */
++ track_info_t *prev_track=&(cd->tocent[cd->gen.i_tracks-2]);
++ if ( this_track->start_lba < prev_track->start_lba ) {
++ cdio_log (log_level,
++ "track %d at LBA %lu starts before track %d at LBA %lu",
++ cd->gen.i_tracks,
++ (unsigned long int) this_track->start_lba,
++ cd->gen.i_tracks,
++ (unsigned long int) prev_track->start_lba);
++ prev_track->sec_count = 0;
++ } else if ( this_track->start_lba >= prev_track->start_lba
++ + CDIO_PREGAP_SECTORS ) {
++ prev_track->sec_count = this_track->start_lba -
++ prev_track->start_lba - CDIO_PREGAP_SECTORS ;
++ } else {
++ cdio_log (log_level,
++ "%lu fewer than pregap (%d) sectors in track %d",
++ (long unsigned int)
++ this_track->start_lba - prev_track->start_lba,
++ CDIO_PREGAP_SECTORS,
++ cd->gen.i_tracks);
++ /* Include pregap portion in sec_count. Maybe the pregap
++ was omitted. */
++ prev_track->sec_count = this_track->start_lba -
++ prev_track->start_lba;
++ }
++ }
++ this_track->num_indices++;
++ }
++ }
++#endif
++ } else {
++ goto format_error;
++ }
++ } else {
++ goto in_global_section;
++ }
++
++ /* CD-TEXT */
++ } else if ( CDTEXT_INVALID !=
++ (cdtext_key = cdtext_is_keyword (psz_keyword)) ) {
++ if (-1 == i) {
++ if (cd) {
++ cdtext_set (cdtext_key,
++ strtok (NULL, "\"\t\n\r"),
++ &(cd->gen.cdtext));
++ }
++ } else {
++ if (cd) {
++ cdtext_set (cdtext_key, strtok (NULL, "\"\t\n\r"),
++ &(cd->gen.cdtext_track[i]));
++ }
++ }
++
++ /* unrecognized line */
++ } else {
++ cdio_log(log_level, "%s line %d: warning: unrecognized keyword: %s",
++ psz_cue_name, i_line, psz_keyword);
++ goto err_exit;
+ }
+ }
+ }
+- _obj->have_cue = _obj->total_tracks != 0;
++
++ if (NULL != cd) {
++ cd->gen.toc_init = true;
++ }
+
+ fclose (fp);
+ return true;
++
++ format_error:
++ cdio_log(log_level, "%s line %d after word %s",
++ psz_cue_name, i_line, psz_keyword);
++ goto err_exit;
++
++ in_global_section:
++ cdio_log(log_level, "%s line %d: word %s not allowed in global section",
++ psz_cue_name, i_line, psz_keyword);
++ goto err_exit;
++
++ not_in_global_section:
++ cdio_log(log_level, "%s line %d: word %s only allowed in global section",
++ psz_cue_name, i_line, psz_keyword);
++
++ err_exit:
++ fclose (fp);
++ return false;
++
+ }
+
+ /*!
+@@ -473,31 +791,29 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
++_read_audio_sectors_bincue (void *user_data, void *data, lsn_t lsn,
+ unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ int ret;
+
+- _cdio_init (_obj);
+-
+ /* Why the adjustment of 272, I don't know. It seems to work though */
+ if (lsn != 0) {
+- ret = cdio_stream_seek (_obj->gen.data_source,
++ ret = cdio_stream_seek (env->gen.data_source,
+ (lsn * CDIO_CD_FRAMESIZE_RAW) - 272, SEEK_SET);
+ if (ret!=0) return ret;
+
+- ret = cdio_stream_read (_obj->gen.data_source, data,
++ ret = cdio_stream_read (env->gen.data_source, data,
+ CDIO_CD_FRAMESIZE_RAW, nblocks);
+ } else {
+ /* We need to pad out the first 272 bytes with 0's */
+ BZERO(data, 272);
+
+- ret = cdio_stream_seek (_obj->gen.data_source, 0, SEEK_SET);
++ ret = cdio_stream_seek (env->gen.data_source, 0, SEEK_SET);
+
+ if (ret!=0) return ret;
+
+- ret = cdio_stream_read (_obj->gen.data_source, (uint8_t *) data+272,
++ ret = cdio_stream_read (env->gen.data_source, (uint8_t *) data+272,
+ CDIO_CD_FRAMESIZE_RAW - 272, nblocks);
+ }
+
+@@ -510,26 +826,19 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
+- bool b_form2)
++_read_mode1_sector_bincue (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ int ret;
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+- int blocksize = _obj->sector_2336
+- ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE_RAW;
++ int blocksize = CDIO_CD_FRAMESIZE_RAW;
+
+- _cdio_init (_obj);
+-
+- ret = cdio_stream_seek (_obj->gen.data_source, lsn * blocksize, SEEK_SET);
++ ret = cdio_stream_seek (p_env->gen.data_source, lsn * blocksize, SEEK_SET);
+ if (ret!=0) return ret;
+
+ /* FIXME: Not completely sure the below is correct. */
+- ret = cdio_stream_read (_obj->gen.data_source,
+- _obj->sector_2336
+- ? (buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE)
+- : buf,
+- blocksize, 1);
++ ret = cdio_stream_read (p_env->gen.data_source, buf, CDIO_CD_FRAMESIZE_RAW, 1);
+ if (ret==0) return ret;
+
+ memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE,
+@@ -544,16 +853,16 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
+- bool b_form2, unsigned int nblocks)
++_read_mode1_sectors_bincue (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode1_sector (_obj,
++ if ( (retval = _read_mode1_sector_bincue (p_env,
+ ((char *)data) + (blocksize * i),
+ lsn + i, b_form2)) )
+ return retval;
+@@ -566,10 +875,10 @@
+ from lsn. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
++_read_mode2_sector_bincue (void *user_data, void *data, lsn_t lsn,
+ bool b_form2)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ int ret;
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+
+@@ -579,19 +888,12 @@
+ Review this sector 2336 stuff later.
+ */
+
+- int blocksize = _obj->sector_2336
+- ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE_RAW;
+-
+- _cdio_init (_obj);
++ int blocksize = CDIO_CD_FRAMESIZE_RAW;
+
+- ret = cdio_stream_seek (_obj->gen.data_source, lsn * blocksize, SEEK_SET);
++ ret = cdio_stream_seek (p_env->gen.data_source, lsn * blocksize, SEEK_SET);
+ if (ret!=0) return ret;
+
+- ret = cdio_stream_read (_obj->gen.data_source,
+- _obj->sector_2336
+- ? (buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE)
+- : buf,
+- blocksize, 1);
++ ret = cdio_stream_read (p_env->gen.data_source, buf, CDIO_CD_FRAMESIZE_RAW, 1);
+ if (ret==0) return ret;
+
+
+@@ -611,16 +913,16 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
+- bool b_form2, unsigned int nblocks)
++_read_mode2_sectors_bincue (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+ int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode2_sector (_obj,
++ if ( (retval = _read_mode2_sector_bincue (p_env,
+ ((char *)data) + (blocksize * i),
+ lsn + i, b_form2)) )
+ return retval;
+@@ -628,84 +930,8 @@
+ return 0;
+ }
+
+-#define free_if_notnull(obj) \
+- if (NULL != obj) { free(obj); obj=NULL; };
+-
+-static void
+-_cdio_bincue_destroy (void *obj)
+-{
+- _img_private_t *env = obj;
+-
+- if (NULL == env) return;
+- free_if_notnull(env->mcn);
+- free_if_notnull(env->cue_name);
+- cdio_generic_stdio_free(env);
+- free(env);
+-}
+-
+ /*!
+- Set the arg "key" with "value" in the source device.
+- Currently "source" to set the source device in I/O operations
+- is the only valid key.
+-
+- 0 is returned if no error was found, and nonzero if there as an error.
+-*/
+-static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
+-{
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source"))
+- {
+- free_if_notnull (_obj->gen.source_name);
+-
+- if (!value)
+- return -2;
+-
+- _obj->gen.source_name = strdup (value);
+- }
+- else if (!strcmp (key, "sector"))
+- {
+- if (!strcmp (value, "2336"))
+- _obj->sector_2336 = true;
+- else if (!strcmp (value, "2352"))
+- _obj->sector_2336 = false;
+- else
+- return -2;
+- }
+- else if (!strcmp (key, "cue"))
+- {
+- free_if_notnull (_obj->cue_name);
+-
+- if (!value)
+- return -2;
+-
+- _obj->cue_name = strdup (value);
+- }
+- else
+- return -1;
+-
+- return 0;
+-}
+-
+-/*!
+- Return the value associated with the key "arg".
+-*/
+-static const char *
+-_cdio_get_arg (void *env, const char key[])
+-{
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source")) {
+- return _obj->gen.source_name;
+- } else if (!strcmp (key, "cue")) {
+- return _obj->cue_name;
+- }
+- return NULL;
+-}
+-
+-/*!
+- Return an array of strings giving possible NRG disk images.
++ Return an array of strings giving possible BIN/CUE disk images.
+ */
+ char **
+ cdio_get_devices_bincue (void)
+@@ -740,51 +966,14 @@
+ return drive;
+ }
+
+-/*!
+- Return the number of of the first track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_first_track_num(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- _cdio_init (_obj);
+-
+- return _obj->first_track_num;
+-}
+-
+-/*!
+- Return the media catalog number (MCN) from the CD or NULL if there
+- is none or we don't have the ability to get it.
+-
+- Note: string is malloc'd so caller has to free() the returned
+- string when done with it.
+- */
+-static char *
+-_cdio_get_mcn(void *env)
++static bool
++get_hwinfo_bincue ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
+ {
+- _img_private_t *_obj = env;
++ strcpy(hw_info->psz_vendor, "libcdio");
++ strcpy(hw_info->psz_model, "CDRWIN");
++ strcpy(hw_info->psz_revision, CDIO_VERSION);
++ return true;
+
+- _cdio_init (_obj);
+-
+- if (NULL == _obj->mcn) return NULL;
+- return strdup(_obj->mcn);
+-}
+-
+-/*!
+- Return the number of tracks in the current medium.
+- If no cuesheet is available, We fake it an just say there's
+- one big track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
+-{
+- _img_private_t *_obj = env;
+- _cdio_init (_obj);
+-
+- return _obj->have_cue && _obj->total_tracks > 0 ? _obj->total_tracks : 1;
+ }
+
+ /*!
+@@ -792,16 +981,14 @@
+ CDIO_INVALID_TRACK is returned on error.
+ */
+ static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
++_get_track_format_bincue(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+- if (!_obj->gen.init) _cdio_init(_obj);
+-
+- if (track_num > _obj->total_tracks || track_num == 0)
++ if (i_track > p_env->gen.i_tracks || i_track == 0)
+ return TRACK_FORMAT_ERROR;
+
+- return _obj->tocent[track_num-1].track_format;
++ return p_env->tocent[i_track-p_env->gen.i_first_track].track_format;
+ }
+
+ /*!
+@@ -813,200 +1000,208 @@
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+ static bool
+-_cdio_get_track_green(void *env, track_t track_num)
++_get_track_green_bincue(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *p_env = user_data;
+
+- if (!_obj->gen.init) _cdio_init(_obj);
+-
+- if (track_num > _obj->total_tracks || track_num == 0)
++ if ( NULL == p_env ||
++ ( i_track < p_env->gen.i_first_track
++ || i_track >= p_env->gen.i_tracks + p_env->gen.i_first_track ) )
+ return false;
+
+- return _obj->tocent[track_num-1].track_green;
++ return p_env->tocent[i_track-p_env->gen.i_first_track].track_green;
+ }
+
+ /*!
+ Return the starting LSN track number
+- track_num in obj. Track numbers start at 1.
++ i_track in obj. Track numbers start at 1.
+ The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
++ using i_track LEADOUT_TRACK or the total tracks+1.
+ False is returned if there is no track entry.
+ */
+ static lba_t
+-_cdio_get_track_lba(void *env, track_t track_num)
++_get_lba_track_bincue(void *user_data, track_t i_track)
+ {
+- _img_private_t *_obj = env;
+- _cdio_init (_obj);
++ _img_private_t *p_env = user_data;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = p_env->gen.i_tracks+1;
+
+- if (track_num <= _obj->total_tracks+1 && track_num != 0) {
+- return _obj->tocent[track_num-1].start_lba;
++ if (i_track <= p_env->gen.i_tracks + p_env->gen.i_first_track && i_track != 0) {
++ return p_env->tocent[i_track-p_env->gen.i_first_track].start_lba;
+ } else
+ return CDIO_INVALID_LBA;
+ }
+
+-/*!
+- Return the starting MSF (minutes/secs/frames) for the track number
+- track_num in obj. Tracks numbers start at 1.
+- The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
+-
+-*/
+-static bool
+-_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
+-{
+- _img_private_t *_obj = env;
+- _cdio_init (_obj);
+-
+- if (NULL == msf) return false;
+-
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
+-
+- if (track_num <= _obj->total_tracks+1 && track_num != 0) {
+- *msf = _obj->tocent[track_num-1].start_msf;
+- return true;
+- } else
+- return false;
+-}
+-
+ /*!
+- Return corresponding BIN file if cue_name is a cue file or NULL
++ Return corresponding BIN file if psz_cue_name is a cue file or NULL
+ if not a CUE file.
+-
+-*/
+-/* Later we'll probably parse the entire file. For now though, this gets us
+- started for now.
+ */
+ char *
+-cdio_is_cuefile(const char *cue_name)
++cdio_is_cuefile(const char *psz_cue_name)
+ {
+ int i;
+- char *bin_name;
++ char *psz_bin_name;
+
+- if (cue_name == NULL) return false;
++ if (psz_cue_name == NULL) return NULL;
+
+- bin_name=strdup(cue_name);
+- i=strlen(bin_name)-strlen("cue");
++ /* FIXME? Now that we have cue parsing, should we really force
++ the filename extension requirement or is it enough just to
++ parse the cuefile?
++ */
++
++ psz_bin_name=strdup(psz_cue_name);
++ i=strlen(psz_bin_name)-strlen("cue");
+
+ if (i>0) {
+- if (cue_name[i]=='c' && cue_name[i+1]=='u' && cue_name[i+2]=='e') {
+- bin_name[i++]='b'; bin_name[i++]='i'; bin_name[i++]='n';
+- return bin_name;
++ if (psz_cue_name[i]=='c' && psz_cue_name[i+1]=='u' && psz_cue_name[i+2]=='e') {
++ psz_bin_name[i++]='b'; psz_bin_name[i++]='i'; psz_bin_name[i++]='n';
++ if (parse_cuefile(NULL, psz_cue_name))
++ return psz_bin_name;
++ else
++ goto error;
+ }
+- else if (cue_name[i]=='C' && cue_name[i+1]=='U' && cue_name[i+2]=='E') {
+- bin_name[i++]='B'; bin_name[i++]='I'; bin_name[i++]='N';
+- return bin_name;
++ else if (psz_cue_name[i]=='C' && psz_cue_name[i+1]=='U' && psz_cue_name[i+2]=='E') {
++ psz_bin_name[i++]='B'; psz_bin_name[i++]='I'; psz_bin_name[i++]='N';
++ if (parse_cuefile(NULL, psz_cue_name))
++ return psz_bin_name;
++ else
++ goto error;
+ }
+ }
+- free(bin_name);
++ error:
++ free(psz_bin_name);
+ return NULL;
+ }
+
+ /*!
+- Return corresponding CUE file if bin_name is a bin file or NULL
++ Return corresponding CUE file if psz_bin_name is a bin file or NULL
+ if not a BIN file.
+-
+-*/
+-/* Later we'll probably do better. For now though, this gets us
+- started for now.
+ */
+ char *
+-cdio_is_binfile(const char *bin_name)
++cdio_is_binfile(const char *psz_bin_name)
+ {
+ int i;
+- char *cue_name;
++ char *psz_cue_name;
+
+- if (bin_name == NULL) return false;
++ if (psz_bin_name == NULL) return NULL;
+
+- cue_name=strdup(bin_name);
+- i=strlen(bin_name)-strlen("bin");
++ psz_cue_name=strdup(psz_bin_name);
++ i=strlen(psz_bin_name)-strlen("bin");
+
+ if (i>0) {
+- if (bin_name[i]=='b' && bin_name[i+1]=='i' && bin_name[i+2]=='n') {
+- cue_name[i++]='c'; cue_name[i++]='u'; cue_name[i++]='e';
+- return cue_name;
++ if (psz_bin_name[i]=='b' && psz_bin_name[i+1]=='i' && psz_bin_name[i+2]=='n') {
++ psz_cue_name[i++]='c'; psz_cue_name[i++]='u'; psz_cue_name[i++]='e';
++ return psz_cue_name;
+ }
+- else if (bin_name[i]=='B' && bin_name[i+1]=='I' && bin_name[i+2]=='N') {
+- cue_name[i++]='C'; cue_name[i++]='U'; cue_name[i++]='E';
+- return cue_name;
++ else if (psz_bin_name[i]=='B' && psz_bin_name[i+1]=='I' && psz_bin_name[i+2]=='N') {
++ psz_cue_name[i++]='C'; psz_cue_name[i++]='U'; psz_cue_name[i++]='E';
++ return psz_cue_name;
+ }
+ }
+- free(cue_name);
++ free(psz_cue_name);
+ return NULL;
+ }
+
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_bincue (const char *psz_source_name, const char *psz_access_mode)
++{
++ if (psz_access_mode != NULL)
++ cdio_warn ("there is only one access mode for bincue. Arg %s ignored",
++ psz_access_mode);
++ return cdio_open_bincue(psz_source_name);
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
+ CdIo *
+ cdio_open_bincue (const char *source_name)
+ {
+- char *bin_name = cdio_is_cuefile(source_name);
++ char *psz_bin_name = cdio_is_cuefile(source_name);
+
+- if (NULL != bin_name) {
+- free(bin_name);
++ if (NULL != psz_bin_name) {
++ free(psz_bin_name);
+ return cdio_open_cue(source_name);
+ } else {
+- char *cue_name = cdio_is_binfile(source_name);
+- CdIo *cdio = cdio_open_cue(cue_name);
+- free(cue_name);
++ char *psz_cue_name = cdio_is_binfile(source_name);
++ CdIo *cdio = cdio_open_cue(psz_cue_name);
++ free(psz_cue_name);
+ return cdio;
+ }
+ }
+
+ CdIo *
+-cdio_open_cue (const char *cue_name)
++cdio_open_cue (const char *psz_cue_name)
+ {
+ CdIo *ret;
+ _img_private_t *_data;
+- char *bin_name;
+-
+- cdio_funcs _funcs = {
+- .eject_media = cdio_generic_bogus_eject_media,
+- .free = _cdio_bincue_destroy,
+- .get_arg = _cdio_get_arg,
+- .get_default_device = cdio_get_default_device_bincue,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_mcn = _cdio_get_mcn,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
+- .get_track_lba = _cdio_get_track_lba,
+- .get_track_msf = _cdio_get_track_msf,
+- .lseek = _cdio_lseek,
+- .read = _cdio_read,
+- .read_audio_sectors = _cdio_read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .set_arg = _cdio_set_arg,
+- .stat_size = _cdio_stat_size
+- };
+-
+- if (NULL == cue_name) return NULL;
+-
++ char *psz_bin_name;
++
++ cdio_funcs _funcs;
++
++ memset( &_funcs, 0, sizeof(_funcs) );
++
++ _funcs.eject_media = _eject_media_image;
++ _funcs.free = _free_image;
++ _funcs.get_arg = _get_arg_image;
++ _funcs.get_cdtext = get_cdtext_generic;
++ _funcs.get_devices = cdio_get_devices_bincue;
++ _funcs.get_default_device = cdio_get_default_device_bincue;
++ _funcs.get_discmode = _get_discmode_image;
++ _funcs.get_drive_cap = _get_drive_cap_image;
++ _funcs.get_first_track_num= _get_first_track_num_image;
++ _funcs.get_hwinfo = get_hwinfo_bincue;
++ _funcs.get_mcn = _get_mcn_image;
++ _funcs.get_num_tracks = _get_num_tracks_image;
++ _funcs.get_track_format = _get_track_format_bincue;
++ _funcs.get_track_green = _get_track_green_bincue;
++ _funcs.get_track_lba = _get_lba_track_bincue;
++ _funcs.get_track_msf = _get_track_msf_image;
++ _funcs.lseek = _lseek_bincue;
++ _funcs.read = _read_bincue;
++ _funcs.read_audio_sectors = _read_audio_sectors_bincue;
++ _funcs.read_mode1_sector = _read_mode1_sector_bincue;
++ _funcs.read_mode1_sectors = _read_mode1_sectors_bincue;
++ _funcs.read_mode2_sector = _read_mode2_sector_bincue;
++ _funcs.read_mode2_sectors = _read_mode2_sectors_bincue;
++ _funcs.set_arg = _set_arg_image;
++ _funcs.stat_size = _stat_size_bincue;
++
++ if (NULL == psz_cue_name) return NULL;
++
+ _data = _cdio_malloc (sizeof (_img_private_t));
+- (_data)->gen.init = false;
+- (_data)->sector_2336 = false;
+- (_data)->cue_name = NULL;
+-
+- ret = cdio_new (_data, &_funcs);
+-
+- if (ret == NULL) return NULL;
+-
+- bin_name = cdio_is_cuefile(cue_name);
+-
+- if (NULL == bin_name) {
+- cdio_error ("source name %s is not recognized as a CUE file", cue_name);
++ _data->gen.init = false;
++ _data->psz_cue_name = NULL;
++
++ ret = cdio_new ((void *)_data, &_funcs);
++
++ if (ret == NULL) {
++ free(_data);
++ return NULL;
+ }
+
+- _cdio_set_arg (_data, "cue", cue_name);
+- _cdio_set_arg (_data, "source", bin_name);
+- free(bin_name);
+-
+- if (_cdio_init(_data)) {
++ psz_bin_name = cdio_is_cuefile(psz_cue_name);
++
++ if (NULL == psz_bin_name) {
++ cdio_error ("source name %s is not recognized as a CUE file",
++ psz_cue_name);
++ }
++
++ _set_arg_image (_data, "cue", psz_cue_name);
++ _set_arg_image (_data, "source", psz_bin_name);
++ free(psz_bin_name);
++
++ if (_init_bincue(_data)) {
+ return ret;
+ } else {
+- _cdio_bincue_destroy(_data);
++ _free_image(_data);
+ free(ret);
+ return NULL;
+ }
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/image/cdrdao.c 3 Jan 2005 21:14:00 -0000 1.1.2.1
+@@ -0,0 +1,1198 @@
++/*
++ $Id: cdrdao.c,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++ toc reading routine adapted from cuetools
++ Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* This code implements low-level access functions for a CD images
++ residing inside a disk file (*.bin) and its associated cue sheet.
++ (*.cue).
++*/
++
++static const char _rcsid[] = "$Id: cdrdao.c,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $";
++
++#include "image.h"
++#include "cdio_assert.h"
++#include "_cdio_stdio.h"
++
++#include <cdio/logging.h>
++#include <cdio/sector.h>
++#include <cdio/util.h>
++#include <cdio/version.h>
++
++#ifdef HAVE_STDIO_H
++#include <stdio.h>
++#endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
++#include <strings.h>
++#endif
++#ifdef HAVE_GLOB_H
++#include <glob.h>
++#endif
++#ifdef HAVE_ERRNO_H
++#include <errno.h>
++#endif
++
++#include <ctype.h>
++
++#include "portable.h"
++
++/* reader */
++
++#define DEFAULT_CDIO_DEVICE "videocd.bin"
++#define DEFAULT_CDIO_CDRDAO "videocd.toc"
++
++typedef struct {
++ /* Things common to all drivers like this.
++ This must be first. */
++ generic_img_private_t gen;
++ internal_position_t pos;
++
++ char *psz_cue_name;
++ char *psz_mcn; /* Media Catalog Number (5.22.3)
++ exactly 13 bytes */
++ track_info_t tocent[CDIO_CD_MAX_TRACKS+1]; /* entry info for each track
++ add 1 for leadout. */
++ discmode_t disc_mode;
++} _img_private_t;
++
++static uint32_t _stat_size_cdrdao (void *user_data);
++static bool parse_tocfile (_img_private_t *cd, const char *toc_name);
++
++#define NEED_MEDIA_EJECT_IMAGE
++#include "image_common.h"
++
++/*!
++ Initialize image structures.
++ */
++static bool
++_init_cdrdao (_img_private_t *env)
++{
++ lsn_t lead_lsn;
++
++ if (env->gen.init)
++ return false;
++
++ /* Have to set init before calling _stat_size_cdrdao() or we will
++ get into infinite recursion calling passing right here.
++ */
++ env->gen.init = true;
++ env->gen.i_first_track = 1;
++ env->psz_mcn = NULL;
++ env->disc_mode = CDIO_DISC_MODE_NO_INFO;
++
++ cdtext_init (&(env->gen.cdtext));
++
++ /* Read in TOC sheet. */
++ if ( !parse_tocfile(env, env->psz_cue_name) ) return false;
++
++ lead_lsn = _stat_size_cdrdao( (_img_private_t *) env);
++
++ if (-1 == lead_lsn)
++ return false;
++
++ /* Fake out leadout track and sector count for last track*/
++ cdio_lsn_to_msf (lead_lsn, &env->tocent[env->gen.i_tracks].start_msf);
++ env->tocent[env->gen.i_tracks].start_lba = cdio_lsn_to_lba(lead_lsn);
++ env->tocent[env->gen.i_tracks-env->gen.i_first_track].sec_count =
++ cdio_lsn_to_lba(lead_lsn - env->tocent[env->gen.i_tracks-1].start_lba);
++
++ return true;
++}
++
++/*!
++ Reads into buf the next size bytes.
++ Returns -1 on error.
++ Would be libc's seek() but we have to adjust for the extra track header
++ information in each sector.
++*/
++static off_t
++_lseek_cdrdao (void *user_data, off_t offset, int whence)
++{
++ _img_private_t *env = user_data;
++
++ /* real_offset is the real byte offset inside the disk image
++ The number below was determined empirically. I'm guessing
++ the 1st 24 bytes of a bin file are used for something.
++ */
++ off_t real_offset=0;
++
++ unsigned int i;
++
++ env->pos.lba = 0;
++ for (i=0; i<env->gen.i_tracks; i++) {
++ track_info_t *this_track=&(env->tocent[i]);
++ env->pos.index = i;
++ if ( (this_track->sec_count*this_track->datasize) >= offset) {
++ int blocks = offset / this_track->datasize;
++ int rem = offset % this_track->datasize;
++ int block_offset = blocks * this_track->blocksize;
++ real_offset += block_offset + rem;
++ env->pos.buff_offset = rem;
++ env->pos.lba += blocks;
++ break;
++ }
++ real_offset += this_track->sec_count*this_track->blocksize;
++ offset -= this_track->sec_count*this_track->datasize;
++ env->pos.lba += this_track->sec_count;
++ }
++
++ if (i==env->gen.i_tracks) {
++ cdio_warn ("seeking outside range of disk image");
++ return -1;
++ } else {
++ real_offset += env->tocent[i].datastart;
++ return cdio_stream_seek(env->tocent[i].data_source, real_offset, whence);
++ }
++}
++
++/*!
++ Reads into buf the next size bytes.
++ Returns -1 on error.
++ FIXME:
++ At present we assume a read doesn't cross sector or track
++ boundaries.
++*/
++static ssize_t
++_read_cdrdao (void *user_data, void *data, size_t size)
++{
++ _img_private_t *env = user_data;
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++ char *p = data;
++ ssize_t final_size=0;
++ ssize_t this_size;
++ track_info_t *this_track=&(env->tocent[env->pos.index]);
++ ssize_t skip_size = this_track->datastart + this_track->endsize;
++
++ while (size > 0) {
++ int rem = this_track->datasize - env->pos.buff_offset;
++ if (size <= rem) {
++ this_size = cdio_stream_read(this_track->data_source, buf, size, 1);
++ final_size += this_size;
++ memcpy (p, buf, this_size);
++ break;
++ }
++
++ /* Finish off reading this sector. */
++ cdio_warn ("Reading across block boundaries not finished");
++
++ size -= rem;
++ this_size = cdio_stream_read(this_track->data_source, buf, rem, 1);
++ final_size += this_size;
++ memcpy (p, buf, this_size);
++ p += this_size;
++ this_size = cdio_stream_read(this_track->data_source, buf, rem, 1);
++
++ /* Skip over stuff at end of this sector and the beginning of the next.
++ */
++ cdio_stream_read(this_track->data_source, buf, skip_size, 1);
++
++ /* Get ready to read another sector. */
++ env->pos.buff_offset=0;
++ env->pos.lba++;
++
++ /* Have gone into next track. */
++ if (env->pos.lba >= env->tocent[env->pos.index+1].start_lba) {
++ env->pos.index++;
++ this_track=&(env->tocent[env->pos.index]);
++ skip_size = this_track->datastart + this_track->endsize;
++ }
++ }
++ return final_size;
++}
++
++/*!
++ Return the size of the CD in logical block address (LBA) units.
++ */
++static uint32_t
++_stat_size_cdrdao (void *user_data)
++{
++ _img_private_t *env = user_data;
++ long size;
++
++ size = cdio_stream_stat (env->tocent[0].data_source);
++
++ if (size % CDIO_CD_FRAMESIZE_RAW)
++ {
++ cdio_warn ("image %s size (%ld) not multiple of blocksize (%d)",
++ env->tocent[0].filename, size, CDIO_CD_FRAMESIZE_RAW);
++ if (size % M2RAW_SECTOR_SIZE == 0)
++ cdio_warn ("this may be a 2336-type disc image");
++ else if (size % CDIO_CD_FRAMESIZE_RAW == 0)
++ cdio_warn ("this may be a 2352-type disc image");
++ /* exit (EXIT_FAILURE); */
++ }
++
++ size /= CDIO_CD_FRAMESIZE_RAW;
++
++ return size;
++}
++
++#define MAXLINE 512
++#define UNIMPLIMENTED_MSG \
++ cdio_log(log_level, "%s line %d: unimplimented keyword: %s", \
++ psz_cue_name, i_line, psz_keyword)
++
++
++static bool
++parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
++{
++ /* The below declarations may be common in other image-parse routines. */
++ FILE *fp;
++ char psz_line[MAXLINE]; /* text of current line read in file fp. */
++ unsigned int i_line=0; /* line number in file of psz_line. */
++ int i = -1; /* Position in tocent. Same as
++ cd->gen.i_tracks - 1 */
++ char *psz_keyword, *psz_field;
++ cdio_log_level_t log_level = (NULL == cd) ? CDIO_LOG_INFO : CDIO_LOG_WARN;
++ cdtext_field_t cdtext_key;
++
++ /* The below declaration(s) may be unique to this image-parse routine. */
++ unsigned int i_cdtext_nest = 0;
++
++ if (NULL == psz_cue_name)
++ return false;
++
++ fp = fopen (psz_cue_name, "r");
++ if (fp == NULL) {
++ cdio_log(log_level, "error opening %s for reading: %s",
++ psz_cue_name, strerror(errno));
++ return false;
++ }
++
++ if (cd) {
++ cd->gen.b_cdtext_init = true;
++ cd->gen.b_cdtext_error = false;
++ }
++
++ while ((fgets(psz_line, MAXLINE, fp)) != NULL) {
++
++ i_line++;
++
++ /* strip comment from line */
++ /* todo: // in quoted strings? */
++ /* //comment */
++ if (NULL != (psz_field = strstr (psz_line, "//")))
++ *psz_field = '\0';
++
++ if (NULL != (psz_keyword = strtok (psz_line, " \t\n\r"))) {
++ /* CATALOG "ddddddddddddd" */
++ if (0 == strcmp ("CATALOG", psz_keyword)) {
++ if (-1 == i) {
++ if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
++ if (13 != strlen(psz_field)) {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Token %s has length %ld. Should be 13 digits.",
++ psz_field, (long int) strlen(psz_field));
++
++ goto err_exit;
++ } else {
++ /* Check that we have all digits*/
++ unsigned int i;
++ for (i=0; i<13; i++) {
++ if (!isdigit(psz_field[i])) {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG:",
++ psz_cue_name, i_line);
++ cdio_log(log_level,
++ "Character \"%c\" at postition %i of token \"%s\""
++ " is not all digits.",
++ psz_field[i], i+1, psz_field);
++ goto err_exit;
++ }
++ }
++ if (NULL != cd) cd->psz_mcn = strdup (psz_field);
++ }
++ } else {
++ cdio_log(log_level,
++ "%s line %d after word CATALOG:",
++ psz_cue_name, i_line);
++ cdio_log(log_level, "Expecting 13 digits; nothing seen.");
++ goto err_exit;
++ }
++ } else {
++ goto err_exit;
++ }
++
++ /* CD_DA | CD_ROM | CD_ROM_XA */
++ } else if (0 == strcmp ("CD_DA", psz_keyword)) {
++ if (-1 == i) {
++ if (NULL != cd)
++ cd->disc_mode = CDIO_DISC_MODE_CD_DA;
++ } else {
++ goto not_in_global_section;
++ }
++ } else if (0 == strcmp ("CD_ROM", psz_keyword)) {
++ if (-1 == i) {
++ if (NULL != cd)
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ } else {
++ goto not_in_global_section;
++ }
++
++ } else if (0 == strcmp ("CD_ROM_XA", psz_keyword)) {
++ if (-1 == i) {
++ if (NULL != cd)
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ } else {
++ goto not_in_global_section;
++ }
++
++ /* TRACK <track-mode> [<sub-channel-mode>] */
++ } else if (0 == strcmp ("TRACK", psz_keyword)) {
++ i++;
++ if (NULL != cd) cdtext_init (&(cd->gen.cdtext_track[i]));
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (0 == strcmp ("AUDIO", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_AUDIO;
++ cd->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datastart = 0;
++ cd->tocent[i].endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DA;
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++
++ }
++ } else if (0 == strcmp ("MODE1", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_DATA;
++ cd->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ cd->tocent[i].endsize = CDIO_CD_EDC_SIZE
++ + CDIO_CD_M1F1_ZERO_SIZE + CDIO_CD_ECC_SIZE;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE1_RAW", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_DATA;
++ cd->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ cd->tocent[i].endsize = CDIO_CD_EDC_SIZE
++ + CDIO_CD_M1F1_ZERO_SIZE + CDIO_CD_ECC_SIZE;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case CDIO_DISC_MODE_CD_DATA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_XA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_XA;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ cd->tocent[i].datasize = M2RAW_SECTOR_SIZE;
++ cd->tocent[i].endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2_FORM1", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_XA;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2_FORM2", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_XA;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ cd->tocent[i].endsize = CDIO_CD_SYNC_SIZE
++ + CDIO_CD_ECC_SIZE;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2_FORM_MIX", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_XA;
++ cd->tocent[i].datasize = M2RAW_SECTOR_SIZE;
++ cd->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE +
++ CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
++ cd->tocent[i].track_green = true;
++ cd->tocent[i].endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else if (0 == strcmp ("MODE2_RAW", psz_field)) {
++ if (NULL != cd) {
++ cd->tocent[i].track_format = TRACK_FORMAT_XA;
++ cd->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ cd->tocent[i].datastart = CDIO_CD_SYNC_SIZE +
++ CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
++ cd->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ cd->tocent[i].track_green = true;
++ cd->tocent[i].endsize = 0;
++ switch(cd->disc_mode) {
++ case CDIO_DISC_MODE_NO_INFO:
++ cd->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case CDIO_DISC_MODE_CD_XA:
++ case CDIO_DISC_MODE_CD_MIXED:
++ case CDIO_DISC_MODE_ERROR:
++ /* Disc type stays the same. */
++ break;
++ case CDIO_DISC_MODE_CD_DA:
++ case CDIO_DISC_MODE_CD_DATA:
++ cd->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ default:
++ cd->disc_mode = CDIO_DISC_MODE_ERROR;
++ }
++ }
++ } else {
++ cdio_log(log_level, "%s line %d after TRACK:",
++ psz_cue_name, i_line);
++ cdio_log(log_level, "'%s' not a valid mode.", psz_field);
++ goto err_exit;
++ }
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ /* todo: set sub-channel-mode */
++ if (0 == strcmp ("RW", psz_field))
++ ;
++ else if (0 == strcmp ("RW_RAW", psz_field))
++ ;
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++
++ /* track flags */
++ /* [NO] COPY | [NO] PRE_EMPHASIS */
++ } else if (0 == strcmp ("NO", psz_keyword)) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (0 == strcmp ("COPY", psz_field)) {
++ if (NULL != cd)
++ cd->tocent[i].flags &= ~CDIO_TRACK_FLAG_COPY_PERMITTED;
++
++ } else if (0 == strcmp ("PRE_EMPHASIS", psz_field))
++ if (NULL != cd) {
++ cd->tocent[i].flags &= ~CDIO_TRACK_FLAG_PRE_EMPHASIS;
++ goto err_exit;
++ }
++ } else {
++ goto format_error;
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else if (0 == strcmp ("COPY", psz_keyword)) {
++ if (NULL != cd)
++ cd->tocent[i].flags |= CDIO_TRACK_FLAG_COPY_PERMITTED;
++ } else if (0 == strcmp ("PRE_EMPHASIS", psz_keyword)) {
++ if (NULL != cd)
++ cd->tocent[i].flags |= CDIO_TRACK_FLAG_PRE_EMPHASIS;
++ /* TWO_CHANNEL_AUDIO */
++ } else if (0 == strcmp ("TWO_CHANNEL_AUDIO", psz_keyword)) {
++ if (NULL != cd)
++ cd->tocent[i].flags &= ~CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO;
++ /* FOUR_CHANNEL_AUDIO */
++ } else if (0 == strcmp ("FOUR_CHANNEL_AUDIO", psz_keyword)) {
++ if (NULL != cd)
++ cd->tocent[i].flags |= CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO;
++
++ /* ISRC "CCOOOYYSSSSS" */
++ } else if (0 == strcmp ("ISRC", psz_keyword)) {
++ if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
++ if (NULL != cd)
++ cd->tocent[i].isrc = strdup(psz_field);
++ } else {
++ goto format_error;
++ }
++
++ /* SILENCE <length> */
++ } else if (0 == strcmp ("SILENCE", psz_keyword)) {
++ UNIMPLIMENTED_MSG;
++
++ /* ZERO <length> */
++ } else if (0 == strcmp ("ZERO", psz_keyword)) {
++ UNIMPLIMENTED_MSG;
++
++ /* [FILE|AUDIOFILE] "<filename>" <start> [<length>] */
++ } else if (0 == strcmp ("FILE", psz_keyword)
++ || 0 == strcmp ("AUDIOFILE", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
++ if (NULL != cd) {
++ cd->tocent[i].filename = strdup (psz_field);
++ /* Todo: do something about reusing existing files. */
++ if (!(cd->tocent[i].data_source = cdio_stdio_new (psz_field))) {
++ cdio_log (log_level,
++ "%s line %d: can't open file `%s' for reading",
++ psz_cue_name, i_line, psz_field);
++ goto err_exit;
++ }
++ }
++ }
++
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ lba_t lba = cdio_lsn_to_lba(cdio_mmssff_to_lba (psz_field));
++ if (CDIO_INVALID_LBA == lba) {
++ cdio_log(log_level, "%s line %d: invalid MSF string %s",
++ psz_cue_name, i_line, psz_field);
++ goto err_exit;
++ }
++
++ if (NULL != cd) {
++ cd->tocent[i].start_lba = lba;
++ cdio_lba_to_msf(lba, &(cd->tocent[i].start_msf));
++ }
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r")))
++ if (NULL != cd)
++ cd->tocent[i].length = cdio_mmssff_to_lba (psz_field);
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else {
++ goto not_in_global_section;
++ }
++
++ /* DATAFILE "<filename>" <start> [<length>] */
++ } else if (0 == strcmp ("DATAFILE", psz_keyword)) {
++ goto unimplimented_error;
++
++ /* FIFO "<fifo path>" [<length>] */
++ } else if (0 == strcmp ("FIFO", psz_keyword)) {
++ goto unimplimented_error;
++
++ /* START MM:SS:FF */
++ } else if (0 == strcmp ("START", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ /* todo: line is too long! */
++ if (NULL != cd) {
++ cd->tocent[i].start_lba += cdio_mmssff_to_lba (psz_field);
++ cdio_lba_to_msf(cd->tocent[i].start_lba,
++ &(cd->tocent[i].start_msf));
++ }
++ }
++
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else {
++ goto not_in_global_section;
++ }
++
++ /* PREGAP MM:SS:FF */
++ } else if (0 == strcmp ("PREGAP", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (NULL != cd)
++ cd->tocent[i].pregap = cdio_mmssff_to_lba (psz_field);
++ } else {
++ goto format_error;
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else {
++ goto not_in_global_section;
++ }
++
++ /* INDEX MM:SS:FF */
++ } else if (0 == strcmp ("INDEX", psz_keyword)) {
++ if (0 <= i) {
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ if (NULL != cd) {
++#if 0
++ if (1 == cd->tocent[i].nindex) {
++ cd->tocent[i].indexes[1] = cd->tocent[i].indexes[0];
++ cd->tocent[i].nindex++;
++ }
++ cd->tocent[i].indexes[cd->tocent[i].nindex++] =
++ cdio_mmssff_to_lba (psz_field) + cd->tocent[i].indexes[0];
++#else
++ ;
++
++#endif
++ }
++ } else {
++ goto format_error;
++ }
++ if (NULL != (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ } else {
++ goto not_in_global_section;
++ }
++
++ /* CD_TEXT { ... } */
++ /* todo: opening { must be on same line as CD_TEXT */
++ } else if (0 == strcmp ("CD_TEXT", psz_keyword)) {
++ if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ if ( 0 == strcmp( "{", psz_field ) ) {
++ i_cdtext_nest++;
++ } else {
++ cdio_log (log_level,
++ "%s line %d: expecting '{'", psz_cue_name, i_line);
++ goto err_exit;
++ }
++
++ } else if (0 == strcmp ("LANGUAGE_MAP", psz_keyword)) {
++ /* LANGUAGE d { ... } */
++ } else if (0 == strcmp ("LANGUAGE", psz_keyword)) {
++ if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ /* Language number */
++ if (NULL == (psz_field = strtok (NULL, " \t\n\r"))) {
++ goto format_error;
++ }
++ if ( 0 == strcmp( "{", psz_field ) ) {
++ i_cdtext_nest++;
++ }
++ } else if (0 == strcmp ("{", psz_keyword)) {
++ i_cdtext_nest++;
++ } else if (0 == strcmp ("}", psz_keyword)) {
++ if (i_cdtext_nest > 0) i_cdtext_nest--;
++ } else if ( CDTEXT_INVALID !=
++ (cdtext_key = cdtext_is_keyword (psz_keyword)) ) {
++ if (-1 == i) {
++ if (NULL != cd) {
++ cdtext_set (cdtext_key,
++ strtok (NULL, "\"\t\n\r"),
++ &(cd->gen.cdtext));
++ }
++ } else {
++ if (NULL != cd) {
++ cdtext_set (cdtext_key,
++ strtok (NULL, "\"\t\n\r"),
++ &(cd->gen.cdtext_track[i]));
++ }
++ }
++
++ /* unrecognized line */
++ } else {
++ cdio_log(log_level, "%s line %d: warning: unrecognized word: %s",
++ psz_cue_name, i_line, psz_keyword);
++ goto err_exit;
++ }
++ }
++ }
++
++ if (NULL != cd) {
++ cd->gen.i_tracks = i+1;
++ cd->gen.toc_init = true;
++ }
++
++ fclose (fp);
++ return true;
++
++ unimplimented_error:
++ UNIMPLIMENTED_MSG;
++ goto err_exit;
++
++ format_error:
++ cdio_log(log_level, "%s line %d after word %s",
++ psz_cue_name, i_line, psz_keyword);
++ goto err_exit;
++
++ not_in_global_section:
++ cdio_log(log_level, "%s line %d: word %s only allowed in global section",
++ psz_cue_name, i_line, psz_keyword);
++
++ err_exit:
++ fclose (fp);
++ return false;
++}
++
++/*!
++ Reads a single audio sector from CD device into data starting
++ from lsn. Returns 0 if no error.
++ */
++static int
++_read_audio_sectors_cdrdao (void *user_data, void *data, lsn_t lsn,
++ unsigned int nblocks)
++{
++ _img_private_t *env = user_data;
++ int ret;
++
++ /* Why the adjustment of 272, I don't know. It seems to work though */
++ if (lsn != 0) {
++ ret = cdio_stream_seek (env->tocent[0].data_source,
++ (lsn * CDIO_CD_FRAMESIZE_RAW) - 272, SEEK_SET);
++ if (ret!=0) return ret;
++
++ ret = cdio_stream_read (env->tocent[0].data_source, data,
++ CDIO_CD_FRAMESIZE_RAW, nblocks);
++ } else {
++ /* We need to pad out the first 272 bytes with 0's */
++ BZERO(data, 272);
++
++ ret = cdio_stream_seek (env->tocent[0].data_source, 0, SEEK_SET);
++
++ if (ret!=0) return ret;
++
++ ret = cdio_stream_read (env->tocent[0].data_source, (uint8_t *) data+272,
++ CDIO_CD_FRAMESIZE_RAW - 272, nblocks);
++ }
++
++ /* ret is number of bytes if okay, but we need to return 0 okay. */
++ return ret == 0;
++}
++
++/*!
++ Reads a single mode2 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++static int
++_read_mode1_sector_cdrdao (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
++{
++ _img_private_t *env = user_data;
++ int ret;
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++
++ ret = cdio_stream_seek (env->tocent[0].data_source,
++ lsn * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
++ if (ret!=0) return ret;
++
++ /* FIXME: Not completely sure the below is correct. */
++ ret = cdio_stream_read (env->tocent[0].data_source, buf,
++ CDIO_CD_FRAMESIZE_RAW, 1);
++ if (ret==0) return ret;
++
++ memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE,
++ b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
++
++ return 0;
++}
++
++/*!
++ Reads nblocks of mode1 sectors from cd device into data starting
++ from lsn.
++ Returns 0 if no error.
++ */
++static int
++_read_mode1_sectors_cdrdao (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
++{
++ _img_private_t *env = user_data;
++ int i;
++ int retval;
++ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
++
++ for (i = 0; i < nblocks; i++) {
++ if ( (retval = _read_mode1_sector_cdrdao (env,
++ ((char *)data) + (blocksize * i),
++ lsn + i, b_form2)) )
++ return retval;
++ }
++ return 0;
++}
++
++/*!
++ Reads a single mode1 sector from cd device into data starting
++ from lsn. Returns 0 if no error.
++ */
++static int
++_read_mode2_sector_cdrdao (void *user_data, void *data, lsn_t lsn,
++ bool b_form2)
++{
++ _img_private_t *env = user_data;
++ int ret;
++ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
++
++ /* NOTE: The logic below seems a bit wrong and convoluted
++ to me, but passes the regression tests. (Perhaps it is why we get
++ valgrind errors in vcdxrip). Leave it the way it was for now.
++ Review this sector 2336 stuff later.
++ */
++
++ ret = cdio_stream_seek (env->tocent[0].data_source,
++ lsn * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
++ if (ret!=0) return ret;
++
++ ret = cdio_stream_read (env->tocent[0].data_source, buf,
++ CDIO_CD_FRAMESIZE_RAW, 1);
++ if (ret==0) return ret;
++
++
++ /* See NOTE above. */
++ if (b_form2)
++ memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE,
++ M2RAW_SECTOR_SIZE);
++ else
++ memcpy (data, buf + CDIO_CD_XA_SYNC_HEADER, CDIO_CD_FRAMESIZE);
++
++ return 0;
++}
++
++/*!
++ Reads nblocks of mode2 sectors from cd device into data starting
++ from lsn.
++ Returns 0 if no error.
++ */
++static int
++_read_mode2_sectors_cdrdao (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned int nblocks)
++{
++ _img_private_t *env = user_data;
++ int i;
++ int retval;
++
++ for (i = 0; i < nblocks; i++) {
++ if ( (retval = _read_mode2_sector_cdrdao (env,
++ ((char *)data) + (CDIO_CD_FRAMESIZE * i),
++ lsn + i, b_form2)) )
++ return retval;
++ }
++ return 0;
++}
++
++/*!
++ Return an array of strings giving possible TOC disk images.
++ */
++char **
++cdio_get_devices_cdrdao (void)
++{
++ char **drives = NULL;
++ unsigned int num_files=0;
++#ifdef HAVE_GLOB_H
++ unsigned int i;
++ glob_t globbuf;
++ globbuf.gl_offs = 0;
++ glob("*.toc", GLOB_DOOFFS, NULL, &globbuf);
++ for (i=0; i<globbuf.gl_pathc; i++) {
++ cdio_add_device_list(&drives, globbuf.gl_pathv[i], &num_files);
++ }
++ globfree(&globbuf);
++#else
++ cdio_add_device_list(&drives, DEFAULT_CDIO_DEVICE, &num_files);
++#endif /*HAVE_GLOB_H*/
++ cdio_add_device_list(&drives, NULL, &num_files);
++ return drives;
++}
++
++/*!
++ Return a string containing the default CD device.
++ */
++char *
++cdio_get_default_device_cdrdao(void)
++{
++ char **drives = cdio_get_devices_nrg();
++ char *drive = (drives[0] == NULL) ? NULL : strdup(drives[0]);
++ cdio_free_device_list(drives);
++ return drive;
++}
++
++static bool
++get_hwinfo_cdrdao ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
++{
++ strcpy(hw_info->psz_vendor, "libcdio");
++ strcpy(hw_info->psz_model, "cdrdao");
++ strcpy(hw_info->psz_revision, CDIO_VERSION);
++ return true;
++
++}
++
++/*!
++ Return the number of tracks in the current medium.
++ CDIO_INVALID_TRACK is returned on error.
++*/
++static track_format_t
++_get_track_format_cdrdao(void *user_data, track_t i_track)
++{
++ _img_private_t *env = user_data;
++
++ if (!env->gen.init) _init_cdrdao(env);
++
++ if (i_track > env->gen.i_tracks || i_track == 0)
++ return TRACK_FORMAT_ERROR;
++
++ return env->tocent[i_track-env->gen.i_first_track].track_format;
++}
++
++/*!
++ Return true if we have XA data (green, mode2 form1) or
++ XA data (green, mode2 form2). That is track begins:
++ sync - header - subheader
++ 12 4 - 8
++
++ FIXME: there's gotta be a better design for this and get_track_format?
++*/
++static bool
++_get_track_green_cdrdao(void *user_data, track_t i_track)
++{
++ _img_private_t *env = user_data;
++
++ if (!env->gen.init) _init_cdrdao(env);
++
++ if (i_track > env->gen.i_tracks || i_track == 0)
++ return false;
++
++ return env->tocent[i_track-env->gen.i_first_track].track_green;
++}
++
++/*!
++ Return the starting LSN track number
++ i_track in obj. Track numbers start at 1.
++ The "leadout" track is specified either by
++ using i_track LEADOUT_TRACK or the total tracks+1.
++ False is returned if there is no track entry.
++*/
++static lba_t
++_get_lba_track_cdrdao(void *user_data, track_t i_track)
++{
++ _img_private_t *env = user_data;
++ _init_cdrdao (env);
++
++ if (i_track == CDIO_CDROM_LEADOUT_TRACK)
++ i_track = env->gen.i_tracks+1;
++
++ if (i_track <= env->gen.i_tracks+1 && i_track != 0) {
++ return env->tocent[i_track-1].start_lba;
++ } else
++ return CDIO_INVALID_LBA;
++}
++
++/*!
++ Check that a TOC file is valid. We parse the entire file.
++
++*/
++bool
++cdio_is_tocfile(const char *psz_cue_name)
++{
++ int i;
++
++ if (psz_cue_name == NULL) return false;
++
++ i=strlen(psz_cue_name)-strlen("toc");
++
++ if (i>0) {
++ if ( (psz_cue_name[i]=='t' && psz_cue_name[i+1]=='o' && psz_cue_name[i+2]=='c')
++ || (psz_cue_name[i]=='T' && psz_cue_name[i+1]=='O' && psz_cue_name[i+2]=='C') ) {
++ return parse_tocfile(NULL, psz_cue_name);
++ }
++ }
++ return false;
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_cdrdao (const char *psz_source_name, const char *psz_access_mode)
++{
++ if (psz_access_mode != NULL && strcmp(psz_access_mode, "image"))
++ cdio_warn ("there is only one access mode, 'image' for cdrdao. Arg %s ignored",
++ psz_access_mode);
++ return cdio_open_cdrdao(psz_source_name);
++}
++
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_cdrdao (const char *psz_cue_name)
++{
++ CdIo *ret;
++ _img_private_t *_data;
++
++ cdio_funcs _funcs;
++
++ memset( &_funcs, 0, sizeof(_funcs) );
++
++ _funcs.eject_media = _eject_media_image;
++ _funcs.free = _free_image;
++ _funcs.get_arg = _get_arg_image;
++ _funcs.get_cdtext = get_cdtext_generic;
++ _funcs.get_devices = cdio_get_devices_cdrdao;
++ _funcs.get_default_device = cdio_get_default_device_cdrdao;
++ _funcs.get_discmode = _get_discmode_image;
++ _funcs.get_drive_cap = _get_drive_cap_image;
++ _funcs.get_first_track_num= _get_first_track_num_image;
++ _funcs.get_hwinfo = get_hwinfo_cdrdao;
++ _funcs.get_mcn = _get_mcn_image;
++ _funcs.get_num_tracks = _get_num_tracks_image;
++ _funcs.get_track_format = _get_track_format_cdrdao;
++ _funcs.get_track_green = _get_track_green_cdrdao;
++ _funcs.get_track_lba = _get_lba_track_cdrdao;
++ _funcs.get_track_msf = _get_track_msf_image;
++ _funcs.lseek = _lseek_cdrdao;
++ _funcs.read = _read_cdrdao;
++ _funcs.read_audio_sectors = _read_audio_sectors_cdrdao;
++ _funcs.read_mode1_sector = _read_mode1_sector_cdrdao;
++ _funcs.read_mode1_sectors = _read_mode1_sectors_cdrdao;
++ _funcs.read_mode2_sector = _read_mode2_sector_cdrdao;
++ _funcs.read_mode2_sectors = _read_mode2_sectors_cdrdao;
++ _funcs.set_arg = _set_arg_image;
++ _funcs.stat_size = _stat_size_cdrdao;
++
++ if (NULL == psz_cue_name) return NULL;
++
++ _data = _cdio_malloc (sizeof (_img_private_t));
++ _data->gen.init = false;
++ _data->psz_cue_name = NULL;
++ _data->gen.data_source = NULL;
++ _data->gen.source_name = NULL;
++
++ ret = cdio_new ((void *)_data, &_funcs);
++
++ if (ret == NULL) {
++ free(_data);
++ return NULL;
++ }
++
++ if (!cdio_is_tocfile(psz_cue_name)) {
++ cdio_debug ("source name %s is not recognized as a TOC file",
++ psz_cue_name);
++ return NULL;
++ }
++
++ _set_arg_image (_data, "cue", psz_cue_name);
++ _set_arg_image (_data, "source", psz_cue_name);
++
++ if (_init_cdrdao(_data)) {
++ return ret;
++ } else {
++ _free_image(_data);
++ free(ret);
++ return NULL;
++ }
++}
++
++bool
++cdio_have_cdrdao (void)
++{
++ return true;
++}
+--- ./src/input/vcd/libcdio/image/nrg.c 11 Apr 2004 12:20:32 -0000 1.1
++++ ./src/input/vcd/libcdio/image/nrg.c 3 Jan 2005 21:14:00 -0000 1.1.2.1
+@@ -1,8 +1,8 @@
+ /*
+- $Id: nrg.c,v 1.1 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: nrg.c,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -22,9 +22,7 @@
+ CD-image format residing inside a disk file (*.nrg).
+ */
+
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
++#include "image.h"
+
+ #ifdef HAVE_STDIO_H
+ #include <stdio.h>
+@@ -39,108 +37,22 @@
+ #include <glob.h>
+ #endif
+
++#include <cdio/bytesex.h>
++#include <cdio/ds.h>
+ #include <cdio/logging.h>
+-#include <cdio/sector.h>
+ #include <cdio/util.h>
++#include <cdio/version.h>
+ #include "cdio_assert.h"
+-#include "bytesex.h"
+-#include "ds.h"
+-#include "cdio_private.h"
+ #include "_cdio_stdio.h"
++#include "nrg.h"
+
+-static const char _rcsid[] = "$Id: nrg.c,v 1.1 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: nrg.c,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+-/* structures used */
+-
+-/* this ugly image format is typical for lazy win32 programmers... at
+- least structure were set big endian, so at reverse
+- engineering wasn't such a big headache... */
+-
+-PRAGMA_BEGIN_PACKED
+-typedef struct {
+- uint32_t start GNUC_PACKED;
+- uint32_t length GNUC_PACKED;
+- uint32_t type GNUC_PACKED; /* 0x0 -> MODE1, 0x2 -> MODE2 form1,
+- 0x3 -> MIXED_MODE2 2336 blocksize
+- */
+- uint32_t start_lsn GNUC_PACKED; /* does not include any pre-gaps! */
+- uint32_t _unknown GNUC_PACKED; /* wtf is this for? -- always zero... */
+-} _etnf_array_t;
+-
+-/* finally they realized that 32bit offsets are a bit outdated for IA64 *eg* */
+-typedef struct {
+- uint64_t start GNUC_PACKED;
+- uint64_t length GNUC_PACKED;
+- uint32_t type GNUC_PACKED; /* 0x0 -> MODE1, 0x2 -> MODE2 form1,
+- 0x3 -> MIXED_MODE2 2336 blocksize
+- */
+- uint32_t start_lsn GNUC_PACKED;
+- uint64_t _unknown GNUC_PACKED; /* wtf is this for? -- always zero... */
+-} _etn2_array_t;
+-
+-typedef struct {
+- uint8_t _unknown1 GNUC_PACKED; /* 0x41 == 'A' */
+- uint8_t track GNUC_PACKED; /* binary or BCD?? */
+- uint8_t index GNUC_PACKED; /* makes 0->1 transitions */
+- uint8_t _unknown2 GNUC_PACKED; /* ?? */
+- uint32_t lsn GNUC_PACKED;
+-} _cuex_array_t;
+-
+-typedef struct {
+- uint8_t _unknown[64] GNUC_PACKED;
+-} _daox_array_t;
+-
+-typedef struct {
+- uint32_t id GNUC_PACKED;
+- uint32_t len GNUC_PACKED;
+- char data[EMPTY_ARRAY_SIZE] GNUC_PACKED;
+-} _chunk_t;
+-
+-PRAGMA_END_PACKED
+-
+-/* to be converted into BE */
+-#define CUEX_ID 0x43554558
+-#define CUES_ID 0x43554553
+-#define DAOX_ID 0x44414f58
+-#define DAOI_ID 0x44414f49
+-#define END1_ID 0x454e4421
+-#define ETN2_ID 0x45544e32
+-#define ETNF_ID 0x45544e46
+-#define NER5_ID 0x4e455235
+-#define NERO_ID 0x4e45524f
+-#define SINF_ID 0x53494e46 /* Session information */
+-#define MTYP_ID 0x4d545950 /* Disc Media type? */
+-
+-#define MTYP_AUDIO_CD 1 /* This isn't correct. But I don't know the
+- the right thing is and it sometimes works (and
+- sometimes is wrong). */
+-
+-/* Disk track type Values gleaned from DAOX */
+-#define DTYP_MODE1 0
+-#define DTYP_MODE2_XA 2
+-#define DTYP_INVALID 255
+
+ /* reader */
+
+ #define DEFAULT_CDIO_DEVICE "image.nrg"
+
+-typedef struct {
+- int track_num; /* Probably is index+1 */
+- msf_t start_msf;
+- lba_t start_lba;
+- int start_index;
+- int sec_count; /* Number of sectors in track. Does not
+- include pregap before next entry. */
+- int flags; /* "DCP", "4CH", "PRE" */
+- track_format_t track_format;
+- bool track_green;
+- uint16_t datasize; /* How much is in the portion we return back? */
+- long int datastart; /* Offset from begining that data starts */
+- uint16_t endsize; /* How much stuff at the end to skip over. This
+- stuff may have error correction (EDC, or ECC).*/
+- uint16_t blocksize; /* total block size = start + size + end */
+-} track_info_t;
+-
+ /*
+ Link element of track structure as a linked list.
+ Possibly redundant with above track_info_t */
+@@ -150,6 +62,7 @@
+ include pregap before next entry. */
+ uint64_t img_offset; /* Bytes offset from beginning of disk image file.*/
+ uint32_t blocksize; /* Number of bytes in a block */
++ int flags; /* don't copy, 4 channel, pre-emphasis */
+ } _mapping_t;
+
+
+@@ -158,6 +71,17 @@
+ This must be first. */
+ generic_img_private_t gen;
+ internal_position_t pos;
++
++ /* This is common to all image drivers... */
++ char *psz_cue_name;
++ char *psz_mcn; /* Media Catalog Number (5.22.3) */
++
++ track_info_t tocent[CDIO_CD_MAX_TRACKS+1]; /* entry info for each track
++ add 1 for leadout. */
++ discmode_t disc_mode;
++
++ /* Nero Specific stuff. Note: for the image_free to work, this *must*
++ be last. */
+ bool is_dao; /* True if some of disk at once. False
+ if some sort of track at once. */
+ uint32_t mtyp; /* Value of MTYP (media type?) tag */
+@@ -166,38 +90,38 @@
+ /* This is a hack because I don't really understnad NERO better. */
+ bool is_cues;
+
+- char *mcn; /* Media catalog number. */
+- track_info_t tocent[100]; /* entry info for each track */
+- track_t total_tracks; /* number of tracks in image */
+- track_t first_track_num; /* track number of first track */
+ CdioList *mapping; /* List of track information */
+ uint32_t size;
+ } _img_private_t;
+
+-static bool _cdio_parse_nero_footer (_img_private_t *_obj);
+-static uint32_t _cdio_stat_size (void *env);
++static bool parse_nrg (_img_private_t *env, const char *psz_cue_name);
++static uint32_t _stat_size_nrg (void *user_data);
++
++#include "image_common.h"
+
+ /* Updates internal track TOC, so we can later
+ simulate ioctl(CDROMREADTOCENTRY).
+ */
+ static void
+-_register_mapping (_img_private_t *_obj, lsn_t start_lsn, uint32_t sec_count,
++_register_mapping (_img_private_t *env, lsn_t start_lsn, uint32_t sec_count,
+ uint64_t img_offset, uint32_t blocksize,
+- track_format_t track_format, bool track_green)
++ track_format_t track_format, bool track_green,
++ int flags)
+ {
+- const int track_num=_obj->total_tracks;
+- track_info_t *this_track=&(_obj->tocent[_obj->total_tracks]);
++ const int track_num=env->gen.i_tracks;
++ track_info_t *this_track=&(env->tocent[env->gen.i_tracks]);
+ _mapping_t *_map = _cdio_malloc (sizeof (_mapping_t));
+
+ _map->start_lsn = start_lsn;
+ _map->sec_count = sec_count;
+ _map->img_offset = img_offset;
+ _map->blocksize = blocksize;
++ _map->flags = flags;
+
+- if (!_obj->mapping) _obj->mapping = _cdio_list_new ();
+- _cdio_list_append (_obj->mapping, _map);
++ if (!env->mapping) env->mapping = _cdio_list_new ();
++ _cdio_list_append (env->mapping, _map);
+
+- _obj->size = MAX (_obj->size, (start_lsn + sec_count));
++ env->size = MAX (env->size, (start_lsn + sec_count));
+
+ /* Update *this_track and track_num. These structures are
+ in a sense redundant witht the obj->mapping list. Perhaps one
+@@ -208,7 +132,7 @@
+ this_track->start_lba = cdio_msf_to_lba(&this_track->start_msf);
+ this_track->track_num = track_num+1;
+ this_track->blocksize = blocksize;
+- if (_obj->is_cues)
++ if (env->is_cues)
+ this_track->datastart = img_offset;
+ else
+ this_track->datastart = 0;
+@@ -260,10 +184,10 @@
+ default:
+ /*this_track->datasize=CDIO_CD_FRAMESIZE_RAW;*/
+ cdio_warn ("track %d has unknown format %d",
+- _obj->total_tracks, this_track->track_format);
++ env->gen.i_tracks, this_track->track_format);
+ }
+
+- _obj->total_tracks++;
++ env->gen.i_tracks++;
+
+ cdio_debug ("start lsn: %lu sector count: %0lu -> %8ld (%08lx)",
+ (long unsigned int) start_lsn,
+@@ -276,66 +200,50 @@
+ /*
+ Disk and track information for a Nero file are located at the end
+ of the file. This routine extracts that information.
++
++ FIXME: right now psz_nrg_name is not used. It will be in the future.
+ */
+ static bool
+-_cdio_parse_nero_footer (_img_private_t *_obj)
++parse_nrg (_img_private_t *env, const char *psz_nrg_name)
+ {
+ long unsigned int footer_start;
+ long unsigned int size;
+ char *footer_buf = NULL;
++ cdio_log_level_t log_level = (NULL == env) ? CDIO_LOG_INFO : CDIO_LOG_WARN;
+
+- if (_obj->size) return true;
+-
+- size = cdio_stream_stat (_obj->gen.data_source);
++ size = cdio_stream_stat (env->gen.data_source);
+ if (-1 == size) return false;
+
+ {
+-PRAGMA_BEGIN_PACKED
+- union {
+- struct {
+- uint32_t __x GNUC_PACKED;
+- uint32_t ID GNUC_PACKED;
+- uint32_t footer_ofs GNUC_PACKED;
+- } v50;
+- struct {
+- uint32_t ID GNUC_PACKED;
+- uint64_t footer_ofs GNUC_PACKED;
+- } v55;
+- } buf;
+-PRAGMA_END_PACKED
+-
++ _footer_t buf;
+ cdio_assert (sizeof (buf) == 12);
+
+- cdio_stream_seek (_obj->gen.data_source, size - sizeof (buf), SEEK_SET);
+- cdio_stream_read (_obj->gen.data_source, (void *) &buf, sizeof (buf), 1);
++ cdio_stream_seek (env->gen.data_source, size - sizeof (buf), SEEK_SET);
++ cdio_stream_read (env->gen.data_source, (void *) &buf, sizeof (buf), 1);
+
+- if (buf.v50.ID == UINT32_TO_BE (0x4e45524f)) /* "NERO" */
+- {
+- cdio_info ("detected v50 (32bit offsets) NRG magic");
+- footer_start = uint32_to_be (buf.v50.footer_ofs);
+- }
+- else if (buf.v55.ID == UINT32_TO_BE (0x4e455235)) /* "NER5" */
+- {
+- cdio_info ("detected v55 (64bit offsets) NRG magic");
+- footer_start = uint64_from_be (buf.v55.footer_ofs);
+- }
+- else
+- {
+- cdio_warn ("Image not recognized as either v50 or v55 type NRG");
+- return false;
+- }
++ if (buf.v50.ID == UINT32_TO_BE (NERO_ID)) {
++ cdio_info ("detected Nero version 5.0 (32-bit offsets) NRG magic");
++ footer_start = uint32_to_be (buf.v50.footer_ofs);
++ } else if (buf.v55.ID == UINT32_TO_BE (NER5_ID)) {
++ cdio_info ("detected Nero version 5.5.x (64-bit offsets) NRG magic");
++ footer_start = uint64_from_be (buf.v55.footer_ofs);
++ } else {
++ cdio_log (log_level, "Image not recognized as either version 5.0 or "
++ "version 5.5.x-6.x type NRG");
++ return false;
++ }
+
+- cdio_debug ("nrg footer start = %ld, length = %ld",
++ cdio_debug (".NRG footer start = %ld, length = %ld",
+ (long) footer_start, (long) (size - footer_start));
+
+ cdio_assert (IN ((size - footer_start), 0, 4096));
+
+ footer_buf = _cdio_malloc (size - footer_start);
+
+- cdio_stream_seek (_obj->gen.data_source, footer_start, SEEK_SET);
+- cdio_stream_read (_obj->gen.data_source, footer_buf, size - footer_start, 1);
++ cdio_stream_seek (env->gen.data_source, footer_start, SEEK_SET);
++ cdio_stream_read (env->gen.data_source, footer_buf,
++ size - footer_start, 1);
+ }
+-
+ {
+ int pos = 0;
+
+@@ -355,7 +263,7 @@
+ unsigned entries = UINT32_FROM_BE (chunk->len);
+ _cuex_array_t *_entries = (void *) chunk->data;
+
+- cdio_assert (_obj->mapping == NULL);
++ cdio_assert (env->mapping == NULL);
+
+ cdio_assert ( sizeof (_cuex_array_t) == 8 );
+ cdio_assert ( UINT32_FROM_BE (chunk->len) % sizeof(_cuex_array_t)
+@@ -368,15 +276,22 @@
+ int idx;
+
+ cdio_info ("CUES type image detected" );
+- /*cdio_assert (lsn == 0?);*/
++
++ /* CUES LSN has 150 pregap include at beginning? -/
++ cdio_assert (lsn == 0?);
++ */
+
+- _obj->is_cues = true; /* HACK alert. */
+- _obj->total_tracks = 0;
+- _obj->first_track_num = 1;
++ env->is_cues = true; /* HACK alert. */
++ env->gen.i_tracks = 0;
++ env->gen.i_first_track = 1;
+ for (idx = 1; idx < entries-1; idx += 2) {
+ lsn_t sec_count;
+-
+- cdio_assert (_entries[idx].index == 0);
++ int addrtype = _entries[idx].addr_ctrl / 16;
++ int control = _entries[idx].addr_ctrl % 16;
++ int flags = 0;
++ if ( 1 == control )
++ flags &= ~CDIO_TRACK_FLAG_COPY_PERMITTED;
++
+ cdio_assert (_entries[idx].track == _entries[idx + 1].track);
+
+ /* lsn and sec_count*2 aren't correct, but it comes closer on the
+@@ -384,103 +299,177 @@
+ We are picking up the wrong fields and/or not interpreting
+ them correctly.
+ */
++
++ switch (addrtype) {
++ case 0:
++ lsn = UINT32_FROM_BE (_entries[idx].lsn);
++ break;
++ case 1:
++ {
++#if 0
++ msf_t msf = (msf_t) _entries[idx].lsn;
++ lsn = cdio_msf_to_lsn(&msf);
++#else
++ lsn = CDIO_INVALID_LSN;
++#endif
++ cdio_warn ("untested (i.e. probably wrong) CUE MSF code");
++ break;
++ }
++ default:
++ lsn = CDIO_INVALID_LSN;
++ cdio_warn("unknown addrtype %d", addrtype);
++ }
+
+- lsn = UINT32_FROM_BE (_entries[idx].lsn);
+ sec_count = UINT32_FROM_BE (_entries[idx + 1].lsn);
+
+- _register_mapping (_obj, lsn, sec_count*2,
++ _register_mapping (env, lsn, sec_count*2,
+ (lsn+CDIO_PREGAP_SECTORS) * M2RAW_SECTOR_SIZE,
+- M2RAW_SECTOR_SIZE, TRACK_FORMAT_XA, true);
++ M2RAW_SECTOR_SIZE, TRACK_FORMAT_XA, true,
++ flags);
+ }
+ } else {
+ lsn_t lsn = UINT32_FROM_BE (_entries[0].lsn);
+ int idx;
+
+ cdio_info ("CUEX type image detected");
+- cdio_assert (lsn == 0xffffff6a);
++
++ /* LSN must start at -150 (LBA 0)? */
++ cdio_assert (lsn == -150);
+
+ for (idx = 2; idx < entries; idx += 2) {
+ lsn_t sec_count;
+-
+- cdio_assert (_entries[idx].index == 1);
++ int addrtype = _entries[idx].addr_ctrl >> 4;
++ int control = _entries[idx].addr_ctrl & 0xf;
++ int flags = 0;
++ if ( 1 == control )
++ flags &= ~CDIO_TRACK_FLAG_COPY_PERMITTED;
++
++ /* extractnrg.pl has addrtype for LBA's 0, and
++ for MSF 1. ???
++
++ FIXME: Should decode as appropriate for addrtype.
++ */
++ cdio_assert ( addrtype == 0 || addrtype == 1 );
++
+ cdio_assert (_entries[idx].track != _entries[idx + 1].track);
+
+ lsn = UINT32_FROM_BE (_entries[idx].lsn);
+ sec_count = UINT32_FROM_BE (_entries[idx + 1].lsn);
+
+- _register_mapping (_obj, lsn, sec_count - lsn,
++ _register_mapping (env, lsn, sec_count - lsn,
+ (lsn + CDIO_PREGAP_SECTORS)*M2RAW_SECTOR_SIZE,
+- M2RAW_SECTOR_SIZE, TRACK_FORMAT_XA, true);
++ M2RAW_SECTOR_SIZE, TRACK_FORMAT_XA, true,
++ flags);
+ }
+ }
+ break;
+ }
+
+- case DAOI_ID: /* "DAOI" */
+ case DAOX_ID: /* "DAOX" */
++ case DAOI_ID: /* "DAOI" */
+ {
+- _daox_array_t *_entries = (void *) chunk->data;
+ track_format_t track_format;
+- int form = _entries->_unknown[18];
+- _obj->dtyp = _entries->_unknown[36];
+- _obj->is_dao = true;
++ int form2;
++
++ /* We include an extra 0 byte so these can be used as C strings.*/
++ env->psz_mcn = _cdio_malloc (CDIO_MCN_SIZE+1);
++
++ if (DAOX_ID == opcode) {
++ _daox_array_t *_entries = (void *) chunk->data;
++ form2 = _entries->_unknown[1];
++ env->dtyp = _entries->_unknown[19];
++ memcpy(env->psz_mcn, &(_entries->psz_mcn), CDIO_MCN_SIZE);
++ env->psz_mcn[CDIO_MCN_SIZE] = '\0';
++ } else {
++ _daoi_array_t *_entries = (void *) chunk->data;
++ form2 = _entries->_unknown[1];
++ env->dtyp = _entries->_unknown[19];
++ memcpy(env->psz_mcn, &(_entries->psz_mcn), CDIO_MCN_SIZE);
++ env->psz_mcn[CDIO_MCN_SIZE] = '\0';
++ }
++
++ env->is_dao = true;
+ cdio_debug ("DAO%c tag detected, track format %d, form %x\n",
+- opcode==DAOX_ID ? 'X': 'I', _obj->dtyp, form);
+- switch (_obj->dtyp) {
++ opcode==DAOX_ID ? 'X': 'I', env->dtyp, form2);
++ switch (env->dtyp) {
+ case 0:
+- track_format = TRACK_FORMAT_DATA;
++ /* Mode 1 */
++ track_format = TRACK_FORMAT_DATA;
++ env->disc_mode = CDIO_DISC_MODE_CD_DATA;
++ break;
++ case 2:
++ /* Mode 2 form 1 */
++ form2 = 0;
++ track_format = TRACK_FORMAT_XA;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA;
++ break;
++ case 3:
++ /* Mode 2 */
++ track_format = TRACK_FORMAT_XA;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ?? */
+ break;
+ case 0x6:
+- case 0x20:
+- track_format = TRACK_FORMAT_XA;
++ /* Mode2 form mix */
++ track_format = TRACK_FORMAT_XA;
++ env->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ case 0x20: /* ??? Mode2 form 2, Mode2 raw?? */
++ track_format = TRACK_FORMAT_XA;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ??. */
+ break;
+ case 0x7:
+- track_format = TRACK_FORMAT_AUDIO;
++ track_format = TRACK_FORMAT_AUDIO;
++ env->disc_mode = CDIO_DISC_MODE_CD_DA;
+ break;
+ default:
+- cdio_warn ("Unknown track format %x\n",
+- _obj->dtyp);
++ cdio_log (log_level, "Unknown track format %x\n",
++ env->dtyp);
+ track_format = TRACK_FORMAT_AUDIO;
+ }
+- if (0 == form) {
++ if (0 == form2) {
+ int i;
+- for (i=0; i<_obj->total_tracks; i++) {
+- _obj->tocent[i].track_format= track_format;
+- _obj->tocent[i].datastart = 0;
+- _obj->tocent[i].track_green = false;
++ for (i=0; i<env->gen.i_tracks; i++) {
++ cdtext_init (&(env->gen.cdtext_track[i]));
++ env->tocent[i].track_format= track_format;
++ env->tocent[i].datastart = 0;
++ env->tocent[i].track_green = false;
+ if (TRACK_FORMAT_AUDIO == track_format) {
+- _obj->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
+- _obj->tocent[i].datasize = CDIO_CD_FRAMESIZE_RAW;
+- _obj->tocent[i].endsize = 0;
++ env->tocent[i].blocksize = CDIO_CD_FRAMESIZE_RAW;
++ env->tocent[i].datasize = CDIO_CD_FRAMESIZE_RAW;
++ env->tocent[i].endsize = 0;
+ } else {
+- _obj->tocent[i].datasize = CDIO_CD_FRAMESIZE;
+- _obj->tocent[i].datastart = 0;
++ env->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ env->tocent[i].datastart = 0;
+ }
+ }
+- } else if (2 == form) {
++ } else if (2 == form2) {
+ int i;
+- for (i=0; i<_obj->total_tracks; i++) {
+- _obj->tocent[i].track_green = true;
+- _obj->tocent[i].track_format= track_format;
+- _obj->tocent[i].datasize = CDIO_CD_FRAMESIZE;
++ for (i=0; i<env->gen.i_tracks; i++) {
++ cdtext_init (&(env->gen.cdtext_track[i]));
++ env->tocent[i].track_green = true;
++ env->tocent[i].track_format= track_format;
++ env->tocent[i].datasize = CDIO_CD_FRAMESIZE;
+ if (TRACK_FORMAT_XA == track_format) {
+- _obj->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ env->tocent[i].datastart = CDIO_CD_SYNC_SIZE
+ + CDIO_CD_HEADER_SIZE + CDIO_CD_SUBHEADER_SIZE;
+- _obj->tocent[i].endsize = CDIO_CD_SYNC_SIZE
++ env->tocent[i].endsize = CDIO_CD_SYNC_SIZE
+ + CDIO_CD_ECC_SIZE;
+ } else {
+- _obj->tocent[i].datastart = CDIO_CD_SYNC_SIZE
++ env->tocent[i].datastart = CDIO_CD_SYNC_SIZE
+ + CDIO_CD_HEADER_SIZE;
+- _obj->tocent[i].endsize = CDIO_CD_EDC_SIZE
++ env->tocent[i].endsize = CDIO_CD_EDC_SIZE
+ + CDIO_CD_M1F1_ZERO_SIZE + CDIO_CD_ECC_SIZE;
+
+ }
+ }
++ } else {
++ cdio_log (log_level, "Don't know if form1 or form2 form2: %x\n",
++ form2);
+ }
+ break;
+ }
+- case NERO_ID: /* "NER0" */
+- case NER5_ID: /* "NER5" */
++ case NERO_ID:
++ case NER5_ID:
+ cdio_error ("unexpected nrg magic ID NER%c detected",
+ opcode==NERO_ID ? 'O': '5');
+ free(footer_buf);
+@@ -496,7 +485,7 @@
+ unsigned entries = UINT32_FROM_BE (chunk->len);
+ _etnf_array_t *_entries = (void *) chunk->data;
+
+- cdio_assert (_obj->mapping == NULL);
++ cdio_assert (env->mapping == NULL);
+
+ cdio_assert ( sizeof (_etnf_array_t) == 20 );
+ cdio_assert ( UINT32_FROM_BE(chunk->len) % sizeof(_etnf_array_t)
+@@ -519,28 +508,49 @@
+
+ switch (track_mode) {
+ case 0:
+- track_format = TRACK_FORMAT_DATA;
+- track_green = false; /* ?? */
+- blocksize = CDIO_CD_FRAMESIZE;
++ /* Mode 1 */
++ track_format = TRACK_FORMAT_DATA;
++ track_green = false; /* ?? */
++ blocksize = CDIO_CD_FRAMESIZE;
++ env->disc_mode = CDIO_DISC_MODE_CD_DATA;
+ break;
+ case 2:
+- track_format = TRACK_FORMAT_XA;
+- track_green = false; /* ?? */
+- blocksize = CDIO_CD_FRAMESIZE;
++ /* Mode 2 form 1 */
++ track_format = TRACK_FORMAT_XA;
++ track_green = false; /* ?? */
++ blocksize = CDIO_CD_FRAMESIZE;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA;
+ break;
+ case 3:
+- track_format = TRACK_FORMAT_XA;
+- track_green = true;
+- blocksize = M2RAW_SECTOR_SIZE;
++ /* Mode 2 */
++ track_format = TRACK_FORMAT_XA;
++ track_green = true;
++ blocksize = M2RAW_SECTOR_SIZE;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ?? */
++ break;
++ case 06:
++ /* Mode2 form mix */
++ track_format = TRACK_FORMAT_XA;
++ track_green = true;
++ blocksize = M2RAW_SECTOR_SIZE;
++ env->disc_mode = CDIO_DISC_MODE_CD_MIXED;
++ break;
++ case 0x20: /* ??? Mode2 form 2, Mode2 raw?? */
++ track_format = TRACK_FORMAT_XA;
++ track_green = true;
++ blocksize = M2RAW_SECTOR_SIZE;
++ env->disc_mode = CDIO_DISC_MODE_CD_XA; /* ??. */
+ break;
+ case 7:
+- track_format = TRACK_FORMAT_AUDIO;
+- track_green = false;
+- blocksize = CDIO_CD_FRAMESIZE_RAW;
++ track_format = TRACK_FORMAT_AUDIO;
++ track_green = false;
++ blocksize = CDIO_CD_FRAMESIZE_RAW;
++ env->disc_mode = CDIO_DISC_MODE_CD_DA;
+ break;
+ default:
+- cdio_warn ("Don't know how to handle track mode (%lu)?",
+- (long unsigned int) track_mode);
++ cdio_log (log_level,
++ "Don't know how to handle track mode (%lu)?",
++ (long unsigned int) track_mode);
+ free(footer_buf);
+ return false;
+ }
+@@ -552,8 +562,8 @@
+ cdio_assert (_start * blocksize == _start2);
+
+ _start += idx * CDIO_PREGAP_SECTORS;
+- _register_mapping (_obj, _start, _len, _start2, blocksize,
+- track_format, track_green);
++ _register_mapping (env, _start, _len, _start2, blocksize,
++ track_format, track_green, 0);
+
+ }
+ }
+@@ -564,7 +574,7 @@
+ unsigned entries = uint32_from_be (chunk->len);
+ _etn2_array_t *_entries = (void *) chunk->data;
+
+- cdio_assert (_obj->mapping == NULL);
++ cdio_assert (env->mapping == NULL);
+
+ cdio_assert (sizeof (_etn2_array_t) == 32);
+ cdio_assert (uint32_from_be (chunk->len) % sizeof (_etn2_array_t) == 0);
+@@ -607,25 +617,30 @@
+ blocksize = CDIO_CD_FRAMESIZE_RAW;
+ break;
+ default:
+- cdio_warn ("Don't know how to handle track mode (%lu)?",
+- (long unsigned int) track_mode);
++ cdio_log (log_level,
++ "Don't know how to handle track mode (%lu)?",
++ (long unsigned int) track_mode);
+ free(footer_buf);
+ return false;
+ }
+
+ if (_len % blocksize != 0) {
+- cdio_warn ("length is not a multiple of blocksize "
++ cdio_log (log_level,
++ "length is not a multiple of blocksize "
+ "len %lu, size %d, rem %lu",
+ (long unsigned int) _len, blocksize,
+ (long unsigned int) _len % blocksize);
+ if (0 == _len % CDIO_CD_FRAMESIZE) {
+- cdio_warn("Adjusting blocksize to %d", CDIO_CD_FRAMESIZE);
++ cdio_log(log_level, "Adjusting blocksize to %d",
++ CDIO_CD_FRAMESIZE);
+ blocksize = CDIO_CD_FRAMESIZE;
+ } else if (0 == _len % M2RAW_SECTOR_SIZE) {
+- cdio_warn("Adjusting blocksize to %d", M2RAW_SECTOR_SIZE);
++ cdio_log(log_level,
++ "Adjusting blocksize to %d", M2RAW_SECTOR_SIZE);
+ blocksize = M2RAW_SECTOR_SIZE;
+ } else if (0 == _len % CDIO_CD_FRAMESIZE_RAW) {
+- cdio_warn("Adjusting blocksize to %d", CDIO_CD_FRAMESIZE_RAW);
++ cdio_log(log_level,
++ "Adjusting blocksize to %d", CDIO_CD_FRAMESIZE_RAW);
+ blocksize = CDIO_CD_FRAMESIZE_RAW;
+ }
+ }
+@@ -633,24 +648,28 @@
+ _len /= blocksize;
+
+ if (_start * blocksize != _start2) {
+- cdio_warn ("%lu * %d != %lu",
++ cdio_log (log_level,
++ "%lu * %d != %lu",
+ (long unsigned int) _start, blocksize,
+ (long unsigned int) _start2);
+ if (_start * CDIO_CD_FRAMESIZE == _start2) {
+- cdio_warn("Adjusting blocksize to %d", CDIO_CD_FRAMESIZE);
++ cdio_log(log_level,
++ "Adjusting blocksize to %d", CDIO_CD_FRAMESIZE);
+ blocksize = CDIO_CD_FRAMESIZE;
+ } else if (_start * M2RAW_SECTOR_SIZE == _start2) {
+- cdio_warn("Adjusting blocksize to %d", M2RAW_SECTOR_SIZE);
++ cdio_log(log_level,
++ "Adjusting blocksize to %d", M2RAW_SECTOR_SIZE);
+ blocksize = M2RAW_SECTOR_SIZE;
+ } else if (0 == _start * CDIO_CD_FRAMESIZE_RAW == _start2) {
+- cdio_warn("Adjusting blocksize to %d", CDIO_CD_FRAMESIZE_RAW);
++ cdio_log(log_level,
++ "Adjusting blocksize to %d", CDIO_CD_FRAMESIZE_RAW);
+ blocksize = CDIO_CD_FRAMESIZE_RAW;
+ }
+ }
+
+ _start += idx * CDIO_PREGAP_SECTORS;
+- _register_mapping (_obj, _start, _len, _start2, blocksize,
+- track_format, track_green);
++ _register_mapping (env, _start, _len, _start2, blocksize,
++ track_format, track_green, 0);
+ }
+ }
+ break;
+@@ -677,15 +696,24 @@
+ (long unsigned int) UINT32_FROM_BE (*mtyp_p));
+
+ if (mtyp != MTYP_AUDIO_CD) {
+- cdio_warn ("Unknown MTYP value: %u", (unsigned int) mtyp);
++ cdio_log (log_level,
++ "Unknown MTYP value: %u", (unsigned int) mtyp);
+ }
+- _obj->mtyp = mtyp;
++ env->mtyp = mtyp;
+ }
+ break;
+
++ case CDTX_ID: { /* "CD TEXT" */
++
++ cdio_log (log_level,
++ "Don't know how to handle CD TEXT yet" );
++ break;
++ }
++
+ default:
+- cdio_warn ("unknown tag %8.8x seen",
+- (unsigned int) UINT32_FROM_BE (chunk->id));
++ cdio_log (log_level,
++ "unknown tag %8.8x seen",
++ (unsigned int) UINT32_FROM_BE (chunk->id));
+ break;
+ }
+
+@@ -698,14 +726,17 @@
+ }
+
+ /* Fake out leadout track. */
+- /* Don't use _cdio_stat_size since that will lead to recursion since
++ /* Don't use _stat_size_nrg since that will lead to recursion since
+ we haven't fully initialized things yet.
+ */
+- cdio_lsn_to_msf (_obj->size, &_obj->tocent[_obj->total_tracks].start_msf);
+- _obj->tocent[_obj->total_tracks].start_lba = cdio_lsn_to_lba(_obj->size);
+- _obj->tocent[_obj->total_tracks-1].sec_count =
+- cdio_lsn_to_lba(_obj->size - _obj->tocent[_obj->total_tracks-1].start_lba);
+-
++ cdio_lsn_to_msf (env->size, &env->tocent[env->gen.i_tracks].start_msf);
++ env->tocent[env->gen.i_tracks].start_lba = cdio_lsn_to_lba(env->size);
++ env->tocent[env->gen.i_tracks-1].sec_count =
++ cdio_lsn_to_lba(env->size - env->tocent[env->gen.i_tracks-1].start_lba);
++
++ env->gen.b_cdtext_init = true;
++ env->gen.b_cdtext_error = false;
++ env->gen.toc_init = true;
+ free(footer_buf);
+ return true;
+ }
+@@ -714,20 +745,31 @@
+ Initialize image structures.
+ */
+ static bool
+-_cdio_init (_img_private_t *_obj)
++_init_nrg (_img_private_t *env)
+ {
+- if (_obj->gen.init) {
++ if (env->gen.init) {
+ cdio_error ("init called more than once");
+ return false;
+ }
+
+- if (!(_obj->gen.data_source = cdio_stdio_new (_obj->gen.source_name))) {
+- cdio_warn ("init failed");
++ if (!(env->gen.data_source = cdio_stdio_new (env->gen.source_name))) {
++ cdio_warn ("can't open nrg image file %s for reading",
++ env->gen.source_name);
+ return false;
+ }
+
+- _cdio_parse_nero_footer (_obj);
+- _obj->gen.init = true;
++ env->psz_mcn = NULL;
++ env->disc_mode = CDIO_DISC_MODE_NO_INFO;
++
++ cdtext_init (&(env->gen.cdtext));
++
++ if ( !parse_nrg (env, env->gen.source_name) ) {
++ cdio_warn ("image file %s is not a Nero image",
++ env->gen.source_name);
++ return false;
++ }
++
++ env->gen.init = true;
+ return true;
+
+ }
+@@ -739,40 +781,40 @@
+ information in each sector.
+ */
+ static off_t
+-_cdio_lseek (void *env, off_t offset, int whence)
++_lseek_nrg (void *user_data, off_t offset, int whence)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+ /* real_offset is the real byte offset inside the disk image
+ The number below was determined empirically.
+ */
+- off_t real_offset= _obj->is_dao ? 0x4b000 : 0;
++ off_t real_offset= env->is_dao ? 0x4b000 : 0;
+
+ unsigned int i;
+
+- for (i=0; i<_obj->total_tracks; i++) {
+- track_info_t *this_track=&(_obj->tocent[i]);
+- _obj->pos.index = i;
++ for (i=0; i<env->gen.i_tracks; i++) {
++ track_info_t *this_track=&(env->tocent[i]);
++ env->pos.index = i;
+ if ( (this_track->sec_count*this_track->datasize) >= offset) {
+ int blocks = offset / this_track->datasize;
+ int rem = offset % this_track->datasize;
+ int block_offset = blocks * this_track->blocksize;
+ real_offset += block_offset + rem;
+- _obj->pos.buff_offset = rem;
+- _obj->pos.lba += blocks;
++ env->pos.buff_offset = rem;
++ env->pos.lba += blocks;
+ break;
+ }
+ real_offset += this_track->sec_count*this_track->blocksize;
+ offset -= this_track->sec_count*this_track->datasize;
+- _obj->pos.lba += this_track->sec_count;
++ env->pos.lba += this_track->sec_count;
+ }
+
+- if (i==_obj->total_tracks) {
++ if (i==env->gen.i_tracks) {
+ cdio_warn ("seeking outside range of disk image");
+ return -1;
+ } else
+- real_offset += _obj->tocent[i].datastart;
+- return cdio_stream_seek(_obj->gen.data_source, real_offset, whence);
++ real_offset += env->tocent[i].datastart;
++ return cdio_stream_seek(env->gen.data_source, real_offset, whence);
+ }
+
+ /*!
+@@ -783,18 +825,18 @@
+ boundaries.
+ */
+ static ssize_t
+-_cdio_read (void *env, void *buf, size_t size)
++_read_nrg (void *user_data, void *buf, size_t size)
+ {
+- _img_private_t *_obj = env;
+- return cdio_stream_read(_obj->gen.data_source, buf, size, 1);
++ _img_private_t *env = user_data;
++ return cdio_stream_read(env->gen.data_source, buf, size, 1);
+ }
+
+ static uint32_t
+-_cdio_stat_size (void *env)
++_stat_size_nrg (void *user_data)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+- return _obj->size;
++ return env->size;
+ }
+
+ /*!
+@@ -802,21 +844,21 @@
+ from LSN. Returns 0 if no error.
+ */
+ static int
+-_cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
++_read_audio_sectors_nrg (void *user_data, void *data, lsn_t lsn,
+ unsigned int nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+ CdioListNode *node;
+
+- if (lsn >= _obj->size)
++ if (lsn >= env->size)
+ {
+ cdio_warn ("trying to read beyond image size (%lu >= %lu)",
+- (long unsigned int) lsn, (long unsigned int) _obj->size);
++ (long unsigned int) lsn, (long unsigned int) env->size);
+ return -1;
+ }
+
+- _CDIO_LIST_FOREACH (node, _obj->mapping) {
++ _CDIO_LIST_FOREACH (node, env->mapping) {
+ _mapping_t *_map = _cdio_list_node_data (node);
+
+ if (IN (lsn, _map->start_lsn, (_map->start_lsn + _map->sec_count - 1))) {
+@@ -825,10 +867,10 @@
+
+ img_offset += (lsn - _map->start_lsn) * CDIO_CD_FRAMESIZE_RAW;
+
+- ret = cdio_stream_seek (_obj->gen.data_source, img_offset,
++ ret = cdio_stream_seek (env->gen.data_source, img_offset,
+ SEEK_SET);
+ if (ret!=0) return ret;
+- ret = cdio_stream_read (_obj->gen.data_source, data,
++ ret = cdio_stream_read (env->gen.data_source, data,
+ CDIO_CD_FRAMESIZE_RAW, nblocks);
+ if (ret==0) return ret;
+ break;
+@@ -842,22 +884,22 @@
+ }
+
+ static int
+-_cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
++_read_mode1_sector_nrg (void *user_data, void *data, lsn_t lsn,
+ bool b_form2)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+
+ CdioListNode *node;
+
+- if (lsn >= _obj->size)
++ if (lsn >= env->size)
+ {
+ cdio_warn ("trying to read beyond image size (%lu >= %lu)",
+- (long unsigned int) lsn, (long unsigned int) _obj->size);
++ (long unsigned int) lsn, (long unsigned int) env->size);
+ return -1;
+ }
+
+- _CDIO_LIST_FOREACH (node, _obj->mapping) {
++ _CDIO_LIST_FOREACH (node, env->mapping) {
+ _mapping_t *_map = _cdio_list_node_data (node);
+
+ if (IN (lsn, _map->start_lsn, (_map->start_lsn + _map->sec_count - 1))) {
+@@ -866,12 +908,12 @@
+
+ img_offset += (lsn - _map->start_lsn) * _map->blocksize;
+
+- ret = cdio_stream_seek (_obj->gen.data_source, img_offset,
++ ret = cdio_stream_seek (env->gen.data_source, img_offset,
+ SEEK_SET);
+ if (ret!=0) return ret;
+
+ /* FIXME: Not completely sure the below is correct. */
+- ret = cdio_stream_read (_obj->gen.data_source,
++ ret = cdio_stream_read (env->gen.data_source,
+ (M2RAW_SECTOR_SIZE == _map->blocksize)
+ ? (buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE)
+ : buf,
+@@ -896,16 +938,16 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
+- bool b_form2, unsigned nblocks)
++_read_mode1_sectors_nrg (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode1_sector (_obj,
++ if ( (retval = _read_mode1_sector_nrg (env,
+ ((char *)data) + (blocksize * i),
+ lsn + i, b_form2)) )
+ return retval;
+@@ -914,22 +956,22 @@
+ }
+
+ static int
+-_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
++_read_mode2_sector_nrg (void *user_data, void *data, lsn_t lsn,
+ bool b_form2)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+
+ CdioListNode *node;
+
+- if (lsn >= _obj->size)
++ if (lsn >= env->size)
+ {
+ cdio_warn ("trying to read beyond image size (%lu >= %lu)",
+- (long unsigned int) lsn, (long unsigned int) _obj->size);
++ (long unsigned int) lsn, (long unsigned int) env->size);
+ return -1;
+ }
+
+- _CDIO_LIST_FOREACH (node, _obj->mapping) {
++ _CDIO_LIST_FOREACH (node, env->mapping) {
+ _mapping_t *_map = _cdio_list_node_data (node);
+
+ if (IN (lsn, _map->start_lsn, (_map->start_lsn + _map->sec_count - 1))) {
+@@ -938,10 +980,10 @@
+
+ img_offset += (lsn - _map->start_lsn) * _map->blocksize;
+
+- ret = cdio_stream_seek (_obj->gen.data_source, img_offset,
++ ret = cdio_stream_seek (env->gen.data_source, img_offset,
+ SEEK_SET);
+ if (ret!=0) return ret;
+- ret = cdio_stream_read (_obj->gen.data_source,
++ ret = cdio_stream_read (env->gen.data_source,
+ (M2RAW_SECTOR_SIZE == _map->blocksize)
+ ? (buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE)
+ : buf,
+@@ -969,16 +1011,16 @@
+ Returns 0 if no error.
+ */
+ static int
+-_cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn,
+- bool b_form2, unsigned nblocks)
++_read_mode2_sectors_nrg (void *user_data, void *data, lsn_t lsn,
++ bool b_form2, unsigned nblocks)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+ int i;
+ int retval;
+ unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+
+ for (i = 0; i < nblocks; i++) {
+- if ( (retval = _cdio_read_mode2_sector (_obj,
++ if ( (retval = _read_mode2_sector_nrg (env,
+ ((char *)data) + (blocksize * i),
+ lsn + i, b_form2)) )
+ return retval;
+@@ -990,52 +1032,28 @@
+ Free memory resources associated with NRG object.
+ */
+ static void
+-_cdio_nrg_destroy (void *obj)
++_free_nrg (void *user_data)
+ {
+- _img_private_t *env = obj;
++ _img_private_t *env = user_data;
+
+ if (NULL == env) return;
+ if (NULL != env->mapping)
+ _cdio_list_free (env->mapping, true);
+- cdio_generic_stdio_free(env);
+- free(env);
+-}
+-
+-/*
+- Set the device to use in I/O operations.
+-*/
+-static int
+-_cdio_set_arg (void *env, const char key[], const char value[])
+-{
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source"))
+- {
+- free (_obj->gen.source_name);
+
+- if (!value)
+- return -2;
+-
+- _obj->gen.source_name = strdup (value);
+- }
+- else
+- return -1;
+-
+- return 0;
++ /* The remaining part of the image is like the other image drivers,
++ so free that in the same way. */
++ _free_image(user_data);
+ }
+
+ /*!
+- Return the value associated with the key "arg".
+-*/
+-static const char *
+-_cdio_get_arg (void *env, const char key[])
++ Eject media -- there's nothing to do here except free resources.
++ We always return 2.
++ */
++static int
++_eject_media_nrg(void *obj)
+ {
+- _img_private_t *_obj = env;
+-
+- if (!strcmp (key, "source")) {
+- return _obj->gen.source_name;
+- }
+- return NULL;
++ _free_nrg (obj);
++ return 2;
+ }
+
+ /*!
+@@ -1074,28 +1092,14 @@
+ return drive;
+ }
+
+-/*!
+- Return the number of of the first track.
+- CDIO_INVALID_TRACK is returned on error.
+-*/
+-static track_t
+-_cdio_get_first_track_num(void *env)
++static bool
++get_hwinfo_nrg ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
+ {
+- _img_private_t *_obj = env;
++ strcpy(hw_info->psz_vendor, "libcdio");
++ strcpy(hw_info->psz_model, "Nero");
++ strcpy(hw_info->psz_revision, CDIO_VERSION);
++ return true;
+
+- return _obj->first_track_num;
+-}
+-
+-/*!
+- Return the number of tracks. We fake it an just say there's
+- one big track.
+-*/
+-static track_t
+-_cdio_get_num_tracks(void *env)
+-{
+- _img_private_t *_obj = env;
+-
+- return _obj->total_tracks;
+ }
+
+ /*!
+@@ -1103,15 +1107,15 @@
+ CDIO_INVALID_TRACK is returned on error.
+ */
+ static track_format_t
+-_cdio_get_track_format(void *env, track_t track_num)
++get_track_format_nrg(void *user_data, track_t track_num)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+- if (track_num > _obj->total_tracks || track_num == 0)
++ if (track_num > env->gen.i_tracks || track_num == 0)
+ return TRACK_FORMAT_ERROR;
+
+- if ( _obj->dtyp != DTYP_INVALID) {
+- switch (_obj->dtyp) {
++ if ( env->dtyp != DTYP_INVALID) {
++ switch (env->dtyp) {
+ case DTYP_MODE2_XA:
+ return TRACK_FORMAT_XA;
+ case DTYP_MODE1:
+@@ -1120,8 +1124,8 @@
+ }
+ }
+
+- /*if ( MTYP_AUDIO_CD == _obj->mtyp) return TRACK_FORMAT_AUDIO; */
+- return _obj->tocent[track_num-1].track_format;
++ /*if ( MTYP_AUDIO_CD == env->mtyp) return TRACK_FORMAT_AUDIO; */
++ return env->tocent[track_num-1].track_format;
+ }
+
+ /*!
+@@ -1133,90 +1137,131 @@
+ FIXME: there's gotta be a better design for this and get_track_format?
+ */
+ static bool
+-_cdio_get_track_green(void *env, track_t track_num)
++_get_track_green_nrg(void *user_data, track_t track_num)
+ {
+- _img_private_t *_obj = env;
++ _img_private_t *env = user_data;
+
+- if (track_num > _obj->total_tracks || track_num == 0)
++ if (track_num > env->gen.i_tracks || track_num == 0)
+ return false;
+
+- if ( MTYP_AUDIO_CD == _obj->mtyp) return false;
+- return _obj->tocent[track_num-1].track_green;
++ if ( MTYP_AUDIO_CD == env->mtyp) return false;
++ return env->tocent[track_num-1].track_green;
+ }
+
+-/*!
+- Return the starting MSF (minutes/secs/frames) for the track number
+- track_num in obj. Tracks numbers start at 1.
+- The "leadout" track is specified either by
+- using track_num LEADOUT_TRACK or the total tracks+1.
++/*!
++ Check that a NRG file is valid.
++
+ */
+-static bool
+-_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf)
++/* Later we'll probably do better. For now though, this gets us
++ started for now.
++*/
++bool
++cdio_is_nrg(const char *psz_nrg)
+ {
+- _img_private_t *_obj = env;
+-
+- if (NULL == msf) return 1;
++ unsigned int i;
++
++ if (psz_nrg == NULL) return false;
+
+- if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = _obj->total_tracks+1;
++ i=strlen(psz_nrg)-strlen("nrg");
++
++ if (i>0) {
++ if (psz_nrg[i]=='n' && psz_nrg[i+1]=='r' && psz_nrg[i+2]=='g') {
++ return true;
++ }
++ else if (psz_nrg[i]=='N' && psz_nrg[i+1]=='R' && psz_nrg[i+2]=='G') {
++ return true;
++ }
++ }
++ return false;
++}
+
+- if (track_num <= _obj->total_tracks+1 && track_num != 0) {
+- *msf = _obj->tocent[track_num-1].start_msf;
+- return true;
+- } else
+- return false;
++/*!
++ Initialization routine. This is the only thing that doesn't
++ get called via a function pointer. In fact *we* are the
++ ones to set that up.
++ */
++CdIo *
++cdio_open_am_nrg (const char *psz_source_name, const char *psz_access_mode)
++{
++ if (psz_access_mode != NULL && strcmp(psz_access_mode, "image"))
++ cdio_warn ("there is only one access mode for nrg. Arg %s ignored",
++ psz_access_mode);
++ return cdio_open_nrg(psz_source_name);
+ }
+
++
+ CdIo *
+-cdio_open_nrg (const char *source_name)
++cdio_open_nrg (const char *psz_source)
+ {
+ CdIo *ret;
+ _img_private_t *_data;
+
+- cdio_funcs _funcs = {
+- .eject_media = cdio_generic_bogus_eject_media,
+- .free = _cdio_nrg_destroy,
+- .get_arg = _cdio_get_arg,
+- .get_devices = cdio_get_devices_nrg,
+- .get_default_device = cdio_get_default_device_nrg,
+- .get_first_track_num= _cdio_get_first_track_num,
+- .get_num_tracks = _cdio_get_num_tracks,
+- .get_track_format = _cdio_get_track_format,
+- .get_track_green = _cdio_get_track_green,
+- .get_track_lba = NULL, /* Will use generic routine via msf */
+- .get_track_msf = _cdio_get_track_msf,
+- .lseek = _cdio_lseek,
+- .read = _cdio_read,
+- .read_audio_sectors = _cdio_read_audio_sectors,
+- .read_mode1_sector = _cdio_read_mode1_sector,
+- .read_mode1_sectors = _cdio_read_mode1_sectors,
+- .read_mode2_sector = _cdio_read_mode2_sector,
+- .read_mode2_sectors = _cdio_read_mode2_sectors,
+- .set_arg = _cdio_set_arg,
+- .stat_size = _cdio_stat_size,
+- };
+-
+- _data = _cdio_malloc (sizeof (_img_private_t));
+- _data->gen.init = false;
+-
+- _data->total_tracks = 0;
+- _data->mtyp = 0;
+- _data->dtyp = DTYP_INVALID;
+- _data->first_track_num= 1;
+- _data->is_dao = false;
+- _data->is_cues = false; /* FIXME: remove is_cues. */
++ cdio_funcs _funcs;
++
++ memset( &_funcs, 0, sizeof(_funcs) );
++
++ _funcs.eject_media = _eject_media_nrg;
++ _funcs.free = _free_nrg;
++ _funcs.get_arg = _get_arg_image;
++ _funcs.get_cdtext = get_cdtext_generic;
++ _funcs.get_devices = cdio_get_devices_nrg;
++ _funcs.get_default_device = cdio_get_default_device_nrg;
++ _funcs.get_discmode = _get_discmode_image;
++ _funcs.get_drive_cap = _get_drive_cap_image;
++ _funcs.get_first_track_num= _get_first_track_num_image;
++ _funcs.get_hwinfo = get_hwinfo_nrg;
++ _funcs.get_mcn = _get_mcn_image;
++ _funcs.get_num_tracks = _get_num_tracks_image;
++ _funcs.get_track_format = get_track_format_nrg;
++ _funcs.get_track_green = _get_track_green_nrg;
++ _funcs.get_track_lba = NULL; /* Will use generic routine via msf */
++ _funcs.get_track_msf = _get_track_msf_image;
++ _funcs.lseek = _lseek_nrg;
++ _funcs.read = _read_nrg;
++ _funcs.read_audio_sectors = _read_audio_sectors_nrg;
++ _funcs.read_mode1_sector = _read_mode1_sector_nrg;
++ _funcs.read_mode1_sectors = _read_mode1_sectors_nrg;
++ _funcs.read_mode2_sector = _read_mode2_sector_nrg;
++ _funcs.read_mode2_sectors = _read_mode2_sectors_nrg;
++ _funcs.set_arg = _set_arg_image;
++ _funcs.stat_size = _stat_size_nrg;
++
++ _data = _cdio_malloc (sizeof (_img_private_t));
++ _data->gen.init = false;
++
++ _data->gen.i_tracks = 0;
++ _data->mtyp = 0;
++ _data->dtyp = DTYP_INVALID;
++ _data->gen.i_first_track= 1;
++ _data->is_dao = false;
++ _data->is_cues = false; /* FIXME: remove is_cues. */
++
++ ret = cdio_new ((void *)_data, &_funcs);
+
++ if (ret == NULL) {
++ free(_data);
++ return NULL;
++ }
++
++ _set_arg_image(_data, "source", (NULL == psz_source)
++ ? DEFAULT_CDIO_DEVICE: psz_source);
+
+- _cdio_set_arg(_data, "source", (NULL == source_name)
+- ? DEFAULT_CDIO_DEVICE: source_name);
++ _data->psz_cue_name = strdup(_get_arg_image(_data, "source"));
+
+- ret = cdio_new (_data, &_funcs);
+- if (ret == NULL) return NULL;
++ if (!cdio_is_nrg(_data->psz_cue_name)) {
++ cdio_debug ("source name %s is not recognized as a NRG image",
++ _data->psz_cue_name);
++ _free_nrg(_data);
++ return NULL;
++ }
+
+- if (_cdio_init(_data))
++ _set_arg_image (_data, "cue", _data->psz_cue_name);
++
++ if (_init_nrg(_data))
+ return ret;
+ else {
+- cdio_generic_stdio_free (_data);
+- free(_data);
++ _free_nrg(_data);
++ free(ret);
+ return NULL;
+ }
+
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libcdio/image/nrg.h 3 Jan 2005 21:14:00 -0000 1.1.2.1
+@@ -0,0 +1,115 @@
++/*
++ $Id: nrg.h,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $
++
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*/
++
++/* NERO (NRG) file format structures. */
++
++/* this ugly image format is typical for lazy win32 programmers... at
++ least structure were set big endian, so at reverse
++ engineering wasn't such a big headache... */
++
++PRAGMA_BEGIN_PACKED
++typedef union {
++ struct {
++ uint32_t __x GNUC_PACKED;
++ uint32_t ID GNUC_PACKED;
++ uint32_t footer_ofs GNUC_PACKED;
++ } v50;
++ struct {
++ uint32_t ID GNUC_PACKED;
++ uint64_t footer_ofs GNUC_PACKED;
++ } v55;
++} _footer_t;
++
++typedef struct {
++ uint32_t start GNUC_PACKED;
++ uint32_t length GNUC_PACKED;
++ uint32_t type GNUC_PACKED; /* 0x0 -> MODE1, 0x2 -> MODE2 form1,
++ 0x3 -> MIXED_MODE2 2336 blocksize
++ */
++ uint32_t start_lsn GNUC_PACKED; /* does not include any pre-gaps! */
++ uint32_t _unknown GNUC_PACKED; /* wtf is this for? -- always zero... */
++} _etnf_array_t;
++
++/* Finally they realized that 32-bit offsets are a bit outdated for
++ IA64 *eg* */
++typedef struct {
++ uint64_t start GNUC_PACKED;
++ uint64_t length GNUC_PACKED;
++ uint32_t type GNUC_PACKED; /* 0x0 -> MODE1, 0x2 -> MODE2 form1,
++ 0x3 -> MIXED_MODE2 2336 blocksize
++ */
++ uint32_t start_lsn GNUC_PACKED;
++ uint64_t _unknown GNUC_PACKED; /* wtf is this for? -- always zero... */
++} _etn2_array_t;
++
++typedef struct {
++ uint8_t type GNUC_PACKED; /* has track copy bit and whether audiofile
++ or datafile. Is often 0x41 == 'A' */
++ uint8_t track GNUC_PACKED; /* binary or BCD?? */
++ uint8_t addr_ctrl GNUC_PACKED; /* addresstype: MSF or LBA in lower 4 bits
++ control in upper 4 bits.
++ makes 0->1 transitions */
++ uint8_t res GNUC_PACKED; /* ?? */
++ uint32_t lsn GNUC_PACKED;
++} _cuex_array_t;
++
++typedef struct {
++ uint32_t _unknown1 GNUC_PACKED;
++ char psz_mcn[CDIO_MCN_SIZE] GNUC_PACKED;
++ uint8_t _unknown[64-CDIO_MCN_SIZE-sizeof(uint32_t)] GNUC_PACKED;
++} _daox_array_t;
++
++typedef struct {
++ uint32_t _unknown1 GNUC_PACKED;
++ char psz_mcn[CDIO_MCN_SIZE] GNUC_PACKED;
++ uint8_t _unknown[64-CDIO_MCN_SIZE-sizeof(uint32_t)] GNUC_PACKED;
++} _daoi_array_t;
++
++typedef struct {
++ uint32_t id GNUC_PACKED;
++ uint32_t len GNUC_PACKED;
++ char data[EMPTY_ARRAY_SIZE] GNUC_PACKED;
++} _chunk_t;
++
++PRAGMA_END_PACKED
++
++/* Nero images are Big Endian. */
++#define CDTX_ID 0x43445458 /* CD TEXT */
++#define CUEX_ID 0x43554558 /* Nero version 5.5.x-6.x */
++#define CUES_ID 0x43554553 /* Nero pre version 5.5.x-6.x */
++#define DAOX_ID 0x44414f58 /* Nero version 5.5.x-6.x */
++#define DAOI_ID 0x44414f49
++#define END1_ID 0x454e4421
++#define ETN2_ID 0x45544e32
++#define ETNF_ID 0x45544e46
++#define NER5_ID 0x4e455235 /* Nero version 5.5.x */
++#define NERO_ID 0x4e45524f /* Nero pre 5.5.x */
++#define SINF_ID 0x53494e46 /* Session information */
++#define MTYP_ID 0x4d545950 /* Disc Media type? */
++
++#define MTYP_AUDIO_CD 1 /* This isn't correct. But I don't know the
++ the right thing is and it sometimes works (and
++ sometimes is wrong). */
++
++/* Disk track type Values gleaned from DAOX */
++#define DTYP_MODE1 0
++#define DTYP_MODE2_XA 2
++#define DTYP_INVALID 255
+--- ./src/input/vcd/libvcd/data_structures.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/data_structures.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,8 @@
+ /*
+- $Id: data_structures.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: data_structures.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -35,63 +36,38 @@
+ #include "data_structures.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: data_structures.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: data_structures.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+-struct _VcdList
++struct _CdioList
+ {
+ unsigned length;
+
+- VcdListNode *begin;
+- VcdListNode *end;
++ CdioListNode *begin;
++ CdioListNode *end;
+ };
+
+-struct _VcdListNode
++struct _CdioListNode
+ {
+- VcdList *list;
++ CdioList *list;
+
+- VcdListNode *next;
++ CdioListNode *next;
+
+ void *data;
+ };
+
+ /* impl */
+
+-VcdList *
+-_vcd_list_new (void)
+-{
+- VcdList *new_obj = _vcd_malloc (sizeof (VcdList));
+-
+- return new_obj;
+-}
+-
+-void
+-_vcd_list_free (VcdList *list, int free_data)
+-{
+- while (_vcd_list_length (list))
+- _vcd_list_node_free (_vcd_list_begin (list), free_data);
+-
+- free (list);
+-}
+-
+-unsigned
+-_vcd_list_length (const VcdList *list)
+-{
+- vcd_assert (list != NULL);
+-
+- return list->length;
+-}
+-
+ static bool
+-_bubble_sort_iteration (VcdList *list, _vcd_list_cmp_func cmp_func)
++_bubble_sort_iteration (CdioList *list, _cdio_list_cmp_func cmp_func)
+ {
+- VcdListNode **pnode;
++ CdioListNode **pnode;
+ bool changed = false;
+
+ for (pnode = &(list->begin);
+ (*pnode) != NULL && (*pnode)->next != NULL;
+ pnode = &((*pnode)->next))
+ {
+- VcdListNode *node = *pnode;
++ CdioListNode *node = *pnode;
+
+ if (cmp_func (node->data, node->next->data) <= 0)
+ continue; /* n <= n->next */
+@@ -110,7 +86,7 @@
+ return changed;
+ }
+
+-void _vcd_list_sort (VcdList *list, _vcd_list_cmp_func cmp_func)
++void _vcd_list_sort (CdioList *list, _cdio_list_cmp_func cmp_func)
+ {
+ /* fixme -- this is bubble sort -- worst sorting algo... */
+
+@@ -120,187 +96,27 @@
+ while (_bubble_sort_iteration (list, cmp_func));
+ }
+
+-void
+-_vcd_list_prepend (VcdList *list, void *data)
+-{
+- VcdListNode *new_node;
+-
+- vcd_assert (list != NULL);
+-
+- new_node = _vcd_malloc (sizeof (VcdListNode));
+-
+- new_node->list = list;
+- new_node->next = list->begin;
+- new_node->data = data;
+-
+- list->begin = new_node;
+- if (list->length == 0)
+- list->end = new_node;
+-
+- list->length++;
+-}
+-
+-void
+-_vcd_list_append (VcdList *list, void *data)
+-{
+- vcd_assert (list != NULL);
+-
+- if (list->length == 0)
+- {
+- _vcd_list_prepend (list, data);
+- }
+- else
+- {
+- VcdListNode *new_node = _vcd_malloc (sizeof (VcdListNode));
+-
+- new_node->list = list;
+- new_node->next = NULL;
+- new_node->data = data;
+-
+- list->end->next = new_node;
+- list->end = new_node;
+-
+- list->length++;
+- }
+-}
+-
+-void
+-_vcd_list_foreach (VcdList *list, _vcd_list_iterfunc func, void *user_data)
+-{
+- VcdListNode *node;
+-
+- vcd_assert (list != NULL);
+- vcd_assert (func != 0);
+-
+- for (node = _vcd_list_begin (list);
+- node != NULL;
+- node = _vcd_list_node_next (node))
+- func (_vcd_list_node_data (node), user_data);
+-}
+-
+-VcdListNode *
+-_vcd_list_find (VcdList *list, _vcd_list_iterfunc cmp_func, void *user_data)
+-{
+- VcdListNode *node;
+-
+- vcd_assert (list != NULL);
+- vcd_assert (cmp_func != 0);
+-
+- for (node = _vcd_list_begin (list);
+- node != NULL;
+- node = _vcd_list_node_next (node))
+- if (cmp_func (_vcd_list_node_data (node), user_data))
+- break;
+-
+- return node;
+-}
+-
+ /* node ops */
+
+-VcdListNode *
+-_vcd_list_at (VcdList *list, int idx)
++CdioListNode *
++_vcd_list_at (CdioList *list, int idx)
+ {
+- VcdListNode *node = _vcd_list_begin (list);
++ CdioListNode *node = _cdio_list_begin (list);
+
+ if (idx < 0)
+- return _vcd_list_at (list, _vcd_list_length (list) + idx);
++ return _vcd_list_at (list, _cdio_list_length (list) + idx);
+
+ vcd_assert (idx >= 0);
+
+ while (node && idx)
+ {
+- node = _vcd_list_node_next (node);
++ node = _cdio_list_node_next (node);
+ idx--;
+ }
+
+ return node;
+ }
+
+-VcdListNode *
+-_vcd_list_begin (const VcdList *list)
+-{
+- vcd_assert (list != NULL);
+-
+- return list->begin;
+-}
+-
+-VcdListNode *
+-_vcd_list_end (VcdList *list)
+-{
+- vcd_assert (list != NULL);
+-
+- return list->end;
+-}
+-
+-VcdListNode *
+-_vcd_list_node_next (VcdListNode *node)
+-{
+- if (node)
+- return node->next;
+-
+- return NULL;
+-}
+-
+-void
+-_vcd_list_node_free (VcdListNode *node, int free_data)
+-{
+- VcdList *list;
+- VcdListNode *prev_node;
+-
+- vcd_assert (node != NULL);
+-
+- list = node->list;
+-
+- vcd_assert (_vcd_list_length (list) > 0);
+-
+- if (free_data)
+- free (_vcd_list_node_data (node));
+-
+- if (_vcd_list_length (list) == 1)
+- {
+- vcd_assert (list->begin == list->end);
+-
+- list->end = list->begin = NULL;
+- list->length = 0;
+- free (node);
+- return;
+- }
+-
+- vcd_assert (list->begin != list->end);
+-
+- if (list->begin == node)
+- {
+- list->begin = node->next;
+- free (node);
+- list->length--;
+- return;
+- }
+-
+- for (prev_node = list->begin; prev_node->next; prev_node = prev_node->next)
+- if (prev_node->next == node)
+- break;
+-
+- vcd_assert (prev_node->next != NULL);
+-
+- if (list->end == node)
+- list->end = prev_node;
+-
+- prev_node->next = node->next;
+-
+- list->length--;
+-
+- free (node);
+-}
+-
+-void *
+-_vcd_list_node_data (VcdListNode *node)
+-{
+- if (node)
+- return node->data;
+-
+- return NULL;
+-}
+-
+ /*
+ * n-way tree based on list -- somewhat inefficent
+ */
+@@ -314,10 +130,10 @@
+ {
+ void *data;
+
+- VcdListNode *listnode;
++ CdioListNode *listnode;
+ VcdTree *tree;
+ VcdTreeNode *parent;
+- VcdList *children;
++ CdioList *children;
+ };
+
+ VcdTree *
+@@ -363,8 +179,8 @@
+
+ if (node->children)
+ {
+- vcd_assert (_vcd_list_length (node->children) == 0);
+- _vcd_list_free (node->children, true);
++ vcd_assert (_cdio_list_length (node->children) == 0);
++ _cdio_list_free (node->children, true);
+ node->children = NULL;
+ }
+
+@@ -372,7 +188,7 @@
+ free (_vcd_tree_node_set_data (node, NULL));
+
+ if (node->parent)
+- _vcd_list_node_free (node->listnode, true);
++ _cdio_list_node_free (node->listnode, true);
+ else
+ _vcd_tree_node_set_data (node, NULL);
+ }
+@@ -407,16 +223,16 @@
+ vcd_assert (pnode != NULL);
+
+ if (!pnode->children)
+- pnode->children = _vcd_list_new ();
++ pnode->children = _cdio_list_new ();
+
+ nnode = _vcd_malloc (sizeof (VcdTreeNode));
+
+- _vcd_list_append (pnode->children, nnode);
++ _cdio_list_append (pnode->children, nnode);
+
+ nnode->data = cdata;
+ nnode->parent = pnode;
+ nnode->tree = pnode->tree;
+- nnode->listnode = _vcd_list_end (pnode->children);
++ nnode->listnode = _cdio_list_end (pnode->children);
+
+ return nnode;
+ }
+@@ -429,7 +245,7 @@
+ if (!node->children)
+ return NULL;
+
+- return _vcd_list_node_data (_vcd_list_begin (node->children));
++ return _cdio_list_node_data (_cdio_list_begin (node->children));
+ }
+
+ VcdTreeNode *
+@@ -437,7 +253,7 @@
+ {
+ vcd_assert (node != NULL);
+
+- return _vcd_list_node_data (_vcd_list_node_next (node->listnode));
++ return _cdio_list_node_data (_cdio_list_node_next (node->listnode));
+ }
+
+ void
+@@ -446,7 +262,7 @@
+ vcd_assert (node != NULL);
+
+ if (node->children)
+- _vcd_list_sort (node->children, (_vcd_list_cmp_func) cmp_func);
++ _vcd_list_sort (node->children, (_cdio_list_cmp_func) cmp_func);
+ }
+
+ void
+@@ -471,31 +287,31 @@
+ _vcd_tree_node_traversal_func trav_func,
+ void *user_data) /* breath-first */
+ {
+- VcdList *queue;
++ CdioList *queue;
+
+ vcd_assert (node != NULL);
+
+- queue = _vcd_list_new ();
++ queue = _cdio_list_new ();
+
+- _vcd_list_prepend (queue, node);
++ _cdio_list_prepend (queue, node);
+
+- while (_vcd_list_length (queue))
++ while (_cdio_list_length (queue))
+ {
+- VcdListNode *lastnode = _vcd_list_end (queue);
+- VcdTreeNode *treenode = _vcd_list_node_data (lastnode);
+- VcdTreeNode *childnode;
++ CdioListNode *lastnode = _cdio_list_end (queue);
++ VcdTreeNode *treenode = _cdio_list_node_data (lastnode);
++ VcdTreeNode *childnode;
+
+- _vcd_list_node_free (lastnode, false);
++ _cdio_list_node_free (lastnode, false);
+
+ trav_func (treenode, user_data);
+
+ _VCD_CHILD_FOREACH (childnode, treenode)
+ {
+- _vcd_list_prepend (queue, childnode);
++ _cdio_list_prepend (queue, childnode);
+ }
+ }
+
+- _vcd_list_free (queue, false);
++ _cdio_list_free (queue, false);
+ }
+
+ VcdTreeNode *_vcd_tree_node_parent (VcdTreeNode *node)
+--- ./src/input/vcd/libvcd/data_structures.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/data_structures.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: data_structures.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: data_structures.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -21,48 +21,14 @@
+ #ifndef __VCD_DATA_STRUCTURES_H__
+ #define __VCD_DATA_STRUCTURES_H__
+
++#include <cdio/ds.h>
+ #include <libvcd/types.h>
+
+-/* opaque... */
+-
+-typedef int (*_vcd_list_cmp_func) (void *data1, void *data2);
+-
+-typedef int (*_vcd_list_iterfunc) (void *data, void *user_data);
+-
+-/* methods */
+-VcdList *_vcd_list_new (void);
+-
+-void _vcd_list_free (VcdList *list, int free_data);
+-
+-unsigned _vcd_list_length (const VcdList *list);
+-
+-void _vcd_list_sort (VcdList *list, _vcd_list_cmp_func cmp_func);
+-
+-void _vcd_list_prepend (VcdList *list, void *data);
+-
+-void _vcd_list_append (VcdList *list, void *data);
+-
+-void _vcd_list_foreach (VcdList *list, _vcd_list_iterfunc func, void *user_data);
+-
+-VcdListNode *_vcd_list_find (VcdList *list, _vcd_list_iterfunc cmp_func, void *user_data);
+-
+-#define _VCD_LIST_FOREACH(node, list) \
+- for (node = _vcd_list_begin (list); node; node = _vcd_list_node_next (node))
+-
+ /* node ops */
+
+-VcdListNode *_vcd_list_at (VcdList *list, int idx);
+-
+-VcdListNode *_vcd_list_begin (const VcdList *list);
+-
+-VcdListNode *_vcd_list_end (VcdList *list);
+-
+-VcdListNode *_vcd_list_node_next (VcdListNode *node);
+-
+-void _vcd_list_node_free (VcdListNode *node, int free_data);
+-
+-void *_vcd_list_node_data (VcdListNode *node);
++CdioListNode *_vcd_list_at (CdioList *list, int idx);
+
++void _vcd_list_sort (CdioList *list, _cdio_list_cmp_func cmp_func);
+
+ /* n-way tree */
+
+--- ./src/input/vcd/libvcd/dict.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/dict.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: dict.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: dict.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -58,7 +58,7 @@
+ _new_node->buf = _vcd_malloc (length * ISO_BLOCKSIZE);
+ _new_node->flags = end_flags;
+
+- _vcd_list_prepend (obj->buffer_dict_list, _new_node);
++ _cdio_list_prepend (obj->buffer_dict_list, _new_node);
+ }
+
+ static
+@@ -82,17 +82,17 @@
+ static const struct _dict_t *
+ _dict_get_bykey (VcdObj *obj, const char key[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (obj != NULL);
+ vcd_assert (key != NULL);
+
+- node = _vcd_list_find (obj->buffer_dict_list,
+- (_vcd_list_iterfunc) _dict_key_cmp,
+- (char *) key);
++ node = _cdio_list_find (obj->buffer_dict_list,
++ (_cdio_list_iterfunc) _dict_key_cmp,
++ (char *) key);
+
+ if (node)
+- return _vcd_list_node_data (node);
++ return _cdio_list_node_data (node);
+
+ return NULL;
+ }
+@@ -100,17 +100,17 @@
+ static const struct _dict_t *
+ _dict_get_bysector (VcdObj *obj, uint32_t sector)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (obj != NULL);
+ vcd_assert (sector != SECTOR_NIL);
+
+- node = _vcd_list_find (obj->buffer_dict_list,
+- (_vcd_list_iterfunc) _dict_sector_cmp,
+- §or);
++ node = _cdio_list_find (obj->buffer_dict_list,
++ (_cdio_list_iterfunc) _dict_sector_cmp,
++ §or);
+
+ if (node)
+- return _vcd_list_node_data (node);
++ return _cdio_list_node_data (node);
+
+ return NULL;
+ }
+@@ -149,16 +149,16 @@
+ static void
+ _dict_clean (VcdObj *obj)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+- while ((node = _vcd_list_begin (obj->buffer_dict_list)))
++ while ((node = _cdio_list_begin (obj->buffer_dict_list)))
+ {
+- struct _dict_t *p = _vcd_list_node_data (node);
++ struct _dict_t *p = _cdio_list_node_data (node);
+
+ free (p->key);
+ free (p->buf);
+
+- _vcd_list_node_free (node, true);
++ _cdio_list_node_free (node, true);
+ }
+ }
+
+--- ./src/input/vcd/libvcd/directory.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/directory.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: directory.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: directory.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -26,16 +26,16 @@
+ #include <string.h>
+
+ /* Public headers */
++#include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+ #include <libvcd/logging.h>
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "directory.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: directory.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: directory.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /* CD-ROM XA */
+
+--- ./src/input/vcd/libvcd/files.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/files.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: files.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: files.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -28,6 +28,7 @@
+ #include <math.h>
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/util.h>
+
+ /* Public headers */
+@@ -40,13 +41,12 @@
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "mpeg_stream.h"
+ #include "obj.h"
+ #include "pbc.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: files.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: files.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ inline static bool
+ _pal_p (const struct vcd_mpeg_stream_vid_info *_info)
+@@ -136,15 +136,15 @@
+ void
+ set_entries_vcd (VcdObj *obj, void *buf)
+ {
+- VcdListNode *node = NULL;
++ CdioListNode *node = NULL;
+ int idx = 0;
+ int track_idx = 0;
+- EntriesVcd entries_vcd;
++ EntriesVcd_t entries_vcd;
+
+- vcd_assert (sizeof(EntriesVcd) == 2048);
++ vcd_assert (sizeof(EntriesVcd_t) == 2048);
+
+- vcd_assert (_vcd_list_length (obj->mpeg_track_list) <= MAX_ENTRIES);
+- vcd_assert (_vcd_list_length (obj->mpeg_track_list) > 0);
++ vcd_assert (_cdio_list_length (obj->mpeg_track_list) <= MAX_ENTRIES);
++ vcd_assert (_cdio_list_length (obj->mpeg_track_list) > 0);
+
+ memset(&entries_vcd, 0, sizeof(entries_vcd)); /* paranoia / fixme */
+
+@@ -193,29 +193,29 @@
+
+ idx = 0;
+ track_idx = 2;
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *track = _vcd_list_node_data (node);
++ mpeg_sequence_t *track = _cdio_list_node_data (node);
+ uint32_t lsect = track->relative_start_extent;
+- VcdListNode *node2;
++ CdioListNode *node2;
+
+ lsect += obj->iso_size;
+
+- entries_vcd.entry[idx].n = to_bcd8(track_idx);
++ entries_vcd.entry[idx].n = cdio_to_bcd8(track_idx);
+ cdio_lba_to_msf(cdio_lsn_to_lba(lsect),
+ &(entries_vcd.entry[idx].msf));
+
+ idx++;
+ lsect += obj->track_front_margin;
+
+- _VCD_LIST_FOREACH (node2, track->entry_list)
++ _CDIO_LIST_FOREACH (node2, track->entry_list)
+ {
+- entry_t *_entry = _vcd_list_node_data (node2);
++ entry_t *_entry = _cdio_list_node_data (node2);
+ /* additional entries */
+
+ vcd_assert (idx < MAX_ENTRIES);
+
+- entries_vcd.entry[idx].n = to_bcd8(track_idx);
++ entries_vcd.entry[idx].n = cdio_to_bcd8(track_idx);
+ cdio_lba_to_msf(lsect + cdio_lsn_to_lba(_entry->aps.packet_no),
+ &(entries_vcd.entry[idx].msf));
+
+@@ -257,16 +257,16 @@
+ void
+ set_psd_vcd (VcdObj *obj, void *buf, bool extended)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ if (extended)
+ vcd_assert (_vcd_obj_has_cap_p (obj, _CAP_PBC_X));
+
+ vcd_assert (_vcd_pbc_available (obj));
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+ char *_buf = buf;
+ unsigned offset = (extended ? _pbc->offset_ext : _pbc->offset);
+
+@@ -279,23 +279,23 @@
+ void
+ set_lot_vcd(VcdObj *obj, void *buf, bool extended)
+ {
+- LotVcd *lot_vcd = NULL;
+- VcdListNode *node;
++ LotVcd_t *lot_vcd = NULL;
++ CdioListNode *node;
+
+ if (extended)
+ vcd_assert (_vcd_obj_has_cap_p (obj, _CAP_PBC_X));
+
+ vcd_assert (_vcd_pbc_available (obj));
+
+- lot_vcd = _vcd_malloc (sizeof (LotVcd));
+- memset(lot_vcd, 0xff, sizeof(LotVcd));
++ lot_vcd = _vcd_malloc (sizeof (LotVcd_t));
++ memset(lot_vcd, 0xff, sizeof(LotVcd_t));
+
+ lot_vcd->reserved = 0x0000;
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
+- unsigned offset = extended ? _pbc->offset_ext : _pbc->offset;
++ pbc_t *_pbc = _cdio_list_node_data (node);
++ unsigned int offset = extended ? _pbc->offset_ext : _pbc->offset;
+
+ vcd_assert (offset % INFO_OFFSET_MULT == 0);
+
+@@ -307,19 +307,19 @@
+ lot_vcd->offset[_pbc->lid - 1] = uint16_to_be (offset);
+ }
+
+- memcpy(buf, lot_vcd, sizeof(LotVcd));
++ memcpy(buf, lot_vcd, sizeof(LotVcd_t));
+ free(lot_vcd);
+ }
+
+ void
+ set_info_vcd(VcdObj *obj, void *buf)
+ {
+- InfoVcd info_vcd;
+- VcdListNode *node = NULL;
++ InfoVcd_t info_vcd;
++ CdioListNode *node = NULL;
+ int n = 0;
+
+- vcd_assert (sizeof (InfoVcd) == 2048);
+- vcd_assert (_vcd_list_length (obj->mpeg_track_list) <= 98);
++ vcd_assert (sizeof (InfoVcd_t) == 2048);
++ vcd_assert (_cdio_list_length (obj->mpeg_track_list) <= 98);
+
+ memset (&info_vcd, 0, sizeof (info_vcd));
+
+@@ -373,9 +373,9 @@
+ /* NTSC/PAL bitset */
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- mpeg_track_t *track = _vcd_list_node_data (node);
++ mpeg_track_t *track = _cdio_list_node_data (node);
+
+ const struct vcd_mpeg_stream_vid_info *_info = &track->info->shdr[0];
+
+@@ -407,7 +407,7 @@
+ info_vcd.offset_mult = _vcd_pbc_available (obj) ? INFO_OFFSET_MULT : 0;
+ info_vcd.lot_entries = uint16_to_be (_vcd_pbc_max_lid (obj));
+
+- if (_vcd_list_length (obj->mpeg_segment_list))
++ if (_cdio_list_length (obj->mpeg_segment_list))
+ {
+ unsigned segments = 0;
+
+@@ -415,9 +415,9 @@
+ vcd_warn ("segment items available, but no PBC items set!"
+ " SPIs will be unreachable");
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *segment = _vcd_list_node_data (node);
++ mpeg_segment_t *segment = _cdio_list_node_data (node);
+ unsigned idx;
+ InfoSpiContents contents = { 0, };
+
+@@ -465,20 +465,20 @@
+ {
+ char tracks_svd_buf[ISO_BLOCKSIZE] = { 0, };
+ TracksSVD_v30 *tracks_svd = (void *) tracks_svd_buf;
+- VcdListNode *node;
++ CdioListNode *node;
+ double playtime;
+ int n;
+
+ strncpy (tracks_svd->file_id, TRACKS_SVD_FILE_ID,
+ sizeof (TRACKS_SVD_FILE_ID));
+ tracks_svd->version = TRACKS_SVD_VERSION;
+- tracks_svd->tracks = _vcd_list_length (obj->mpeg_track_list);
++ tracks_svd->tracks = _cdio_list_length (obj->mpeg_track_list);
+
+ n = 0;
+ playtime = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- mpeg_track_t *track = _vcd_list_node_data (node);
++ mpeg_track_t *track = _cdio_list_node_data (node);
+ int i;
+
+ playtime += track->info->playing_time;
+@@ -502,7 +502,8 @@
+ f = modf(playtime, &i);
+
+ cdio_lba_to_msf (i * 75, &tracks_svd->track[n].cum_playing_time);
+- tracks_svd->track[n].cum_playing_time.f = to_bcd8 (floor (f * 75.0));
++ tracks_svd->track[n].cum_playing_time.f =
++ cdio_to_bcd8 (floor (f * 75.0));
+ }
+
+ n++;
+@@ -517,7 +518,7 @@
+ char tracks_svd[ISO_BLOCKSIZE] = { 0, };
+ TracksSVD *tracks_svd1 = (void *) tracks_svd;
+ TracksSVD2 *tracks_svd2;
+- VcdListNode *node;
++ CdioListNode *node;
+ int n;
+
+ vcd_assert (_vcd_obj_has_cap_p (obj, _CAP_4C_SVCD));
+@@ -533,15 +534,15 @@
+ strncpy (tracks_svd1->file_id, TRACKS_SVD_FILE_ID, sizeof (TRACKS_SVD_FILE_ID));
+ tracks_svd1->version = TRACKS_SVD_VERSION;
+
+- tracks_svd1->tracks = _vcd_list_length (obj->mpeg_track_list);
++ tracks_svd1->tracks = _cdio_list_length (obj->mpeg_track_list);
+
+ tracks_svd2 = (void *) &(tracks_svd1->playing_time[tracks_svd1->tracks]);
+
+ n = 0;
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- mpeg_track_t *track = _vcd_list_node_data (node);
++ mpeg_track_t *track = _cdio_list_node_data (node);
+ const double playtime = track->info->playing_time;
+
+ int _video;
+@@ -574,7 +575,7 @@
+ }
+
+ cdio_lba_to_msf (i * 75, &(tracks_svd1->playing_time[n]));
+- tracks_svd1->playing_time[n].f = to_bcd8 (floor (f * 75.0));
++ tracks_svd1->playing_time[n].f = cdio_to_bcd8 (floor (f * 75.0));
+ }
+
+ n++;
+@@ -587,11 +588,11 @@
+ _get_cumulative_playing_time (const VcdObj *obj, unsigned up_to_track_no)
+ {
+ double result = 0;
+- VcdListNode *node;
++ CdioListNode *node;
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- mpeg_track_t *track = _vcd_list_node_data (node);
++ mpeg_track_t *track = _cdio_list_node_data (node);
+
+ if (!up_to_track_no)
+ break;
+@@ -611,7 +612,7 @@
+ {
+ double total_playing_time;
+
+- total_playing_time = _get_cumulative_playing_time (obj, _vcd_list_length (obj->mpeg_track_list));
++ total_playing_time = _get_cumulative_playing_time (obj, _cdio_list_length (obj->mpeg_track_list));
+
+ return ceil (total_playing_time * 2.0);
+ }
+@@ -623,39 +624,39 @@
+ + (_get_scanpoint_count (obj) * sizeof (msf_t));
+ }
+
+-static VcdList *
++static CdioList *
+ _make_track_scantable (const VcdObj *obj)
+ {
+- VcdList *all_aps = _vcd_list_new ();
+- VcdList *scantable = _vcd_list_new ();
++ CdioList *all_aps = _cdio_list_new ();
++ CdioList *scantable = _cdio_list_new ();
+ unsigned scanpoints = _get_scanpoint_count (obj);
+ unsigned track_no;
+- VcdListNode *node;
++ CdioListNode *node;
+
+ track_no = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- mpeg_track_t *track = _vcd_list_node_data (node);
+- VcdListNode *node2;
++ mpeg_track_t *track = _cdio_list_node_data (node);
++ CdioListNode *node2;
+
+- _VCD_LIST_FOREACH (node2, track->info->shdr[0].aps_list)
++ _CDIO_LIST_FOREACH (node2, track->info->shdr[0].aps_list)
+ {
+ struct aps_data *_data = _vcd_malloc (sizeof (struct aps_data));
+
+- *_data = *(struct aps_data *)_vcd_list_node_data (node2);
++ *_data = *(struct aps_data *)_cdio_list_node_data (node2);
+
+ _data->timestamp += _get_cumulative_playing_time (obj, track_no);
+ _data->packet_no += obj->iso_size + track->relative_start_extent;
+ _data->packet_no += obj->track_front_margin;
+
+- _vcd_list_append (all_aps, _data);
++ _cdio_list_append (all_aps, _data);
+ }
+ track_no++;
+ }
+
+ {
+- VcdListNode *aps_node = _vcd_list_begin (all_aps);
+- VcdListNode *n;
++ CdioListNode *aps_node = _cdio_list_begin (all_aps);
++ CdioListNode *n;
+ struct aps_data *_data;
+ double aps_time;
+ double playing_time;
+@@ -667,15 +668,16 @@
+
+ vcd_assert (aps_node != NULL);
+
+- _data = _vcd_list_node_data (aps_node);
++ _data = _cdio_list_node_data (aps_node);
+ aps_time = _data->timestamp;
+ aps_packet = _data->packet_no;
+
+ for (t = 0; t < playing_time; t += 0.5)
+ {
+- for(n = _vcd_list_node_next (aps_node); n; n = _vcd_list_node_next (n))
++ for(n = _cdio_list_node_next (aps_node); n;
++ n = _cdio_list_node_next (n))
+ {
+- _data = _vcd_list_node_data (n);
++ _data = _cdio_list_node_data (n);
+
+ if (fabs (_data->timestamp - t) < fabs (aps_time - t))
+ {
+@@ -691,16 +693,16 @@
+ uint32_t *lsect = _vcd_malloc (sizeof (uint32_t));
+
+ *lsect = aps_packet;
+- _vcd_list_append (scantable, lsect);
++ _cdio_list_append (scantable, lsect);
+ }
+
+ }
+
+ }
+
+- _vcd_list_free (all_aps, true);
++ _cdio_list_free (all_aps, true);
+
+- vcd_assert (scanpoints == _vcd_list_length (scantable));
++ vcd_assert (scanpoints == _cdio_list_length (scantable));
+
+ return scantable;
+ }
+@@ -708,8 +710,8 @@
+ void
+ set_search_dat (VcdObj *obj, void *buf)
+ {
+- VcdList *scantable;
+- VcdListNode *node;
++ CdioList *scantable;
++ CdioListNode *node;
+ SearchDat search_dat;
+ unsigned n;
+
+@@ -729,10 +731,10 @@
+ scantable = _make_track_scantable (obj);
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, scantable)
++ _CDIO_LIST_FOREACH (node, scantable)
+ {
+ SearchDat *search_dat2 = buf;
+- uint32_t sect = *(uint32_t *) _vcd_list_node_data (node);
++ uint32_t sect = *(uint32_t *) _cdio_list_node_data (node);
+
+ cdio_lba_to_msf(cdio_lsn_to_lba(sect), &(search_dat2->points[n]));
+ n++;
+@@ -740,7 +742,7 @@
+
+ vcd_assert (n = _get_scanpoint_count (obj));
+
+- _vcd_list_free (scantable, true);
++ _cdio_list_free (scantable, true);
+ }
+
+ static uint32_t
+@@ -752,7 +754,7 @@
+ static uint32_t *
+ _get_scandata_table (const struct vcd_mpeg_stream_info *info)
+ {
+- VcdListNode *n, *aps_node = _vcd_list_begin (info->shdr[0].aps_list);
++ CdioListNode *n, *aps_node = _cdio_list_begin (info->shdr[0].aps_list);
+ struct aps_data *_data;
+ double aps_time, t;
+ int aps_packet;
+@@ -761,15 +763,15 @@
+
+ retval = _vcd_malloc (_get_scandata_count (info) * sizeof (uint32_t));
+
+- _data = _vcd_list_node_data (aps_node);
++ _data = _cdio_list_node_data (aps_node);
+ aps_time = _data->timestamp;
+ aps_packet = _data->packet_no;
+
+ for (t = 0, i = 0; t < info->playing_time; t += 0.5, i++)
+ {
+- for(n = _vcd_list_node_next (aps_node); n; n = _vcd_list_node_next (n))
++ for(n = _cdio_list_node_next (aps_node); n; n = _cdio_list_node_next (n))
+ {
+- _data = _vcd_list_node_data (n);
++ _data = _cdio_list_node_data (n);
+
+ if (fabs (_data->timestamp - t) < fabs (aps_time - t))
+ {
+@@ -800,7 +802,7 @@
+
+ /* struct 1 */
+ retval += sizeof (ScandataDat1);
+- retval += sizeof (msf_t) * _vcd_list_length (obj->mpeg_track_list);
++ retval += sizeof (msf_t) * _cdio_list_length (obj->mpeg_track_list);
+
+ /* struct 2 */
+ /* vcd_assert (sizeof (ScandataDat2) == 0);
+@@ -809,16 +811,16 @@
+
+ /* struct 3 */
+ retval += sizeof (ScandataDat3);
+- retval += (sizeof (uint8_t) + sizeof (uint16_t)) * _vcd_list_length (obj->mpeg_track_list);
++ retval += (sizeof (uint8_t) + sizeof (uint16_t)) * _cdio_list_length (obj->mpeg_track_list);
+
+ /* struct 4 */
+ /* vcd_assert (sizeof (ScandataDat4) == 0);
+ retval += sizeof (ScandataDat4); */
+ {
+- VcdListNode *node;
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ CdioListNode *node;
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- const mpeg_track_t *track = _vcd_list_node_data (node);
++ const mpeg_track_t *track = _cdio_list_node_data (node);
+
+ retval += sizeof (msf_t) * _get_scandata_count (track->info);
+ }
+@@ -830,7 +832,7 @@
+ void
+ set_scandata_dat (VcdObj *obj, void *buf)
+ {
+- const unsigned tracks = _vcd_list_length (obj->mpeg_track_list);
++ const unsigned tracks = _cdio_list_length (obj->mpeg_track_list);
+
+ ScandataDat1 *scandata_dat1 = (ScandataDat1 *) buf;
+ ScandataDat2 *scandata_dat2 =
+@@ -844,7 +846,7 @@
+ __cd_offsetof (ScandataDat3, mpeg_track_offsets[tracks])
+ - __cd_offsetof (ScandataDat3, mpeg_track_offsets);
+
+- VcdListNode *node;
++ CdioListNode *node;
+ unsigned n;
+ uint16_t _tmp_offset;
+
+@@ -875,7 +877,7 @@
+ vcd_assert (i >= 0);
+
+ cdio_lba_to_msf (i * 75, &(scandata_dat1->cum_playtimes[n]));
+- scandata_dat1->cum_playtimes[n].f = to_bcd8 (floor (f * 75.0));
++ scandata_dat1->cum_playtimes[n].f = cdio_to_bcd8 (floor (f * 75.0));
+ }
+
+ /* struct 2 -- nothing yet */
+@@ -890,9 +892,9 @@
+ scandata_dat3->mpegtrack_start_index = uint16_to_be (_begin_offset);
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_track_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_track_list)
+ {
+- const mpeg_track_t *track = _vcd_list_node_data (node);
++ const mpeg_track_t *track = _cdio_list_node_data (node);
+ uint32_t *_table;
+ const unsigned scanpoints = _get_scandata_count (track->info);
+ const unsigned _table_ofs =
+@@ -932,7 +934,7 @@
+ vcd_type_t
+ vcd_files_info_detect_type (const void *info_buf)
+ {
+- const InfoVcd *_info = info_buf;
++ const InfoVcd_t *_info = info_buf;
+ vcd_type_t _type = VCD_TYPE_INVALID;
+
+ vcd_assert (info_buf != NULL);
+--- ./src/input/vcd/libvcd/image.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/image.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: image.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: image.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+ 2002 Rocky Bernstein <rocky@panix.com>
+@@ -34,7 +34,7 @@
+ #include "image_sink.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: image.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: image.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /*
+ * VcdImageSink routines next.
+@@ -68,7 +68,7 @@
+ }
+
+ int
+-vcd_image_sink_set_cuesheet (VcdImageSink *obj, const VcdList *vcd_cue_list)
++vcd_image_sink_set_cuesheet (VcdImageSink *obj, const CdioList *vcd_cue_list)
+ {
+ vcd_assert (obj != NULL);
+
+@@ -76,7 +76,7 @@
+ }
+
+ int
+-vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn)
++vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn)
+ {
+ vcd_assert (obj != NULL);
+
+--- ./src/input/vcd/libvcd/image_bincue.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/image_bincue.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: image_bincue.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: image_bincue.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2001, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -27,6 +27,7 @@
+ #include <string.h>
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+
+ /* Public headers */
+@@ -35,12 +36,11 @@
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "image_sink.h"
+ #include "stream_stdio.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: image_bincue.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: image_bincue.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /* reader */
+
+@@ -88,10 +88,10 @@
+ }
+
+ static int
+-_set_cuesheet (void *user_data, const VcdList *vcd_cue_list)
++_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+ {
+ _img_bincue_snk_t *_obj = user_data;
+- VcdListNode *node;
++ CdioListNode *node;
+ int track_no, index_no;
+ const vcd_cue_t *_last_cue = 0;
+
+@@ -102,9 +102,10 @@
+
+ track_no = 0;
+ index_no = 0;
+- _VCD_LIST_FOREACH (node, (VcdList *) vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
+ {
+- const vcd_cue_t *_cue = _vcd_list_node_data (node);
++ const vcd_cue_t *_cue = _cdio_list_node_data (node);
++ char *psz_msf;
+
+ msf_t _msf = { 0, 0, 0 };
+
+@@ -122,19 +123,23 @@
+ if (_last_cue && _last_cue->type == VCD_CUE_PREGAP_START)
+ {
+ cdio_lba_to_msf (_last_cue->lsn, &_msf);
++ psz_msf = cdio_msf_to_str(&_msf);
+
+ vcd_data_sink_printf (_obj->cue_snk,
+- " INDEX %2.2d %2.2x:%2.2x:%2.2x\r\n",
+- index_no, _msf.m, _msf.s, _msf.f);
++ " INDEX %2.2d %s\r\n",
++ index_no, psz_msf);
++ free(psz_msf);
+ }
+
+ index_no++;
+
+ cdio_lba_to_msf (_cue->lsn, &_msf);
++ psz_msf = cdio_msf_to_str(&_msf);
+
+ vcd_data_sink_printf (_obj->cue_snk,
+- " INDEX %2.2d %2.2x:%2.2x:%2.2x\r\n",
+- index_no, _msf.m, _msf.s, _msf.f);
++ " INDEX %2.2d %s\r\n",
++ index_no, psz_msf);
++ free(psz_msf);
+ break;
+
+ case VCD_CUE_PREGAP_START:
+@@ -145,13 +150,15 @@
+ vcd_assert (_last_cue != 0);
+
+ index_no++;
+- vcd_assert (index_no < 100);
++ vcd_assert (index_no <= CDIO_CD_MAX_TRACKS);
+
+ cdio_lba_to_msf (_cue->lsn, &_msf);
++ psz_msf = cdio_msf_to_str(&_msf);
+
+ vcd_data_sink_printf (_obj->cue_snk,
+- " INDEX %2.2d %2.2x:%2.2x:%2.2x\r\n",
+- index_no, _msf.m, _msf.s, _msf.f);
++ " INDEX %2.2d %s\r\n",
++ index_no, psz_msf);
++ free(psz_msf);
+ break;
+
+ case VCD_CUE_END:
+@@ -172,7 +179,7 @@
+ }
+
+ static int
+-_vcd_image_bincue_write (void *user_data, const void *data, uint32_t lsn)
++_vcd_image_bincue_write (void *user_data, const void *data, lsn_t lsn)
+ {
+ const char *buf = data;
+ _img_bincue_snk_t *_obj = user_data;
+--- ./src/input/vcd/libvcd/image_cdrdao.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/image_cdrdao.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: image_cdrdao.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: image_cdrdao.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -28,18 +28,18 @@
+
+ /* Public headers */
+ #include <cdio/iso9660.h>
++#include <cdio/bytesex.h>
+ #include <libvcd/sector.h>
+ #include <libvcd/logging.h>
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "image_sink.h"
+ #include "stream_stdio.h"
+ #include "util.h"
+ #include "vcd.h"
+
+-static const char _rcsid[] = "$Id: image_cdrdao.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: image_cdrdao.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /* reader */
+
+@@ -56,7 +56,7 @@
+ int last_snk_idx;
+ bool last_pause;
+
+- VcdList *vcd_cue_list;
++ CdioList *vcd_cue_list;
+ } _img_cdrdao_snk_t;
+
+ static void
+@@ -73,12 +73,12 @@
+ }
+
+ static int
+-_set_cuesheet (void *user_data, const VcdList *vcd_cue_list)
++_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+ {
+ _img_cdrdao_snk_t *_obj = user_data;
+ VcdDataSink *toc_snk = vcd_data_sink_new_stdio (_obj->toc_fname);
+
+- VcdListNode *node;
++ CdioListNode *node;
+
+ int track_no, index_no;
+ const vcd_cue_t *_last_cue = 0;
+@@ -89,18 +89,18 @@
+ "// generated by %s\n\n"
+ "CD_ROM_XA\n", vcd_version_string (false));
+
+- _obj->vcd_cue_list = _vcd_list_new ();
++ _obj->vcd_cue_list = _cdio_list_new ();
+
+ index_no = track_no = 0;
+- _VCD_LIST_FOREACH (node, (VcdList *) vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
+ {
+- const vcd_cue_t *_cue = _vcd_list_node_data (node);
++ const vcd_cue_t *_cue = _cdio_list_node_data (node);
+
+ /* copy cue list while traversing */
+ {
+ vcd_cue_t *_cue2 = _vcd_malloc (sizeof (vcd_cue_t));
+ *_cue2 = *_cue;
+- _vcd_list_append (_obj->vcd_cue_list, _cue2);
++ _cdio_list_append (_obj->vcd_cue_list, _cue2);
+ }
+
+ switch (_cue->type)
+@@ -139,12 +139,13 @@
+
+ {
+ msf_t _msf = { 0, 0, 0 };
++ char *psz_msf;
+
+ cdio_lba_to_msf (_cue->lsn - last_track_lsn, &_msf);
++ psz_msf = cdio_msf_to_str(&_msf);
+
+- vcd_data_sink_printf (toc_snk,
+- " INDEX %2.2x:%2.2x:%2.2x\n",
+- _msf.m, _msf.s, _msf.f);
++ vcd_data_sink_printf (toc_snk, " INDEX %s\n", psz_msf);
++ free(psz_msf);
+ }
+ break;
+
+@@ -170,23 +171,23 @@
+ }
+
+ static int
+-_vcd_image_cdrdao_write (void *user_data, const void *data, uint32_t lsn)
++_vcd_image_cdrdao_write (void *user_data, const void *data, lsn_t lsn)
+ {
+ const char *buf = data;
+ _img_cdrdao_snk_t *_obj = user_data;
+ long offset;
+
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ uint32_t _last = 0;
+ uint32_t _ofs = 0;
+ bool _lpregap = false;
+ bool _pregap = false;
+
+ int num = 0, in_track = 0;
+- _VCD_LIST_FOREACH (node, _obj->vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, _obj->vcd_cue_list)
+ {
+- const vcd_cue_t *_cue = _vcd_list_node_data (node);
++ const vcd_cue_t *_cue = _cdio_list_node_data (node);
+
+ switch (_cue->type)
+ {
+--- ./src/input/vcd/libvcd/image_nrg.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/image_nrg.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: image_nrg.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: image_nrg.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2001, 2003, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -31,6 +31,7 @@
+ #include <string.h>
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/iso9660.h>
+
+ /* Public headers */
+@@ -39,12 +40,11 @@
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "image_sink.h"
+ #include "stream_stdio.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: image_nrg.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: image_nrg.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /* structures used */
+
+@@ -107,7 +107,7 @@
+ VcdDataSink *nrg_snk;
+ char *nrg_fname;
+
+- VcdList *vcd_cue_list;
++ CdioList *vcd_cue_list;
+ int tracks;
+ uint32_t cue_end_lsn;
+
+@@ -139,23 +139,23 @@
+ }
+
+ static int
+-_set_cuesheet (void *user_data, const VcdList *vcd_cue_list)
++_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+ {
+ _img_nrg_snk_t *_obj = user_data;
+- VcdListNode *node;
++ CdioListNode *node;
+ int num;
+
+ _sink_init (_obj);
+
+- _obj->vcd_cue_list = _vcd_list_new ();
++ _obj->vcd_cue_list = _cdio_list_new ();
+
+ num = 0;
+- _VCD_LIST_FOREACH (node, (VcdList *) vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
+ {
+- const vcd_cue_t *_cue = _vcd_list_node_data (node);
++ const vcd_cue_t *_cue = _cdio_list_node_data (node);
+ vcd_cue_t *_cue2 = _vcd_malloc (sizeof (vcd_cue_t));
+ *_cue2 = *_cue;
+- _vcd_list_append (_obj->vcd_cue_list, _cue2);
++ _cdio_list_append (_obj->vcd_cue_list, _cue2);
+
+ if (_cue->type == VCD_CUE_TRACK_START)
+ num++;
+@@ -166,7 +166,7 @@
+
+ _obj->tracks = num;
+
+- vcd_assert (num > 0 && num < 100);
++ vcd_assert (CDIO_CD_MIN_TRACK_NO >= 1 && num <= CDIO_CD_MAX_TRACKS);
+
+ return 0;
+ }
+@@ -174,15 +174,15 @@
+ static uint32_t
+ _map (_img_nrg_snk_t *_obj, uint32_t lsn)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ uint32_t result = lsn;
+ vcd_cue_t *_cue = NULL, *_last = NULL;
+
+ vcd_assert (_obj->cue_end_lsn > lsn);
+
+- _VCD_LIST_FOREACH (node, _obj->vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, _obj->vcd_cue_list)
+ {
+- _cue = _vcd_list_node_data (node);
++ _cue = _cdio_list_node_data (node);
+
+ if (lsn < _cue->lsn)
+ break;
+@@ -226,7 +226,7 @@
+ static int
+ _write_tail (_img_nrg_snk_t *_obj, uint32_t offset)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ int _size;
+ _chunk_t _chunk;
+
+@@ -238,13 +238,14 @@
+
+ vcd_data_sink_write (_obj->nrg_snk, &_chunk, sizeof (_chunk_t), 1);
+
+- _VCD_LIST_FOREACH (node, _obj->vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, _obj->vcd_cue_list)
+ {
+- vcd_cue_t *_cue = _vcd_list_node_data (node);
++ vcd_cue_t *_cue = _cdio_list_node_data (node);
+
+ if (_cue->type == VCD_CUE_TRACK_START)
+ {
+- vcd_cue_t *_cue2 = _vcd_list_node_data (_vcd_list_node_next (node));
++ vcd_cue_t *_cue2 =
++ _cdio_list_node_data (_cdio_list_node_next (node));
+
+ _etnf_array_t _etnf = { 0, };
+
+@@ -281,7 +282,7 @@
+ }
+
+ static int
+-_vcd_image_nrg_write (void *user_data, const void *data, uint32_t lsn)
++_vcd_image_nrg_write (void *user_data, const void *data, lsn_t lsn)
+ {
+ const char *buf = data;
+ _img_nrg_snk_t *_obj = user_data;
+--- ./src/input/vcd/libvcd/image_sink.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/image_sink.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: image_sink.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: image_sink.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -48,7 +48,7 @@
+ } vcd_cue_t;
+
+ typedef struct {
+- int (*set_cuesheet) (void *user_data, const VcdList *vcd_cue_list);
++ int (*set_cuesheet) (void *user_data, const CdioList *vcd_cue_list);
+ int (*write) (void *user_data, const void *buf, lsn_t lsn);
+ void (*free) (void *user_data);
+ int (*set_arg) (void *user_data, const char key[], const char value[]);
+@@ -61,7 +61,7 @@
+ vcd_image_sink_destroy (VcdImageSink *obj);
+
+ int
+-vcd_image_sink_set_cuesheet (VcdImageSink *obj, const VcdList *vcd_cue_list);
++vcd_image_sink_set_cuesheet (VcdImageSink *obj, const CdioList *vcd_cue_list);
+
+ int
+ vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn);
+--- ./src/input/vcd/libvcd/inf.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/inf.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: inf.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: inf.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
+
+@@ -50,17 +50,17 @@
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/util.h>
+
+ /* Eventually move above libvcd includes but having vcdinfo including. */
+ #include <libvcd/info.h>
+
+ /* Private headers */
+-#include "bytesex.h"
+ #include "info_private.h"
+ #include "pbc.h"
+
+-static const char _rcsid[] = "$Id: inf.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: inf.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ #define BUF_COUNT 16
+ #define BUF_SIZE 80
+@@ -105,29 +105,18 @@
+ some problem in getting this.
+ */
+ const char *
+-vcdinf_get_album_id(const InfoVcd *info)
++vcdinf_get_album_id(const InfoVcd_t *info)
+ {
+ if (NULL==info) return NULL;
+ return vcdinfo_strip_trail (info->album_desc, MAX_ALBUM_LEN);
+ }
+
+ /*!
+- Return the VCD application ID.
+- NULL is returned if there is some problem in getting this.
+-*/
+-const char *
+-vcdinf_get_application_id(const iso9660_pvd_t *pvd)
+-{
+- if (NULL==pvd) return NULL;
+- return(vcdinfo_strip_trail(pvd->application_id, MAX_APPLICATION_ID));
+-}
+-
+-/*!
+ Get autowait time value for PsdPlayListDescriptor *d.
+ Time is in seconds unless it is -1 (unlimited).
+ */
+ int
+-vcdinf_get_autowait_time (const PsdPlayListDescriptor *d)
++vcdinf_get_autowait_time (const PsdPlayListDescriptor_t *d)
+ {
+ return vcdinfo_get_wait_time (d->atime);
+ }
+@@ -137,7 +126,7 @@
+ is an error.
+ */
+ unsigned int
+-vcdinf_get_bsn(const PsdSelectionListDescriptor *psd)
++vcdinf_get_bsn(const PsdSelectionListDescriptor_t *psd)
+ {
+ if (NULL==psd) return VCDINFO_INVALID_BSN;
+ return(psd->bsn);
+@@ -179,7 +168,7 @@
+ Return loop count. 0 is infinite loop.
+ */
+ uint16_t
+-vcdinf_get_loop_count (const PsdSelectionListDescriptor *psd)
++vcdinf_get_loop_count (const PsdSelectionListDescriptor_t *psd)
+ {
+ return 0x7f & psd->loop;
+ }
+@@ -188,7 +177,7 @@
+ Return LOT offset
+ */
+ uint16_t
+-vcdinf_get_lot_offset (const LotVcd *lot, unsigned int n)
++vcdinf_get_lot_offset (const LotVcd_t *lot, unsigned int n)
+ {
+ return uint16_from_be (lot->offset[n]);
+ }
+@@ -197,7 +186,7 @@
+ Return the number of entries in the VCD.
+ */
+ unsigned int
+-vcdinf_get_num_entries(const EntriesVcd *entries)
++vcdinf_get_num_entries(const EntriesVcd_t *entries)
+ {
+ if (NULL==entries) return 0;
+ return (uint16_from_be (entries->entry_count));
+@@ -207,7 +196,7 @@
+ Return the number of segments in the VCD.
+ */
+ segnum_t
+-vcdinf_get_num_segments(const InfoVcd *info)
++vcdinf_get_num_segments(const InfoVcd_t *info)
+ {
+ if (NULL==info) return 0;
+ return (uint16_from_be (info->item_count));
+@@ -217,7 +206,7 @@
+ Return number of LIDs.
+ */
+ lid_t
+-vcdinf_get_num_LIDs (const InfoVcd *info)
++vcdinf_get_num_LIDs (const InfoVcd_t *info)
+ {
+ if (NULL==info) return 0;
+ /* Should probably use _vcd_pbc_max_lid instead? */
+@@ -228,7 +217,7 @@
+ Return the number of menu selections for selection list descriptor psd.
+ */
+ unsigned int
+-vcdinf_get_num_selections(const PsdSelectionListDescriptor *psd)
++vcdinf_get_num_selections(const PsdSelectionListDescriptor_t *psd)
+ {
+ return psd->nos;
+ }
+@@ -238,62 +227,29 @@
+ Time is in 1/15-second units.
+ */
+ uint16_t
+-vcdinf_get_play_time (const PsdPlayListDescriptor *d)
++vcdinf_get_play_time (const PsdPlayListDescriptor_t *d)
+ {
+ if (NULL==d) return 0;
+ return uint16_from_be (d->ptime);
+ }
+
+ /*!
+- Return a string containing the VCD preparer id with trailing
+- blanks removed.
+-*/
+-const char *
+-vcdinf_get_preparer_id(const iso9660_pvd_t *pvd)
+-{
+- if (NULL==pvd) return NULL;
+- return(vcdinfo_strip_trail(pvd->preparer_id, MAX_PREPARER_ID));
+-}
+-
+-/*!
+- Return a string containing the VCD publisher id with trailing
+- blanks removed.
+-*/
+-const char *
+-vcdinf_get_publisher_id(const iso9660_pvd_t *pvd)
+-{
+- if (NULL==pvd) return NULL;
+- return(vcdinfo_strip_trail(pvd->publisher_id, MAX_PUBLISHER_ID));
+-}
+-
+-/*!
+ Return number of bytes in PSD.
+ */
+ uint32_t
+-vcdinf_get_psd_size (const InfoVcd *info)
++vcdinf_get_psd_size (const InfoVcd_t *info)
+ {
+ if (NULL==info) return 0;
+ return uint32_from_be (info->psd_size);
+ }
+
+ /*!
+- Return a string containing the VCD system id with trailing
+- blanks removed.
+-*/
+-const char *
+-vcdinf_get_system_id(const iso9660_pvd_t *pvd)
+-{
+- if (NULL==pvd) return NULL;
+- return(vcdinfo_strip_trail(pvd->system_id, MAX_SYSTEM_ID));
+-}
+-
+-/*!
+ Get timeout wait time value for PsdPlayListDescriptor *d.
+ Return VCDINFO_INVALID_OFFSET if d is NULL;
+ Time is in seconds unless it is -1 (unlimited).
+ */
+ uint16_t
+-vcdinf_get_timeout_offset (const PsdSelectionListDescriptor *d)
++vcdinf_get_timeout_offset (const PsdSelectionListDescriptor_t *d)
+ {
+ if (NULL == d) return VCDINFO_INVALID_OFFSET;
+ return uint16_from_be (d->timeout_ofs);
+@@ -304,7 +260,7 @@
+ Time is in seconds unless it is -1 (unlimited).
+ */
+ int
+-vcdinf_get_timeout_time (const PsdSelectionListDescriptor *d)
++vcdinf_get_timeout_time (const PsdSelectionListDescriptor_t *d)
+ {
+ return vcdinfo_get_wait_time (d->totime);
+ }
+@@ -315,12 +271,12 @@
+ (We don't count the header track?)
+ */
+ track_t
+-vcdinf_get_track(const EntriesVcd *entries, const unsigned int entry_num)
++vcdinf_get_track(const EntriesVcd_t *entries, const unsigned int entry_num)
+ {
+ const unsigned int entry_count = uint16_from_be (entries->entry_count);
+ /* Note entry_num is 0 origin. */
+ return entry_num < entry_count ?
+- from_bcd8 (entries->entry[entry_num].n):
++ cdio_from_bcd8 (entries->entry[entry_num].n):
+ VCDINFO_INVALID_TRACK;
+ }
+
+@@ -328,50 +284,29 @@
+ Return the VCD volume count - the number of CD's in the collection.
+ */
+ unsigned int
+-vcdinf_get_volume_count(const InfoVcd *info)
++vcdinf_get_volume_count(const InfoVcd_t *info)
+ {
+ if (NULL==info) return 0;
+ return(uint16_from_be( info->vol_count));
+ }
+
+ /*!
+- Return the VCD ID.
+-*/
+-const char *
+-vcdinf_get_volume_id(const iso9660_pvd_t *pvd)
+-{
+- if (NULL == pvd) return NULL;
+- return(vcdinfo_strip_trail(pvd->volume_id, MAX_VOLUME_ID));
+-}
+-
+-/*!
+ Return the VCD volume num - the number of the CD in the collection.
+ This is a number between 1 and the volume count.
+ */
+ unsigned int
+-vcdinf_get_volume_num(const InfoVcd *info)
++vcdinf_get_volume_num(const InfoVcd_t *info)
+ {
+ if (NULL == info) return 0;
+ return uint16_from_be(info->vol_id);
+ }
+
+ /*!
+- Return the VCD volumeset ID.
+- NULL is returned if there is some problem in getting this.
+-*/
+-const char *
+-vcdinf_get_volumeset_id(const iso9660_pvd_t *pvd)
+-{
+- if ( NULL == pvd ) return NULL;
+- return vcdinfo_strip_trail(pvd->volume_set_id, MAX_VOLUMESET_ID);
+-}
+-
+-/*!
+ Get wait time value for PsdPlayListDescriptor *d.
+ Time is in seconds unless it is -1 (unlimited).
+ */
+ int
+-vcdinf_get_wait_time (const PsdPlayListDescriptor *d)
++vcdinf_get_wait_time (const PsdPlayListDescriptor_t *d)
+ {
+ return vcdinfo_get_wait_time (d->wtime);
+ }
+@@ -380,7 +315,7 @@
+ Return true if loop has a jump delay
+ */
+ bool
+-vcdinf_has_jump_delay (const PsdSelectionListDescriptor *psd)
++vcdinf_has_jump_delay (const PsdSelectionListDescriptor_t *psd)
+ {
+ if (NULL==psd) return false;
+ return ((0x80 & psd->loop) != 0);
+@@ -419,7 +354,7 @@
+ VCDINFO_REJECTED_MASK is returned d on error or pld is NULL.
+ */
+ lid_t
+-vcdinf_pld_get_lid(const PsdPlayListDescriptor *pld)
++vcdinf_pld_get_lid(const PsdPlayListDescriptor_t *pld)
+ {
+ return (pld != NULL)
+ ? uint16_from_be (pld->lid) & VCDINFO_LID_MASK
+@@ -433,7 +368,7 @@
+ entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_pld_get_next_offset(const PsdPlayListDescriptor *pld)
++vcdinf_pld_get_next_offset(const PsdPlayListDescriptor_t *pld)
+ {
+ if (NULL == pld) return VCDINFO_INVALID_OFFSET;
+ return uint16_from_be (pld->next_ofs);
+@@ -443,7 +378,7 @@
+ Return number of items in LIDs. Return 0 if error or not found.
+ */
+ int
+-vcdinf_pld_get_noi (const PsdPlayListDescriptor *pld)
++vcdinf_pld_get_noi (const PsdPlayListDescriptor_t *pld)
+ {
+ if ( NULL == pld ) return 0;
+ return pld->noi;
+@@ -453,7 +388,7 @@
+ Return the playlist item i in d.
+ */
+ uint16_t
+-vcdinf_pld_get_play_item(const PsdPlayListDescriptor *pld, unsigned int i)
++vcdinf_pld_get_play_item(const PsdPlayListDescriptor_t *pld, unsigned int i)
+ {
+ if (NULL==pld) return 0;
+ return uint16_from_be(pld->itemid[i]);
+@@ -466,7 +401,7 @@
+ entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_pld_get_prev_offset(const PsdPlayListDescriptor *pld)
++vcdinf_pld_get_prev_offset(const PsdPlayListDescriptor_t *pld)
+ {
+ return (pld != NULL) ?
+ uint16_from_be (pld->prev_ofs) : VCDINFO_INVALID_OFFSET;
+@@ -479,7 +414,7 @@
+ "return" entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_pld_get_return_offset(const PsdPlayListDescriptor *pld)
++vcdinf_pld_get_return_offset(const PsdPlayListDescriptor_t *pld)
+ {
+ return (pld != NULL) ?
+ uint16_from_be (pld->return_ofs) : VCDINFO_INVALID_OFFSET;
+@@ -492,7 +427,7 @@
+ * NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_psd_get_default_offset(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_default_offset(const PsdSelectionListDescriptor_t *psd)
+ {
+ if (NULL == psd) return VCDINFO_INVALID_OFFSET;
+ return uint16_from_be (psd->default_ofs);
+@@ -503,7 +438,7 @@
+ VCDINFO_REJECTED_MASK is returned on error or if psd is NULL.
+ */
+ uint16_t
+-vcdinf_psd_get_itemid(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_itemid(const PsdSelectionListDescriptor_t *psd)
+ {
+ return (psd != NULL) ? uint16_from_be(psd->itemid) : VCDINFO_REJECTED_MASK;
+ }
+@@ -513,7 +448,7 @@
+ VCDINFO_REJECTED_MASK is returned on error or psd is NULL.
+ */
+ lid_t
+-vcdinf_psd_get_lid(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_lid(const PsdSelectionListDescriptor_t *psd)
+ {
+ return (psd != NULL)
+ ? uint16_from_be (psd->lid) & VCDINFO_LID_MASK
+@@ -525,7 +460,7 @@
+ true is also returned d is NULL.
+ */
+ bool
+-vcdinf_psd_get_lid_rejected(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_lid_rejected(const PsdSelectionListDescriptor_t *psd)
+ {
+ return (psd != NULL)
+ ? vcdinfo_is_rejected(uint16_from_be(psd->lid))
+@@ -539,7 +474,7 @@
+ * NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_psd_get_next_offset(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_next_offset(const PsdSelectionListDescriptor_t *psd)
+ {
+ if (NULL == psd) return VCDINFO_INVALID_OFFSET;
+ return uint16_from_be (psd->next_ofs);
+@@ -553,7 +488,7 @@
+ * NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_psd_get_offset(const PsdSelectionListDescriptor *psd,
++vcdinf_psd_get_offset(const PsdSelectionListDescriptor_t *psd,
+ unsigned int entry_num)
+ {
+ return (psd != NULL && entry_num < vcdinf_get_num_selections(psd))
+@@ -567,7 +502,7 @@
+ entry or psd is NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_psd_get_prev_offset(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_prev_offset(const PsdSelectionListDescriptor_t *psd)
+ {
+ return (psd != NULL) ?
+ uint16_from_be (psd->prev_ofs) : VCDINFO_INVALID_OFFSET;
+@@ -580,7 +515,7 @@
+ "return" entry or psd is NULL. Otherwise the LID offset is returned.
+ */
+ uint16_t
+-vcdinf_psd_get_return_offset(const PsdSelectionListDescriptor *psd)
++vcdinf_psd_get_return_offset(const PsdSelectionListDescriptor_t *psd)
+ {
+ return (psd != NULL) ?
+ uint16_from_be (psd->return_ofs) : VCDINFO_INVALID_OFFSET;
+--- ./src/input/vcd/libvcd/info.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/info.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: info.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: info.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -27,7 +27,6 @@
+ /* Private headers */
+ #include "info_private.h"
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "pbc.h"
+ #include "util.h"
+ #include "vcd_read.h"
+@@ -49,6 +48,7 @@
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/cd_types.h>
+ #include <cdio/util.h>
+
+@@ -59,11 +59,7 @@
+ #include <stddef.h>
+ #include <errno.h>
+
+-static const char _rcsid[] = "$Id: info.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
+-
+-#define MIN_ENCODED_TRACK_NUM 100
+-#define MIN_ENCODED_SEGMENT_NUM 1000
+-#define MAX_ENCODED_SEGMENT_NUM 2979
++static const char _rcsid[] = "$Id: info.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ #define BUF_COUNT 16
+ #define BUF_SIZE 80
+@@ -98,10 +94,10 @@
+ static void
+ _init_segments (vcdinfo_obj_t *obj)
+ {
+- InfoVcd *info = vcdinfo_get_infoVcd(obj);
++ InfoVcd_t *info = vcdinfo_get_infoVcd(obj);
+ segnum_t num_segments = vcdinfo_get_num_segments(obj);
+- VcdListNode *entnode;
+- VcdList *entlist;
++ CdioListNode *entnode;
++ CdioList *entlist;
+ int i;
+ lsn_t last_lsn=0;
+
+@@ -113,8 +109,8 @@
+ entlist = iso9660_fs_readdir(obj->img, "SEGMENT", true);
+
+ i=0;
+- _VCD_LIST_FOREACH (entnode, entlist) {
+- iso9660_stat_t *statbuf = _vcd_list_node_data (entnode);
++ _CDIO_LIST_FOREACH (entnode, entlist) {
++ iso9660_stat_t *statbuf = _cdio_list_node_data (entnode);
+
+ if (statbuf->type == _STAT_DIR) continue;
+
+@@ -145,7 +141,7 @@
+ vcd_warn ("Number of segments found %d is not number of segments %d",
+ i, num_segments);
+
+- _vcd_list_free (entlist, true);
++ _cdio_list_free (entlist, true);
+
+
+ #if 0
+@@ -281,7 +277,7 @@
+ const char *
+ vcdinfo_ogt2str(const vcdinfo_obj_t *obj, segnum_t seg_num)
+ {
+- const InfoVcd *info = &obj->info;
++ const InfoVcd_t *info = &obj->info;
+ const char *ogt_str[] =
+ {
+ "None",
+@@ -356,7 +352,7 @@
+ snprintf (buf, BUF_SIZE, "play nothing (0x%4.4x)", itemid.num);
+ break;
+ case VCDINFO_ITEM_TYPE_TRACK:
+- snprintf (buf, BUF_SIZE, "SEQUENCE[%d] (0x%4.4x)", itemid.num,
++ snprintf (buf, BUF_SIZE, "SEQUENCE[%d] (0x%4.4x)", itemid.num-1,
+ itemid_num);
+ break;
+ case VCDINFO_ITEM_TYPE_ENTRY:
+@@ -391,11 +387,11 @@
+ Return the VCD ID.
+ NULL is returned if there is some problem in getting this.
+ */
+-const char *
+-vcdinfo_get_application_id(const vcdinfo_obj_t *obj)
++char *
++vcdinfo_get_application_id(vcdinfo_obj_t *p_obj)
+ {
+- if ( NULL == obj ) return (NULL);
+- return(vcdinf_get_application_id(&obj->pvd));
++ if ( NULL == p_obj ) return (NULL);
++ return iso9660_get_application_id(&p_obj->pvd);
+ }
+
+ /*!
+@@ -452,16 +448,25 @@
+ Return the LID offset associated with a the selection number of the
+ passed-in LID parameter.
+
+- \return VCDINFO_INVALID_OFFSET is returned if obj on error or obj
+- is NULL. Otherwise the LID offset is returned.
++ \return VCDINFO_INVALID_OFFSET is returned if error, obj is NULL or
++ the lid is not some type of selection list. Otherwise the LID offset
++ is returned.
+ */
+ uint16_t vcdinfo_selection_get_offset(const vcdinfo_obj_t *obj, lid_t lid,
+ unsigned int selection)
+ {
+ unsigned int bsn;
+
+- PsdListDescriptor pxd;
++ PsdListDescriptor_t pxd;
+ vcdinfo_lid_get_pxd(obj, &pxd, lid);
++ if (pxd.descriptor_type != PSD_TYPE_SELECTION_LIST &&
++ pxd.descriptor_type != PSD_TYPE_EXT_SELECTION_LIST) {
++ vcd_warn( "Requesting selection of LID %i which not a selection list -"
++ " type is 0x%x",
++ lid, pxd.descriptor_type );
++ return VCDINFO_INVALID_OFFSET;
++ }
++
+ bsn=vcdinf_get_bsn(pxd.psd);
+
+ if ( (selection - bsn + 1) > 0) {
+@@ -483,7 +488,7 @@
+ {
+ if (NULL != obj) {
+
+- PsdListDescriptor pxd;
++ PsdListDescriptor_t pxd;
+
+ vcdinfo_lid_get_pxd(obj, &pxd, lid);
+
+@@ -518,9 +523,14 @@
+ */
+ lid_t
+ vcdinfo_get_multi_default_lid(const vcdinfo_obj_t *obj, lid_t lid,
+- unsigned int entry_num)
++ lsn_t lsn)
+ {
+- unsigned int offset = vcdinfo_get_multi_default_offset(obj, lid, entry_num);
++ unsigned int offset;
++ unsigned int entry_num;
++
++ entry_num = vcdinfo_lsn_get_entry(obj, lsn);
++ offset = vcdinfo_get_multi_default_offset(obj, lid, entry_num);
++
+ switch (offset) {
+ case VCDINFO_INVALID_OFFSET:
+ case PSD_OFS_MULTI_DEF:
+@@ -560,21 +570,34 @@
+ case PSD_OFS_MULTI_DEF_NO_NUM:
+ {
+ /* Have some work todo... Figure the selection number. */
+- unsigned int selection=0;
+- track_t track=vcdinfo_get_track(obj, entry_num);
+- track_t prev_track=VCDINFO_INVALID_TRACK;
+- for (selection=1;
+- track != VCDINFO_INVALID_TRACK
+- && track != prev_track
+- && entry_num > 0;
+- selection++) {
+- prev_track = track;
+- track=vcdinfo_get_track(obj, --entry_num);
++ PsdListDescriptor_t pxd;
++
++ vcdinfo_lid_get_pxd(obj, &pxd, lid);
++
++ switch (pxd.descriptor_type) {
++
++ case PSD_TYPE_SELECTION_LIST:
++ case PSD_TYPE_EXT_SELECTION_LIST: {
++ vcdinfo_itemid_t selection_itemid;
++ uint16_t selection_itemid_num;
++ unsigned int start_entry_num;
++
++ if (pxd.psd == NULL) return VCDINFO_INVALID_OFFSET;
++ selection_itemid_num = vcdinf_psd_get_itemid(pxd.psd);
++ vcdinfo_classify_itemid(selection_itemid_num, &selection_itemid);
++ if (selection_itemid.type != VCDINFO_ITEM_TYPE_TRACK) {
++ return VCDINFO_INVALID_OFFSET;
++ }
++
++ start_entry_num = vcdinfo_track_get_entry(obj, selection_itemid.num);
++ return vcdinfo_selection_get_offset(obj, lid,
++ entry_num-start_entry_num);
++ }
++ default: ;
+ }
+- return vcdinfo_selection_get_offset(obj, lid, selection);
+ }
+- default:
+- return offset;
++ default:
++ return VCDINFO_INVALID_OFFSET;
+ }
+ }
+
+@@ -605,7 +628,7 @@
+ uint32_t
+ vcdinfo_get_entry_sect_count (const vcdinfo_obj_t *obj, unsigned int entry_num)
+ {
+- const EntriesVcd *entries = &obj->entries;
++ const EntriesVcd_t *entries = &obj->entries;
+ const unsigned int entry_count = vcdinf_get_num_entries(entries);
+ if (entry_num > entry_count)
+ return 0;
+@@ -665,7 +688,7 @@
+ const msf_t *
+ vcdinfo_get_entry_msf(const vcdinfo_obj_t *obj, unsigned int entry_num)
+ {
+- const EntriesVcd *entries = &obj->entries;
++ const EntriesVcd_t *entries = &obj->entries;
+ return vcdinf_get_entry_msf(entries, entry_num);
+ }
+
+@@ -696,6 +719,13 @@
+ }
+ }
+
++EntriesVcd_t *
++vcdinfo_get_entriesVcd (vcdinfo_obj_t *obj)
++{
++ if (NULL == obj) return NULL;
++ return &obj->entries;
++}
++
+ /*!
+ Get the VCD format (VCD 1.0 VCD 1.1, SVCD, ... for this object.
+ The type is also set inside obj.
+@@ -717,25 +747,41 @@
+ return vcdinf_get_format_version_str(obj->vcd_type);
+ }
+
+-EntriesVcd *
+-vcdinfo_get_entriesVcd (vcdinfo_obj_t *obj)
++InfoVcd_t *
++vcdinfo_get_infoVcd (vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+- return &obj->entries;
++ return &obj->info;
+ }
+
+-InfoVcd *
+-vcdinfo_get_infoVcd (vcdinfo_obj_t *obj)
++/*! Return the entry number closest and before the given LSN.
++ */
++unsigned int
++vcdinfo_lsn_get_entry(const vcdinfo_obj_t *obj, lsn_t lsn)
+ {
+- if (NULL == obj) return NULL;
+- return &obj->info;
++
++ /* Do a binary search to find the entry. */
++ unsigned int i = 0;
++ unsigned int j = vcdinfo_get_num_entries(obj);
++ unsigned int mid;
++ unsigned int mid_lsn;
++ do {
++ mid = (i+j)/2;
++ mid_lsn = vcdinfo_get_entry_lsn(obj, mid);
++ if ( lsn <= mid_lsn ) j = mid-1;
++ if ( lsn >= mid_lsn ) i = mid+1;
++ } while (i <= j);
++
++ /* We want the entry closest but before. */
++ return (lsn == mid_lsn) ? mid : mid-1;
+ }
++
+
+ void *
+-vcdinfo_get_tracksSVD (vcdinfo_obj_t *obj)
++vcdinfo_get_pvd (vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+- return obj->tracks_buf;
++ return &obj->pvd;
+ }
+
+ void *
+@@ -753,10 +799,10 @@
+ }
+
+ void *
+-vcdinfo_get_pvd (vcdinfo_obj_t *obj)
++vcdinfo_get_tracksSVD (vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+- return &obj->pvd;
++ return obj->tracks_buf;
+ }
+
+ /*!
+@@ -766,7 +812,7 @@
+ uint16_t
+ vcdinfo_lid_get_itemid(const vcdinfo_obj_t *obj, lid_t lid)
+ {
+- PsdListDescriptor pxd;
++ PsdListDescriptor_t pxd;
+
+ if (obj == NULL) return VCDINFO_REJECTED_MASK;
+ vcdinfo_lid_get_pxd(obj, &pxd, lid);
+@@ -790,7 +836,7 @@
+ /*!
+ Get the LOT pointer.
+ */
+-LotVcd *
++LotVcd_t *
+ vcdinfo_get_lot(const vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+@@ -800,7 +846,7 @@
+ /*!
+ Get the extended LOT pointer.
+ */
+-LotVcd *
++LotVcd_t *
+ vcdinfo_get_lot_x(const vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+@@ -824,7 +870,7 @@
+ unsigned int
+ vcdinfo_get_num_entries(const vcdinfo_obj_t *obj)
+ {
+- const EntriesVcd *entries = &obj->entries;
++ const EntriesVcd_t *entries = &obj->entries;
+ return vcdinf_get_num_entries(entries);
+ }
+
+@@ -849,7 +895,7 @@
+ vcdinfo_lid_get_offset(const vcdinfo_obj_t *obj, lid_t lid,
+ unsigned int entry_num)
+ {
+- PsdListDescriptor pxd;
++ PsdListDescriptor_t pxd;
+
+ if (obj == NULL) return VCDINFO_INVALID_OFFSET;
+ vcdinfo_lid_get_pxd(obj, &pxd, lid);
+@@ -876,8 +922,8 @@
+ static vcdinfo_offset_t *
+ _vcdinfo_get_offset_t (const vcdinfo_obj_t *obj, unsigned int offset, bool ext)
+ {
+- VcdListNode *node;
+- VcdList *offset_list = ext ? obj->offset_x_list : obj->offset_list;
++ CdioListNode *node;
++ CdioList *offset_list = ext ? obj->offset_x_list : obj->offset_list;
+
+ switch (offset) {
+ case PSD_OFS_DISABLED:
+@@ -887,9 +933,9 @@
+ default: ;
+ }
+
+- _VCD_LIST_FOREACH (node, offset_list)
++ _CDIO_LIST_FOREACH (node, offset_list)
+ {
+- vcdinfo_offset_t *ofs = _vcd_list_node_data (node);
++ vcdinfo_offset_t *ofs = _cdio_list_node_data (node);
+ if (offset == ofs->offset)
+ return ofs;
+ }
+@@ -899,7 +945,7 @@
+ /*!
+ Get the VCD info list.
+ */
+-VcdList *
++CdioList *
+ vcdinfo_get_offset_list(const vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+@@ -910,7 +956,7 @@
+ /*!
+ Get the VCD info extended offset list.
+ */
+-VcdList *
++CdioList *
+ vcdinfo_get_offset_x_list(const vcdinfo_obj_t *obj)
+ {
+ if (NULL == obj) return NULL;
+@@ -947,7 +993,7 @@
+ vcdinfo_get_preparer_id(const vcdinfo_obj_t *obj)
+ {
+ if ( NULL == obj ) return (NULL);
+- return vcdinf_get_preparer_id(&obj->pvd);
++ return iso9660_get_preparer_id(&obj->pvd);
+ }
+
+ /*!
+@@ -998,7 +1044,7 @@
+ vcdinfo_get_publisher_id(const vcdinfo_obj_t *obj)
+ {
+ if ( NULL == obj ) return (NULL);
+- return vcdinf_get_publisher_id(&obj->pvd);
++ return iso9660_get_publisher_id(&obj->pvd);
+ }
+
+ /*!
+@@ -1006,19 +1052,19 @@
+ NULL is returned if error or not found.
+ */
+ static bool
+-_vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor *pxd,
++_vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor_t *pxd,
+ uint16_t lid, bool ext)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ unsigned mult = obj->info.offset_mult;
+ const uint8_t *psd = ext ? obj->psd_x : obj->psd;
+- VcdList *offset_list = ext ? obj->offset_x_list : obj->offset_list;
++ CdioList *offset_list = ext ? obj->offset_x_list : obj->offset_list;
+
+ if (offset_list == NULL) return false;
+
+- _VCD_LIST_FOREACH (node, offset_list)
++ _CDIO_LIST_FOREACH (node, offset_list)
+ {
+- vcdinfo_offset_t *ofs = _vcd_list_node_data (node);
++ vcdinfo_offset_t *ofs = _cdio_list_node_data (node);
+ unsigned _rofs = ofs->offset * mult;
+
+ pxd->descriptor_type = psd[_rofs];
+@@ -1027,7 +1073,7 @@
+ {
+ case PSD_TYPE_PLAY_LIST:
+ {
+- pxd->pld = (PsdPlayListDescriptor *) (psd + _rofs);
++ pxd->pld = (PsdPlayListDescriptor_t *) (psd + _rofs);
+ if (vcdinf_pld_get_lid(pxd->pld) == lid) {
+ return true;
+ }
+@@ -1037,7 +1083,7 @@
+ case PSD_TYPE_EXT_SELECTION_LIST:
+ case PSD_TYPE_SELECTION_LIST:
+ {
+- pxd->psd = (PsdSelectionListDescriptor *) (psd + _rofs);
++ pxd->psd = (PsdSelectionListDescriptor_t *) (psd + _rofs);
+ if (vcdinf_psd_get_lid(pxd->psd) == lid) {
+ return true;
+ }
+@@ -1054,7 +1100,7 @@
+ False is returned if not found.
+ */
+ bool
+-vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor *pxd,
++vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor_t *pxd,
+ uint16_t lid)
+ {
+ if (_vcdinfo_lid_get_pxd(obj, pxd, lid, true))
+@@ -1073,7 +1119,7 @@
+ {
+ if (NULL != obj) {
+
+- PsdListDescriptor pxd;
++ PsdListDescriptor_t pxd;
+
+ vcdinfo_lid_get_pxd(obj, &pxd, lid);
+
+@@ -1189,7 +1235,7 @@
+ vcdinfo_get_system_id(const vcdinfo_obj_t *obj)
+ {
+ if ( NULL == obj || NULL == &obj->pvd ) return (NULL);
+- return(vcdinf_get_system_id(&obj->pvd));
++ return(iso9660_get_system_id(&obj->pvd));
+ }
+
+ /*!
+@@ -1202,7 +1248,7 @@
+ track_t
+ vcdinfo_get_track(const vcdinfo_obj_t *obj, const unsigned int entry_num)
+ {
+- const EntriesVcd *entries = &obj->entries;
++ const EntriesVcd_t *entries = &obj->entries;
+ const unsigned int entry_count = vcdinf_get_num_entries(entries);
+ /* Note entry_num is 0 origin. */
+ return entry_num < entry_count ?
+@@ -1311,9 +1357,9 @@
+
+ /* CdIo tracks start at 1 rather than 0. */
+ if (cdio_get_track_msf(obj->img, track_num+1, &msf)) {
+- *min = from_bcd8(msf.m);
+- *sec = from_bcd8(msf.s);
+- *frame = from_bcd8(msf.f);
++ *min = cdio_from_bcd8(msf.m);
++ *sec = cdio_from_bcd8(msf.s);
++ *frame = cdio_from_bcd8(msf.f);
+ return 0;
+ }
+
+@@ -1398,7 +1444,7 @@
+ vcdinfo_video_segment_type_t
+ vcdinfo_get_video_type(const vcdinfo_obj_t *obj, segnum_t seg_num)
+ {
+- const InfoVcd *info;
++ const InfoVcd_t *info;
+ if (obj == NULL) return VCDINFO_FILES_VIDEO_INVALID;
+ info = &obj->info;
+ if (info == NULL) return VCDINFO_FILES_VIDEO_INVALID;
+@@ -1435,7 +1481,7 @@
+ vcdinfo_get_volume_id(const vcdinfo_obj_t *obj)
+ {
+ if ( NULL == obj || NULL == &obj->pvd ) return (NULL);
+- return(vcdinf_get_volume_id(&obj->pvd));
++ return(iso9660_get_volume_id(&obj->pvd));
+ }
+
+ /*!
+@@ -1446,7 +1492,7 @@
+ vcdinfo_get_volumeset_id(const vcdinfo_obj_t *obj)
+ {
+ if ( NULL == obj || NULL == &obj->pvd ) return (NULL);
+- return(vcdinfo_strip_trail(obj->pvd.volume_set_id, MAX_VOLUMESET_ID));
++ return(vcdinfo_strip_trail(obj->pvd.volume_set_id, ISO_MAX_VOLUMESET_ID));
+ }
+
+ /*!
+@@ -1615,6 +1661,17 @@
+ return true;
+ }
+
++/*! Return the entry number for the given track. */
++unsigned int
++vcdinfo_track_get_entry(const vcdinfo_obj_t *obj, track_t i_track)
++{
++ /* FIXME: Add structure to directly map track to first entry number.
++ Until then...
++ */
++ lsn_t lsn= vcdinfo_get_track_lsn(obj, i_track);
++ return vcdinfo_lsn_get_entry(obj, lsn);
++}
++
+ /*!
+ Calls recursive routine to populate obj->offset_list or obj->offset_x_list
+ by going through LOT.
+@@ -1641,10 +1698,10 @@
+
+ ret = vcdinf_visit_lot(&pbc_ctx);
+ if (NULL != obj->offset_x_list)
+- _vcd_list_free(obj->offset_x_list, true);
++ _cdio_list_free(obj->offset_x_list, true);
+ obj->offset_x_list = pbc_ctx.offset_x_list;
+ if (NULL != obj->offset_list)
+- _vcd_list_free(obj->offset_list, true);
++ _cdio_list_free(obj->offset_list, true);
+ obj->offset_list = pbc_ctx.offset_list;
+ return ret;
+ }
+@@ -1747,10 +1804,10 @@
+ */
+ if (NULL == *source_name && source_type == DRIVER_UNKNOWN) {
+ char **cd_drives=NULL;
+- cd_drives = cdio_get_devices_with_cap(NULL,
++ cd_drives = cdio_get_devices_with_cap_ret(NULL,
+ (CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD|CDIO_FS_ANAL_VIDEOCD
+ |CDIO_FS_UNKNOWN),
+- true);
++ true, &source_type);
+ if ( NULL == cd_drives || NULL == cd_drives[0] ) {
+ return VCDINFO_OPEN_ERROR;
+ }
+@@ -1776,7 +1833,7 @@
+ memset (obj, 0, sizeof (vcdinfo_obj_t));
+ obj->img = img; /* Note we do this after the above wipeout! */
+
+- if (!read_pvd(obj->img, &(obj->pvd))) {
++ if (!iso9660_fs_read_pvd(obj->img, &(obj->pvd))) {
+ return VCDINFO_OPEN_ERROR;
+ }
+
+@@ -1806,7 +1863,7 @@
+ }
+
+ if (obj->vcd_type == VCD_TYPE_SVCD || obj->vcd_type == VCD_TYPE_HQVCD) {
+- statbuf = iso9660_fs_stat (obj->img, "MPEGAV", true);
++ statbuf = iso9660_fs_stat (obj->img, "MPEGAV");
+
+ if (NULL != statbuf) {
+ vcd_warn ("non compliant /MPEGAV folder detected!");
+@@ -1814,7 +1871,7 @@
+ }
+
+
+- statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1", true);
++ statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1");
+ if (NULL != statbuf) {
+ lsn_t lsn = statbuf->lsn;
+ if (statbuf->size != ISO_BLOCKSIZE)
+@@ -1836,7 +1893,7 @@
+ iso9660_fs_readdir(img, "EXT", true) and then scanning for
+ the files listed below.
+ */
+- statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true);
++ statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1");
+ if (NULL != statbuf) {
+ lsn_t lsn = statbuf->lsn;
+ uint32_t secsize = statbuf->secsize;
+@@ -1852,7 +1909,7 @@
+ return VCDINFO_OPEN_ERROR;
+ }
+
+- statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
++ statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
+ if (NULL != statbuf) {
+ lsn_t lsn = statbuf->lsn;
+ uint32_t secsize = statbuf->secsize;
+@@ -1877,13 +1934,13 @@
+ iso9660_fs_readdir(img, "SVCD", true) and then scanning for
+ the files listed below.
+ */
+- statbuf = iso9660_fs_stat (img, "MPEGAV", true);
++ statbuf = iso9660_fs_stat (img, "MPEGAV");
+ if (NULL != statbuf) {
+ vcd_warn ("non compliant /MPEGAV folder detected!");
+ free(statbuf);
+ }
+
+- statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1", true);
++ statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1");
+ if (NULL == statbuf)
+ vcd_warn ("mandatory /SVCD/TRACKS.SVD not found!");
+ else {
+@@ -1892,7 +1949,7 @@
+ free(statbuf);
+ }
+
+- statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1", true);
++ statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1");
+ if (NULL == statbuf)
+ vcd_warn ("mandatory /SVCD/SEARCH.DAT not found!");
+ else {
+@@ -1931,7 +1988,7 @@
+ ;
+ }
+
+- statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1", true);
++ statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1");
+ if (statbuf != NULL) {
+ lsn_t lsn = statbuf->lsn;
+ uint32_t secsize = statbuf->secsize;
+@@ -1960,13 +2017,14 @@
+ {
+ if (obj != NULL) {
+ if (obj->offset_list != NULL)
+- _vcd_list_free(obj->offset_list, true);
++ _cdio_list_free(obj->offset_list, true);
+ if (obj->offset_x_list != NULL)
+- _vcd_list_free(obj->offset_x_list, true);
++ _cdio_list_free(obj->offset_x_list, true);
+ free(obj->seg_sizes);
+ free(obj->lot);
+ free(obj->lot_x);
+ if (obj->psd_x) free(obj->psd_x);
++ if (obj->psd) free(obj->psd);
+ if (obj->scandata_buf) free(obj->scandata_buf);
+ free(obj->tracks_buf);
+ free(obj->search_buf);
+--- ./src/input/vcd/libvcd/info_private.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/info_private.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: info_private.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: info_private.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
+
+@@ -47,6 +47,7 @@
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+ #include <cdio/util.h>
+
+ #include <libvcd/types.h>
+@@ -56,12 +57,11 @@
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "data_structures.h"
+ #include "info_private.h"
+ #include "pbc.h"
+
+-static const char _rcsid[] = "$Id: info_private.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: info_private.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ /*
+ This fills in unassigned LIDs in the offset table. Due to
+@@ -75,25 +75,25 @@
+ {
+ if (NULL==obj) return;
+ {
+- VcdListNode *node;
+- VcdList *unused_lids = _vcd_list_new();
+- VcdListNode *next_unused_node = _vcd_list_begin(unused_lids);
++ CdioListNode *node;
++ CdioList *unused_lids = _cdio_list_new();
++ CdioListNode *next_unused_node = _cdio_list_begin(unused_lids);
+
+ unsigned int last_lid=0;
+- VcdList *offset_list = extended ? obj->offset_x_list : obj->offset_list;
++ CdioList *offset_list = extended ? obj->offset_x_list : obj->offset_list;
+
+ lid_t max_seen_lid=0;
+
+- _VCD_LIST_FOREACH (node, offset_list)
++ _CDIO_LIST_FOREACH (node, offset_list)
+ {
+- vcdinfo_offset_t *ofs = _vcd_list_node_data (node);
++ vcdinfo_offset_t *ofs = _cdio_list_node_data (node);
+ if (!ofs->lid) {
+ /* We have a customer! Assign a LID from the free pool
+ or take one from the end if no skipped LIDs.
+ */
+- VcdListNode *node=_vcd_list_node_next(next_unused_node);
++ CdioListNode *node=_cdio_list_node_next(next_unused_node);
+ if (node != NULL) {
+- lid_t *next_unused_lid=_vcd_list_node_data(node);
++ lid_t *next_unused_lid=_cdio_list_node_data(node);
+ ofs->lid = *next_unused_lid;
+ next_unused_node=node;
+ } else {
+@@ -106,12 +106,12 @@
+ while (last_lid != ofs->lid ) {
+ lid_t * lid=_vcd_malloc (sizeof(lid_t));
+ *lid = last_lid;
+- _vcd_list_append(unused_lids, lid);
++ _cdio_list_append(unused_lids, lid);
+ }
+ if (last_lid > max_seen_lid) max_seen_lid=last_lid;
+ }
+ }
+- _vcd_list_free(unused_lids, true);
++ _cdio_list_free(unused_lids, true);
+ }
+ }
+
+@@ -124,7 +124,7 @@
+ bool
+ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj)
+ {
+- const LotVcd *lot = obj->extended ? obj->lot_x : obj->lot;
++ const LotVcd_t *lot = obj->extended ? obj->lot_x : obj->lot;
+ unsigned int n, tmp;
+ bool ret=true;
+
+@@ -137,7 +137,7 @@
+ ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
+
+ _vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,
+- (_vcd_list_cmp_func) vcdinf_lid_t_cmp);
++ (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
+
+ /* Now really complete the offset table with LIDs. This routine
+ might obviate the need for vcdinf_visit_pbc() or some of it which is
+@@ -156,12 +156,12 @@
+ vcdinf_visit_pbc (struct _vcdinf_pbc_ctx *obj, lid_t lid, unsigned int offset,
+ bool in_lot)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ vcdinfo_offset_t *ofs;
+ unsigned int psd_size = obj->extended ? obj->psd_x_size : obj->psd_size;
+ const uint8_t *psd = obj->extended ? obj->psd_x : obj->psd;
+ unsigned int _rofs = offset * obj->offset_mult;
+- VcdList *offset_list;
++ CdioList *offset_list;
+ bool ret=true;
+
+ vcd_assert (psd_size % 8 == 0);
+@@ -188,19 +188,19 @@
+ }
+
+ if (!obj->offset_list)
+- obj->offset_list = _vcd_list_new ();
++ obj->offset_list = _cdio_list_new ();
+
+ if (!obj->offset_x_list)
+- obj->offset_x_list = _vcd_list_new ();
++ obj->offset_x_list = _cdio_list_new ();
+
+ if (obj->extended) {
+ offset_list = obj->offset_x_list;
+ } else
+ offset_list = obj->offset_list;
+
+- _VCD_LIST_FOREACH (node, offset_list)
++ _CDIO_LIST_FOREACH (node, offset_list)
+ {
+- ofs = _vcd_list_node_data (node);
++ ofs = _cdio_list_node_data (node);
+
+ if (offset == ofs->offset)
+ {
+@@ -232,9 +232,9 @@
+ switch (ofs->type)
+ {
+ case PSD_TYPE_PLAY_LIST:
+- _vcd_list_append (offset_list, ofs);
++ _cdio_list_append (offset_list, ofs);
+ {
+- const PsdPlayListDescriptor *d = (const void *) (psd + _rofs);
++ const PsdPlayListDescriptor_t *d = (const void *) (psd + _rofs);
+ const lid_t lid = vcdinf_pld_get_lid(d);
+
+ if (!ofs->lid)
+@@ -253,9 +253,9 @@
+
+ case PSD_TYPE_EXT_SELECTION_LIST:
+ case PSD_TYPE_SELECTION_LIST:
+- _vcd_list_append (offset_list, ofs);
++ _cdio_list_append (offset_list, ofs);
+ {
+- const PsdSelectionListDescriptor *d =
++ const PsdSelectionListDescriptor_t *d =
+ (const void *) (psd + _rofs);
+
+ int idx;
+@@ -283,7 +283,7 @@
+ break;
+
+ case PSD_TYPE_END_LIST:
+- _vcd_list_append (offset_list, ofs);
++ _cdio_list_append (offset_list, ofs);
+ break;
+
+ default:
+@@ -299,7 +299,7 @@
+ entry_num in obj. VCDINFO_NULL_LBA is returned if there is no entry.
+ */
+ lba_t
+-vcdinf_get_entry_lba(const EntriesVcd *entries, unsigned int entry_num)
++vcdinf_get_entry_lba(const EntriesVcd_t *entries, unsigned int entry_num)
+ {
+ const msf_t *msf = vcdinf_get_entry_msf(entries, entry_num);
+ return (msf != NULL) ? cdio_msf_to_lba(msf) : VCDINFO_NULL_LBA;
+@@ -310,7 +310,7 @@
+ The first entry number is 0.
+ */
+ const msf_t *
+-vcdinf_get_entry_msf(const EntriesVcd *entries, unsigned int entry_num)
++vcdinf_get_entry_msf(const EntriesVcd_t *entries, unsigned int entry_num)
+ {
+ const unsigned int entry_count = uint16_from_be (entries->entry_count);
+ return entry_num < entry_count ?
+--- ./src/input/vcd/libvcd/info_private.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/info_private.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -31,6 +31,7 @@
+ #endif
+
+ #include <cdio/cdio.h>
++#include <cdio/ds.h>
+ #include <cdio/iso9660.h>
+ #include <libvcd/types.h>
+ #include <libvcd/files_private.h>
+@@ -46,16 +47,16 @@
+
+ iso9660_pvd_t pvd;
+
+- InfoVcd info;
+- EntriesVcd entries;
++ InfoVcd_t info;
++ EntriesVcd_t entries;
+
+- VcdList *offset_list;
+- VcdList *offset_x_list;
++ CdioList *offset_list;
++ CdioList *offset_x_list;
+ uint32_t *seg_sizes;
+ lsn_t first_segment_lsn;
+
+- LotVcd *lot;
+- LotVcd *lot_x;
++ LotVcd_t *lot;
++ LotVcd_t *lot_x;
+ uint8_t *psd;
+ uint8_t *psd_x;
+ unsigned int psd_x_size;
+@@ -75,18 +76,18 @@
+ entry_num in obj. NULL is returned if there is no entry.
+ The first entry number is 0.
+ */
+- const msf_t * vcdinf_get_entry_msf(const EntriesVcd *entries,
++ const msf_t * vcdinf_get_entry_msf(const EntriesVcd_t *entries,
+ unsigned int entry_num);
+
+ struct _vcdinf_pbc_ctx {
+ unsigned int psd_size;
+ lid_t maximum_lid;
+ unsigned offset_mult;
+- VcdList *offset_x_list;
+- VcdList *offset_list;
++ CdioList *offset_x_list;
++ CdioList *offset_list;
+
+- LotVcd *lot;
+- LotVcd *lot_x;
++ LotVcd_t *lot;
++ LotVcd_t *lot_x;
+ uint8_t *psd;
+ uint8_t *psd_x;
+ unsigned int psd_x_size;
+--- ./src/input/vcd/libvcd/mpeg.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/mpeg.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: mpeg.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: mpeg.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -103,7 +103,7 @@
+ unsigned vbvsize;
+ bool constrained_flag;
+
+- VcdList *aps_list; /* filled up by vcd_mpeg_source */
++ CdioList *aps_list; /* filled up by vcd_mpeg_source */
+ double last_aps_pts; /* temp, see ->packet */
+
+ } shdr[3];
+--- ./src/input/vcd/libvcd/mpeg_stream.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/mpeg_stream.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: mpeg_stream.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: mpeg_stream.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -27,18 +27,18 @@
+ #include <stdlib.h>
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+
+ #include <libvcd/logging.h>
+
+ /* Private headers */
+ #include "vcd_assert.h"
+ #include "mpeg_stream.h"
+-#include "bytesex.h"
+ #include "data_structures.h"
+ #include "mpeg.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: mpeg_stream.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: mpeg_stream.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ struct _VcdMpegSource
+ {
+@@ -83,7 +83,7 @@
+
+ for (i = 0; i < 3; i++)
+ if (obj->info.shdr[i].aps_list)
+- _vcd_list_free (obj->info.shdr[i].aps_list, true);
++ _cdio_list_free (obj->info.shdr[i].aps_list, true);
+
+ free (obj);
+ }
+@@ -117,7 +117,7 @@
+ unsigned padbytes = 0;
+ unsigned padpackets = 0;
+ VcdMpegStreamCtx state;
+- VcdListNode *n;
++ CdioListNode *n;
+ vcd_mpeg_prog_info_t _progress = { 0, };
+
+ vcd_assert (obj != NULL);
+@@ -194,9 +194,9 @@
+ _data->timestamp = state.packet.aps_pts;
+
+ if (!state.stream.shdr[state.packet.aps_idx].aps_list)
+- state.stream.shdr[state.packet.aps_idx].aps_list = _vcd_list_new ();
++ state.stream.shdr[state.packet.aps_idx].aps_list = _cdio_list_new ();
+
+- _vcd_list_append (state.stream.shdr[state.packet.aps_idx].aps_list, _data);
++ _cdio_list_append (state.stream.shdr[state.packet.aps_idx].aps_list, _data);
+ }
+ break;
+
+@@ -251,9 +251,9 @@
+
+ for (i = 0; i < 3; i++)
+ if (obj->info.shdr[i].aps_list)
+- _VCD_LIST_FOREACH (n, obj->info.shdr[i].aps_list)
++ _CDIO_LIST_FOREACH (n, obj->info.shdr[i].aps_list)
+ {
+- struct aps_data *_data = _vcd_list_node_data (n);
++ struct aps_data *_data = _cdio_list_node_data (n);
+
+ _data->timestamp -= obj->info.min_pts;
+ }
+@@ -268,18 +268,18 @@
+ }
+
+ static double
+-_approx_pts (VcdList *aps_list, uint32_t packet_no)
++_approx_pts (CdioList *aps_list, uint32_t packet_no)
+ {
+ double retval = 0;
+- VcdListNode *node;
++ CdioListNode *node;
+
+ struct aps_data *_laps = NULL;
+
+ double last_pts_ratio = 0;
+
+- _VCD_LIST_FOREACH (node, aps_list)
++ _CDIO_LIST_FOREACH (node, aps_list)
+ {
+- struct aps_data *_aps = _vcd_list_node_data (node);
++ struct aps_data *_aps = _cdio_list_node_data (node);
+
+ if (_laps)
+ {
+@@ -322,14 +322,14 @@
+
+ static void
+ _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
+- unsigned packet_no, double pts, VcdList *aps_list)
++ unsigned packet_no, double pts, CdioList *aps_list)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ long _next = -1, _prev = -1, _forw = -1, _back = -1;
+
+- _VCD_LIST_FOREACH (node, aps_list)
++ _CDIO_LIST_FOREACH (node, aps_list)
+ {
+- struct aps_data *_aps = _vcd_list_node_data (node);
++ struct aps_data *_aps = _cdio_list_node_data (node);
+
+ if (_aps->packet_no == packet_no)
+ continue;
+--- ./src/input/vcd/libvcd/obj.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/obj.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: obj.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: obj.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -48,10 +48,10 @@
+ char *id;
+ const struct vcd_mpeg_stream_info *info;
+
+- VcdList *pause_list; /* pause_t */
++ CdioList *pause_list; /* pause_t */
+
+ char *default_entry_id;
+- VcdList *entry_list; /* entry_t */
++ CdioList *entry_list; /* entry_t */
+
+ /* pbc ref check */
+ bool referenced;
+@@ -69,7 +69,7 @@
+ char *id;
+ const struct vcd_mpeg_stream_info *info;
+
+- VcdList *pause_list; /* pause_t */
++ CdioList *pause_list; /* pause_t */
+
+ /* pbc ref check */
+ bool referenced;
+@@ -128,25 +128,25 @@
+
+ /* input */
+ unsigned mpeg_segment_start_extent;
+- VcdList *mpeg_segment_list; /* mpeg_segment_t */
++ CdioList *mpeg_segment_list; /* mpeg_segment_t */
+
+- VcdList *mpeg_sequence_list; /* mpeg_sequence_t */
++ CdioList *mpeg_sequence_list; /* mpeg_sequence_t */
+
+ unsigned relative_end_extent; /* last mpeg sequence track end extent */
+
+ /* PBC */
+- VcdList *pbc_list; /* pbc_t */
++ CdioList *pbc_list; /* pbc_t */
+ unsigned psd_size;
+ unsigned psdx_size;
+
+ /* custom files */
+ unsigned ext_file_start_extent;
+ unsigned custom_file_start_extent;
+- VcdList *custom_file_list; /* custom_file_t */
+- VcdList *custom_dir_list; /* char */
++ CdioList *custom_file_list; /* custom_file_t */
++ CdioList *custom_dir_list; /* char */
+
+ /* dictionary */
+- VcdList *buffer_dict_list;
++ CdioList *buffer_dict_list;
+
+ /* aggregates */
+ VcdSalloc *iso_bitmap;
+--- ./src/input/vcd/libvcd/pbc.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/pbc.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: pbc.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: pbc.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -27,23 +27,24 @@
+ #include <math.h>
+
+ #include <cdio/cdio.h>
++#include <cdio/bytesex.h>
+
+ /* Public headers */
+ #include <libvcd/logging.h>
+ #include <libvcd/files.h>
+ #include <libvcd/types.h>
++#include <libvcd/info.h>
+
+ /* FIXME! Make this really private. */
+ #include <libvcd/files_private.h>
+
+ /* Private headers */
+ #include "vcd_assert.h"
+-#include "bytesex.h"
+ #include "obj.h"
+ #include "pbc.h"
+ #include "util.h"
+
+-static const char _rcsid[] = "$Id: pbc.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: pbc.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ static uint8_t
+ _wtime (int seconds)
+@@ -74,11 +75,11 @@
+ static pbc_t *
+ _vcd_pbc_byid(const VcdObj *obj, const char item_id[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ if (_pbc->id && !strcmp (item_id, _pbc->id))
+ return _pbc;
+@@ -91,12 +92,12 @@
+ unsigned
+ _vcd_pbc_lid_lookup (const VcdObj *obj, const char item_id[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ unsigned n = 1;
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ vcd_assert (n < 0x8000);
+
+@@ -143,11 +144,11 @@
+ {
+ if (id < 2)
+ return ITEM_TYPE_NOTFOUND;
+- else if (id < 100)
++ else if (id < MIN_ENCODED_TRACK_NUM)
+ return ITEM_TYPE_TRACK;
+ else if (id < 600)
+ return ITEM_TYPE_ENTRY;
+- else if (id < 2980)
++ else if (id <= MAX_ENCODED_SEGMENT_NUM)
+ return ITEM_TYPE_SEGMENT;
+ else
+ vcd_assert_not_reached ();
+@@ -162,7 +163,7 @@
+ _vcd_pbc_pin_lookup (const VcdObj *obj, const char item_id[])
+ {
+ int n;
+- VcdListNode *node;
++ CdioListNode *node;
+
+ if (!item_id)
+ return 0;
+@@ -170,9 +171,9 @@
+ /* check sequence items */
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
+
+ vcd_assert (n < 98);
+
+@@ -185,10 +186,10 @@
+ /* check entry points */
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
+- VcdListNode *node2;
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
++ CdioListNode *node2;
+
+ /* default entry point */
+
+@@ -199,9 +200,9 @@
+
+ /* additional entry points */
+
+- _VCD_LIST_FOREACH (node2, _sequence->entry_list)
++ _CDIO_LIST_FOREACH (node2, _sequence->entry_list)
+ {
+- entry_t *_entry = _vcd_list_node_data (node2);
++ entry_t *_entry = _cdio_list_node_data (node2);
+
+ vcd_assert (n < 500);
+
+@@ -215,14 +216,14 @@
+ /* check sequence items */
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ vcd_assert (n < 1980);
+
+ if (_segment->id && !strcmp (item_id, _segment->id))
+- return n + 1000;
++ return n + MIN_ENCODED_SEGMENT_NUM;
+
+ n += _segment->segment_count;
+ }
+@@ -236,7 +237,7 @@
+ vcd_assert (obj != NULL);
+ vcd_assert (obj->pbc_list != NULL);
+
+- if (!_vcd_list_length (obj->pbc_list))
++ if (!_cdio_list_length (obj->pbc_list))
+ return false;
+
+ if (!_vcd_obj_has_cap_p (obj, _CAP_PBC))
+@@ -254,7 +255,7 @@
+ uint16_t retval = 0;
+
+ if (_vcd_pbc_available (obj))
+- retval = _vcd_list_length (obj->pbc_list);
++ retval = _cdio_list_length (obj->pbc_list);
+
+ return retval;
+ }
+@@ -272,14 +273,14 @@
+ int n;
+
+ case PBC_PLAYLIST:
+- n = _vcd_list_length (_pbc->item_id_list);
++ n = _cdio_list_length (_pbc->item_id_list);
+ retval = __cd_offsetof (_PsdPlayListDescriptor, itemid[n]);
+ break;
+
+ case PBC_SELECTION:
+- n = _vcd_list_length (_pbc->select_id_list);
++ n = _cdio_list_length (_pbc->select_id_list);
+
+- retval = __cd_offsetof (PsdSelectionListDescriptor, ofs[n]);
++ retval = __cd_offsetof (PsdSelectionListDescriptor_t, ofs[n]);
+
+ if (extended || _vcd_obj_has_cap_p (obj, _CAP_4C_SVCD))
+ retval += __cd_offsetof (PsdSelectionListDescriptorExtended, area[n]);
+@@ -300,7 +301,7 @@
+ static uint16_t
+ _lookup_psd_offset (const VcdObj *obj, const char item_id[], bool extended)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ if (extended)
+ vcd_assert (_vcd_obj_has_cap_p (obj, _CAP_PBC_X));
+@@ -309,9 +310,9 @@
+ if (!item_id)
+ return PSD_OFS_DISABLED;
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ if (!_pbc->id || strcmp (item_id, _pbc->id))
+ continue;
+@@ -367,15 +368,15 @@
+ {
+ case PBC_PLAYLIST:
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ _vcd_pbc_mark_id (obj, _pbc->prev_id);
+ _vcd_pbc_mark_id (obj, _pbc->next_id);
+ _vcd_pbc_mark_id (obj, _pbc->retn_id);
+
+- _VCD_LIST_FOREACH (node, _pbc->item_id_list)
++ _CDIO_LIST_FOREACH (node, _pbc->item_id_list)
+ {
+- const char *_id = _vcd_list_node_data (node);
++ const char *_id = _cdio_list_node_data (node);
+
+ _vcd_pin_mark_id (obj, _id);
+ }
+@@ -384,7 +385,7 @@
+
+ case PBC_SELECTION:
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ _vcd_pbc_mark_id (obj, _pbc->prev_id);
+ _vcd_pbc_mark_id (obj, _pbc->next_id);
+@@ -397,9 +398,9 @@
+
+ _vcd_pin_mark_id (obj, _pbc->item_id);
+
+- _VCD_LIST_FOREACH (node, _pbc->select_id_list)
++ _CDIO_LIST_FOREACH (node, _pbc->select_id_list)
+ {
+- const char *_id = _vcd_list_node_data (node);
++ const char *_id = _cdio_list_node_data (node);
+
+ _vcd_pbc_mark_id (obj, _id);
+ }
+@@ -419,36 +420,36 @@
+ void
+ _vcd_pbc_check_unreferenced (const VcdObj *obj)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ /* clear all flags */
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ _pbc->referenced = false;
+ }
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
+
+ _sequence->referenced = false;
+ }
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ _segment->referenced = false;
+ }
+
+ /* start from non-rejected lists */
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ vcd_assert (_pbc->id != NULL);
+
+@@ -460,25 +461,25 @@
+
+ /* collect flags */
+
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+
+ if (!_pbc->referenced)
+ vcd_warn ("PSD item '%s' is unreachable", _pbc->id);
+ }
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
+
+ if (!_sequence->referenced)
+ vcd_warn ("sequence '%s' is not reachable by PBC", _sequence->id);
+ }
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ if (!_segment->referenced)
+ vcd_warn ("segment item '%s' is unreachable", _segment->id);
+@@ -502,11 +503,11 @@
+ case PBC_PLAYLIST:
+ {
+ _PsdPlayListDescriptor *_md = buf;
+- VcdListNode *node;
++ CdioListNode *node;
+ int n;
+
+ _md->type = PSD_TYPE_PLAY_LIST;
+- _md->noi = _vcd_list_length (_pbc->item_id_list);
++ _md->noi = _cdio_list_length (_pbc->item_id_list);
+
+ vcd_assert (_pbc->lid < 0x8000);
+ _md->lid = uint16_to_be (_pbc->lid | (_pbc->rejected ? 0x8000 : 0));
+@@ -522,9 +523,9 @@
+ _md->atime = _wtime (_pbc->auto_pause_time);
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, _pbc->item_id_list)
++ _CDIO_LIST_FOREACH (node, _pbc->item_id_list)
+ {
+- const char *_id = _vcd_list_node_data (node);
++ const char *_id = _cdio_list_node_data (node);
+ uint16_t _pin;
+
+ if (_id)
+@@ -546,22 +547,22 @@
+
+ case PBC_SELECTION:
+ {
+- PsdSelectionListDescriptor *_md = buf;
++ PsdSelectionListDescriptor_t *_md = buf;
+
+- const unsigned _nos = _vcd_list_length (_pbc->select_id_list);
++ const unsigned int _nos = _cdio_list_length (_pbc->select_id_list);
+
+ if (extended)
+ _md->type = PSD_TYPE_EXT_SELECTION_LIST;
+ else
+ _md->type = PSD_TYPE_SELECTION_LIST;
+
+- if (!IN (_pbc->bsn, 1, 99))
+- vcd_error ("selection '%s': BSN (%d) not in range [1..99]",
+- _pbc->id, _pbc->bsn);
+-
+- if (!IN (_nos, 0, 99))
+- vcd_error ("selection '%s': too many selections (%d > 99)",
+- _pbc->id, _nos);
++ if (!IN (_pbc->bsn, 1, MAX_PBC_SELECTIONS))
++ vcd_error ("selection '%s': BSN (%d) not in range [1..%d]",
++ _pbc->id, _pbc->bsn, MAX_PBC_SELECTIONS);
++
++ if (!IN (_nos, 0, MAX_PBC_SELECTIONS))
++ vcd_error ("selection '%s': too many selections (%d > %d)",
++ _pbc->id, _nos, MAX_PBC_SELECTIONS);
+
+ if (_nos + _pbc->bsn > 100)
+ vcd_error ("selection '%s': BSN + NOS (%d + %d) > 100",
+@@ -676,7 +677,8 @@
+ if ((_seq = _vcd_obj_get_sequence_by_id ((VcdObj *) obj, _pbc->item_id))
+ || (_seq = _vcd_obj_get_sequence_by_entry_id ((VcdObj *) obj, _pbc->item_id)))
+ {
+- const unsigned _entries = _vcd_list_length (_seq->entry_list) + 1;
++ const unsigned _entries =
++ _cdio_list_length (_seq->entry_list) + 1;
+
+ if (_nos != _entries)
+ vcd_error ("selection '%s': number of entrypoints"
+@@ -699,13 +701,13 @@
+
+ /* fill selection array */
+ {
+- VcdListNode *node = NULL;
++ CdioListNode *node = NULL;
+ int idx = 0;
+
+ idx = 0;
+- _VCD_LIST_FOREACH (node, _pbc->select_id_list)
++ _CDIO_LIST_FOREACH (node, _pbc->select_id_list)
+ {
+- const char *_id = _vcd_list_node_data (node);
++ const char *_id = _cdio_list_node_data (node);
+
+ _md->ofs[idx] =
+ uint16_to_be (_lookup_psd_offset (obj, _id, extended));
+@@ -717,7 +719,7 @@
+ if (extended || _vcd_obj_has_cap_p (obj, _CAP_4C_SVCD))
+ {
+ PsdSelectionListDescriptorExtended *_md2;
+- VcdListNode *node;
++ CdioListNode *node;
+ int n;
+
+ /* append extended selection areas */
+@@ -732,9 +734,9 @@
+
+ n = 0;
+ if (_pbc->select_area_list)
+- _VCD_LIST_FOREACH (node, _pbc->select_area_list)
++ _CDIO_LIST_FOREACH (node, _pbc->select_area_list)
+ {
+- const pbc_area_t *_area = _vcd_list_node_data (node);
++ const pbc_area_t *_area = _cdio_list_node_data (node);
+
+ _set_area_helper (&_md2->area[n], _area, _pbc->id);
+
+@@ -809,12 +811,12 @@
+ switch (type)
+ {
+ case PBC_PLAYLIST:
+- _pbc->item_id_list = _vcd_list_new ();
++ _pbc->item_id_list = _cdio_list_new ();
+ break;
+
+ case PBC_SELECTION:
+- _pbc->select_id_list = _vcd_list_new ();
+- _pbc->select_area_list = _vcd_list_new ();
++ _pbc->select_id_list = _cdio_list_new ();
++ _pbc->select_area_list = _cdio_list_new ();
+ break;
+
+ case PBC_END:
+@@ -834,14 +836,14 @@
+ bool
+ _vcd_pbc_finalize (VcdObj *obj)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ unsigned offset = 0, offset_ext = 0;
+ unsigned lid;
+
+ lid = 1;
+- _VCD_LIST_FOREACH (node, obj->pbc_list)
++ _CDIO_LIST_FOREACH (node, obj->pbc_list)
+ {
+- pbc_t *_pbc = _vcd_list_node_data (node);
++ pbc_t *_pbc = _cdio_list_node_data (node);
+ unsigned length, length_ext = 0;
+
+ length = _vcd_pbc_node_length (obj, _pbc, false);
+--- ./src/input/vcd/libvcd/pbc.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/pbc.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: pbc.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: pbc.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
+
+@@ -72,7 +72,7 @@
+ double playing_time;
+ int wait_time;
+ int auto_pause_time;
+- VcdList *item_id_list; /* char */
++ CdioList *item_id_list; /* char */
+
+ /* used for selection lists */
+ enum selection_type_t {
+@@ -85,7 +85,7 @@
+ pbc_area_t *next_area;
+ pbc_area_t *return_area;
+ pbc_area_t *default_area; /* depends on selection_type */
+- VcdList *select_area_list; /* pbc_area_t */
++ CdioList *select_area_list; /* pbc_area_t */
+
+ unsigned bsn;
+ char *default_id;
+@@ -94,7 +94,7 @@
+ unsigned loop_count;
+ bool jump_delayed;
+ char *item_id;
+- VcdList *select_id_list; /* char */
++ CdioList *select_id_list; /* char */
+
+ /* used for end lists */
+ char *image_id;
+--- ./src/input/vcd/libvcd/vcd.c 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/vcd.c 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: vcd.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: vcd.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -49,7 +49,7 @@
+ #include "util.h"
+ #include "vcd.h"
+
+-static const char _rcsid[] = "$Id: vcd.c,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $";
++static const char _rcsid[] = "$Id: vcd.c,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $";
+
+ static const char zero[CDIO_CD_FRAMESIZE_RAW] = { 0, };
+
+@@ -61,14 +61,14 @@
+ mpeg_sequence_t *
+ _vcd_obj_get_sequence_by_id (VcdObj *obj, const char sequence_id[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (sequence_id != NULL);
+ vcd_assert (obj != NULL);
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
+
+ if (_sequence->id && !strcmp (sequence_id, _sequence->id))
+ return _sequence;
+@@ -80,15 +80,15 @@
+ mpeg_sequence_t *
+ _vcd_obj_get_sequence_by_entry_id (VcdObj *obj, const char entry_id[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (entry_id != NULL);
+ vcd_assert (obj != NULL);
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
+- VcdListNode *node2;
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
++ CdioListNode *node2;
+
+ /* default entry point */
+ if (_sequence->default_entry_id
+@@ -96,9 +96,9 @@
+ return _sequence;
+
+ /* additional entry points */
+- _VCD_LIST_FOREACH (node2, _sequence->entry_list)
++ _CDIO_LIST_FOREACH (node2, _sequence->entry_list)
+ {
+- entry_t *_entry = _vcd_list_node_data (node2);
++ entry_t *_entry = _cdio_list_node_data (node2);
+
+ if (_entry->id
+ && !strcmp (entry_id, _entry->id))
+@@ -114,14 +114,14 @@
+ mpeg_segment_t *
+ _vcd_obj_get_segment_by_id (VcdObj *obj, const char segment_id[])
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (segment_id != NULL);
+ vcd_assert (obj != NULL);
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ if (_segment->id && !strcmp (segment_id, _segment->id))
+ return _segment;
+@@ -283,15 +283,15 @@
+ new_obj->info_volume_count = 1;
+ new_obj->info_volume_number = 1;
+
+- new_obj->custom_file_list = _vcd_list_new ();
+- new_obj->custom_dir_list = _vcd_list_new ();
++ new_obj->custom_file_list = _cdio_list_new ();
++ new_obj->custom_dir_list = _cdio_list_new ();
+
+
+- new_obj->mpeg_sequence_list = _vcd_list_new ();
++ new_obj->mpeg_sequence_list = _cdio_list_new ();
+
+- new_obj->mpeg_segment_list = _vcd_list_new ();
++ new_obj->mpeg_segment_list = _cdio_list_new ();
+
+- new_obj->pbc_list = _vcd_list_new ();
++ new_obj->pbc_list = _cdio_list_new ();
+
+ /* gap's defined by IEC-10149 / ECMA-130 */
+
+@@ -327,7 +327,7 @@
+ {
+ int length;
+ mpeg_sequence_t *track = NULL;
+- VcdListNode *node = NULL;
++ CdioListNode *node = NULL;
+
+ vcd_assert (track_id >= 0);
+
+@@ -335,7 +335,7 @@
+
+ vcd_assert (node != NULL);
+
+- track = (mpeg_sequence_t *) _vcd_list_node_data (node);
++ track = (mpeg_sequence_t *) _cdio_list_node_data (node);
+
+ vcd_mpeg_source_destroy (track->source, true);
+
+@@ -344,15 +344,15 @@
+
+ /* fixup offsets */
+ {
+- VcdListNode *node2 = node;
+- while ((node2 = _vcd_list_node_next (node2)) != NULL)
+- ((mpeg_sequence_t *) _vcd_list_node_data (node))->relative_start_extent -= length;
++ CdioListNode *node2 = node;
++ while ((node2 = _cdio_list_node_next (node2)) != NULL)
++ ((mpeg_sequence_t *) _cdio_list_node_data (node))->relative_start_extent -= length;
+ }
+
+ obj->relative_end_extent -= length;
+
+ /* shift up */
+- _vcd_list_node_free (node, true);
++ _cdio_list_node_free (node, true);
+ }
+
+ int
+@@ -383,7 +383,7 @@
+ }
+
+ vcd_info ("scanning mpeg segment item #%d for scanpoints...",
+- _vcd_list_length (obj->mpeg_segment_list));
++ _cdio_list_length (obj->mpeg_segment_list));
+
+ vcd_mpeg_source_scan (mpeg_source, !obj->relaxed_aps,
+ obj->update_scan_offsets, NULL, NULL);
+@@ -405,13 +405,13 @@
+ segment->info = vcd_mpeg_source_get_info (mpeg_source);
+ segment->segment_count = _vcd_len2blocks (segment->info->packets, 150);
+
+- segment->pause_list = _vcd_list_new ();
++ segment->pause_list = _cdio_list_new ();
+
+ vcd_debug ("SPI length is %d sector(s), allocated %d segment(s)",
+ segment->info->packets,
+ segment->segment_count);
+
+- _vcd_list_append (obj->mpeg_segment_list, segment);
++ _cdio_list_append (obj->mpeg_segment_list, segment);
+
+ return 0;
+ }
+@@ -423,7 +423,7 @@
+ {
+ unsigned length;
+ mpeg_sequence_t *sequence = NULL;
+- int track_no = _vcd_list_length (obj->mpeg_sequence_list);
++ int track_no = _cdio_list_length (obj->mpeg_sequence_list);
+
+ vcd_assert (obj != NULL);
+ vcd_assert (mpeg_source != NULL);
+@@ -463,8 +463,8 @@
+ sequence->info = vcd_mpeg_source_get_info (mpeg_source);
+ length = sequence->info->packets;
+
+- sequence->entry_list = _vcd_list_new ();
+- sequence->pause_list = _vcd_list_new ();
++ sequence->entry_list = _cdio_list_new ();
++ sequence->pause_list = _cdio_list_new ();
+
+ obj->relative_end_extent += obj->track_pregap;
+ sequence->relative_start_extent = obj->relative_end_extent;
+@@ -526,7 +526,7 @@
+ /* vcd_debug ("track# %d's detected playing time: %.2f seconds", */
+ /* track_no, sequence->info->playing_time); */
+
+- _vcd_list_append (obj->mpeg_sequence_list, sequence);
++ _cdio_list_append (obj->mpeg_sequence_list, sequence);
+
+ return track_no;
+ }
+@@ -554,7 +554,8 @@
+ if (sequence_id)
+ _sequence = _vcd_obj_get_sequence_by_id (obj, sequence_id);
+ else
+- _sequence = _vcd_list_node_data (_vcd_list_end (obj->mpeg_sequence_list));
++ _sequence =
++ _cdio_list_node_data (_cdio_list_end (obj->mpeg_sequence_list));
+
+ if (!_sequence)
+ {
+@@ -572,11 +573,11 @@
+ _pause->id = strdup (pause_id);
+ _pause->time = pause_time;
+
+- _vcd_list_append (_sequence->pause_list, _pause);
++ _cdio_list_append (_sequence->pause_list, _pause);
+ }
+
+ _vcd_list_sort (_sequence->pause_list,
+- (_vcd_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -594,7 +595,7 @@
+ if (segment_id)
+ _segment = _vcd_obj_get_segment_by_id (obj, segment_id);
+ else
+- _segment = _vcd_list_node_data (_vcd_list_end (obj->mpeg_segment_list));
++ _segment = _cdio_list_node_data (_cdio_list_end (obj->mpeg_segment_list));
+
+ if (!_segment)
+ {
+@@ -612,11 +613,11 @@
+ _pause->id = strdup (pause_id);
+ _pause->time = pause_time;
+
+- _vcd_list_append (_segment->pause_list, _pause);
++ _cdio_list_append (_segment->pause_list, _pause);
+ }
+
+ _vcd_list_sort (_segment->pause_list,
+- (_vcd_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -646,7 +647,8 @@
+ if (sequence_id)
+ _sequence = _vcd_obj_get_sequence_by_id (obj, sequence_id);
+ else
+- _sequence = _vcd_list_node_data (_vcd_list_end (obj->mpeg_sequence_list));
++ _sequence =
++ _cdio_list_node_data (_cdio_list_end (obj->mpeg_sequence_list));
+
+ if (!_sequence)
+ {
+@@ -654,7 +656,7 @@
+ return -1;
+ }
+
+- if (_vcd_list_length (_sequence->entry_list) >= MAX_SEQ_ENTRIES)
++ if (_cdio_list_length (_sequence->entry_list) >= MAX_SEQ_ENTRIES)
+ {
+ vcd_error ("only %d entries per sequence allowed!", MAX_SEQ_ENTRIES);
+ return -1;
+@@ -673,11 +675,11 @@
+ _entry->id = strdup (entry_id);
+ _entry->time = entry_time;
+
+- _vcd_list_append (_sequence->entry_list, _entry);
++ _cdio_list_append (_sequence->entry_list, _entry);
+ }
+
+ _vcd_list_sort (_sequence->entry_list,
+- (_vcd_list_cmp_func) _entry_cmp);
++ (_cdio_list_cmp_func) _entry_cmp);
+
+ return 0;
+ }
+@@ -685,7 +687,7 @@
+ void
+ vcd_obj_destroy (VcdObj *obj)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (obj != NULL);
+ vcd_assert (!obj->in_output);
+@@ -693,20 +695,20 @@
+ free (obj->iso_volume_label);
+ free (obj->iso_application_id);
+
+- _VCD_LIST_FOREACH (node, obj->custom_file_list)
++ _CDIO_LIST_FOREACH (node, obj->custom_file_list)
+ {
+- custom_file_t *p = _vcd_list_node_data (node);
++ custom_file_t *p = _cdio_list_node_data (node);
+
+ free (p->iso_pathname);
+ }
+
+- _vcd_list_free (obj->custom_file_list, true);
++ _cdio_list_free (obj->custom_file_list, true);
+
+- _vcd_list_free (obj->custom_dir_list, true);
++ _cdio_list_free (obj->custom_dir_list, true);
+
+- while (_vcd_list_length (obj->mpeg_sequence_list))
++ while (_cdio_list_length (obj->mpeg_sequence_list))
+ _vcd_obj_remove_mpeg_track (obj, 0);
+- _vcd_list_free (obj->mpeg_sequence_list, true);
++ _cdio_list_free (obj->mpeg_sequence_list, true);
+
+ free (obj);
+ }
+@@ -983,10 +985,10 @@
+ return 1;
+ }
+
+- _vcd_list_append (obj->custom_dir_list, _iso_pathname);
++ _cdio_list_append (obj->custom_dir_list, _iso_pathname);
+
+ _vcd_list_sort (obj->custom_dir_list,
+- (_vcd_list_cmp_func) strcmp);
++ (_cdio_list_cmp_func) strcmp);
+
+ return 0;
+ }
+@@ -1050,7 +1052,7 @@
+ p->start_extent = 0;
+ p->sectors = sectors;
+
+- _vcd_list_append (obj->custom_file_list, p);
++ _cdio_list_append (obj->custom_file_list, p);
+ }
+
+ return 0;
+@@ -1060,7 +1062,7 @@
+ _finalize_vcd_iso_track_allocation (VcdObj *obj)
+ {
+ int n;
+- VcdListNode *node;
++ CdioListNode *node;
+
+ uint32_t dir_secs = SECTOR_NIL;
+
+@@ -1119,9 +1121,9 @@
+
+ /* insert segments */
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ _segment->start_extent =
+ _vcd_salloc (obj->iso_bitmap, SECTOR_NIL,
+@@ -1163,9 +1165,9 @@
+
+ /* now for the custom files */
+
+- _VCD_LIST_FOREACH (node, obj->custom_file_list)
++ _CDIO_LIST_FOREACH (node, obj->custom_file_list)
+ {
+- custom_file_t *p = _vcd_list_node_data (node);
++ custom_file_t *p = _cdio_list_node_data (node);
+
+ if (p->sectors)
+ {
+@@ -1194,7 +1196,7 @@
+ _finalize_vcd_iso_track_filesystem (VcdObj *obj)
+ {
+ int n;
+- VcdListNode *node;
++ CdioListNode *node;
+
+ /* create filesystem entries */
+
+@@ -1211,7 +1213,7 @@
+ _vcd_directory_mkdir (obj->dir, "VCD");
+
+ /* add segment dir only when there are actually segment play items */
+- if (_vcd_list_length (obj->mpeg_segment_list))
++ if (_cdio_list_length (obj->mpeg_segment_list))
+ _vcd_directory_mkdir (obj->dir, "SEGMENT");
+
+ _vcd_directory_mkfile (obj->dir, "VCD/ENTRIES.VCD",
+@@ -1246,7 +1248,7 @@
+ }
+
+ /* add segment dir only when there are actually segment play items */
+- if (_vcd_list_length (obj->mpeg_segment_list))
++ if (_cdio_list_length (obj->mpeg_segment_list))
+ _vcd_directory_mkdir (obj->dir, "SEGMENT");
+
+ _vcd_directory_mkdir (obj->dir, "SVCD");
+@@ -1284,9 +1286,9 @@
+ /* SEGMENTS */
+
+ n = 1;
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *segment = _vcd_list_node_data (node);
++ mpeg_segment_t *segment = _cdio_list_node_data (node);
+ char segment_pathname[128] = { 0, };
+ const char *fmt = NULL;
+ uint8_t fnum = 0;
+@@ -1344,15 +1346,15 @@
+ }
+
+ /* custom files/dirs */
+- _VCD_LIST_FOREACH (node, obj->custom_dir_list)
++ _CDIO_LIST_FOREACH (node, obj->custom_dir_list)
+ {
+- char *p = _vcd_list_node_data (node);
++ char *p = _cdio_list_node_data (node);
+ _vcd_directory_mkdir (obj->dir, p);
+ }
+
+- _VCD_LIST_FOREACH (node, obj->custom_file_list)
++ _CDIO_LIST_FOREACH (node, obj->custom_file_list)
+ {
+- custom_file_t *p = _vcd_list_node_data (node);
++ custom_file_t *p = _cdio_list_node_data (node);
+
+ _vcd_directory_mkfile (obj->dir, p->iso_pathname, p->start_extent,
+ (p->raw_flag
+@@ -1363,11 +1365,11 @@
+
+
+ n = 0;
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+ char avseq_pathname[128] = { 0, };
+ const char *fmt = NULL;
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (node);
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (node);
+ uint32_t extent = _sequence->relative_start_extent;
+ uint8_t file_num = 0;
+
+@@ -1478,7 +1480,7 @@
+ _pi.sectors_written = obj->sectors_written;
+ _pi.total_sectors = obj->relative_end_extent + obj->iso_size;
+ _pi.in_track = obj->in_track;
+- _pi.total_tracks = _vcd_list_length (obj->mpeg_sequence_list) + 1;
++ _pi.total_tracks = _cdio_list_length (obj->mpeg_sequence_list) + 1;
+
+ return obj->progress_callback (&_pi, obj->callback_user_data);
+ }
+@@ -1580,8 +1582,8 @@
+ _write_sequence (VcdObj *obj, int track_idx)
+ {
+ mpeg_sequence_t *track =
+- _vcd_list_node_data (_vcd_list_at (obj->mpeg_sequence_list, track_idx));
+- VcdListNode *pause_node;
++ _cdio_list_node_data (_vcd_list_at (obj->mpeg_sequence_list, track_idx));
++ CdioListNode *pause_node;
+ int n, lastsect = obj->sectors_written;
+ char buf[2324];
+ struct {
+@@ -1680,7 +1682,7 @@
+ _write_m2_image_sector (obj, zero, lastsect++, track_idx + 1,
+ 0, SM_FORM2|SM_REALT, 0);
+
+- pause_node = _vcd_list_begin (track->pause_list);
++ pause_node = _cdio_list_begin (track->pause_list);
+
+ for (n = 0; n < track->info->packets; n++) {
+ int ci = 0, sm = 0, cnum = 0, fnum = 0;
+@@ -1692,7 +1694,7 @@
+
+ while (pause_node)
+ {
+- pause_t *_pause = _vcd_list_node_data (pause_node);
++ pause_t *_pause = _cdio_list_node_data (pause_node);
+
+ if (!pkt_flags.has_pts)
+ break; /* no pts */
+@@ -1706,7 +1708,7 @@
+ vcd_debug ("setting auto pause trigger for time %f (pts %f) @%d",
+ _pause->time, pkt_flags.pts, n);
+
+- pause_node = _vcd_list_node_next (pause_node);
++ pause_node = _cdio_list_node_next (pause_node);
+ }
+
+ switch (vcd_mpeg_packet_get_type (&pkt_flags))
+@@ -1807,13 +1809,13 @@
+ static int
+ _write_segment (VcdObj *obj, mpeg_segment_t *_segment)
+ {
+- VcdListNode *pause_node;
++ CdioListNode *pause_node;
+ unsigned packet_no;
+ int n = obj->sectors_written;
+
+ vcd_assert (_segment->start_extent == n);
+
+- pause_node = _vcd_list_begin (_segment->pause_list);
++ pause_node = _cdio_list_begin (_segment->pause_list);
+
+ for (packet_no = 0;
+ packet_no < (_segment->segment_count * VCDINFO_SEGMENT_SECTOR_SIZE);
+@@ -1838,7 +1840,7 @@
+
+ while (pause_node)
+ {
+- pause_t *_pause = _vcd_list_node_data (pause_node);
++ pause_t *_pause = _cdio_list_node_data (pause_node);
+
+ if (!pkt_flags.has_pts)
+ break; /* no pts */
+@@ -1852,7 +1854,7 @@
+ vcd_debug ("setting auto pause trigger for time %f (pts %f) @%d",
+ _pause->time, pkt_flags.pts, n);
+
+- pause_node = _vcd_list_node_next (pause_node);
++ pause_node = _cdio_list_node_next (pause_node);
+ }
+
+ switch (vcd_mpeg_packet_get_type (&pkt_flags))
+@@ -1950,16 +1952,16 @@
+ _get_closest_aps (const struct vcd_mpeg_stream_info *_mpeg_info, double t,
+ struct aps_data *_best_aps)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ struct aps_data best_aps;
+ bool first = true;
+
+ vcd_assert (_mpeg_info != NULL);
+ vcd_assert (_mpeg_info->shdr[0].aps_list != NULL);
+
+- _VCD_LIST_FOREACH (node, _mpeg_info->shdr[0].aps_list)
++ _CDIO_LIST_FOREACH (node, _mpeg_info->shdr[0].aps_list)
+ {
+- struct aps_data *_aps = _vcd_list_node_data (node);
++ struct aps_data *_aps = _cdio_list_node_data (node);
+
+ if (first)
+ {
+@@ -1981,17 +1983,17 @@
+ static void
+ _update_entry_points (VcdObj *obj)
+ {
+- VcdListNode *sequence_node;
++ CdioListNode *sequence_node;
+
+- _VCD_LIST_FOREACH (sequence_node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (sequence_node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *_sequence = _vcd_list_node_data (sequence_node);
+- VcdListNode *entry_node;
++ mpeg_sequence_t *_sequence = _cdio_list_node_data (sequence_node);
++ CdioListNode *entry_node;
+ unsigned last_packet_no = 0;
+
+- _VCD_LIST_FOREACH (entry_node, _sequence->entry_list)
++ _CDIO_LIST_FOREACH (entry_node, _sequence->entry_list)
+ {
+- entry_t *_entry = _vcd_list_node_data (entry_node);
++ entry_t *_entry = _cdio_list_node_data (entry_node);
+
+ _get_closest_aps (_sequence->info, _entry->time, &_entry->aps);
+
+@@ -2014,7 +2016,7 @@
+ static int
+ _write_vcd_iso_track (VcdObj *obj, const time_t *create_time)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+ int n;
+
+ /* generate dir sectors */
+@@ -2092,9 +2094,9 @@
+
+ vcd_assert (n == obj->mpeg_segment_start_extent);
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_segment_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_segment_list)
+ {
+- mpeg_segment_t *_segment = _vcd_list_node_data (node);
++ mpeg_segment_t *_segment = _cdio_list_node_data (node);
+
+ _write_segment (obj, _segment);
+ }
+@@ -2127,12 +2129,12 @@
+
+ vcd_assert (n == obj->custom_file_start_extent);
+
+- _VCD_LIST_FOREACH (node, obj->custom_file_list)
++ _CDIO_LIST_FOREACH (node, obj->custom_file_list)
+ {
+- custom_file_t *p = _vcd_list_node_data (node);
++ custom_file_t *p = _cdio_list_node_data (node);
+
+- vcd_info ("writing file `%s' (%d bytes%s)",
+- p->iso_pathname, p->size,
++ vcd_info ("writing file `%s' (%lu bytes%s)",
++ p->iso_pathname, (unsigned long) p->size,
+ p->raw_flag ? ", raw sectors file": "");
+ if (p->raw_flag)
+ _write_source_mode2_raw (obj, p->file, p->start_extent);
+@@ -2155,7 +2157,7 @@
+
+ vcd_assert (!obj->in_output);
+
+- if (_vcd_list_length (obj->mpeg_sequence_list) > 0)
++ if (_cdio_list_length (obj->mpeg_sequence_list) > 0)
+ {
+ /* fixme -- make this efficient */
+ size_sectors = vcd_obj_begin_output (obj);
+@@ -2171,7 +2173,7 @@
+ uint32_t image_size;
+
+ vcd_assert (obj != NULL);
+- vcd_assert (_vcd_list_length (obj->mpeg_sequence_list) > 0);
++ vcd_assert (_cdio_list_length (obj->mpeg_sequence_list) > 0);
+
+ vcd_assert (!obj->in_output);
+ obj->in_output = true;
+@@ -2183,7 +2185,7 @@
+
+ obj->dir = _vcd_directory_new ();
+
+- obj->buffer_dict_list = _vcd_list_new ();
++ obj->buffer_dict_list = _cdio_list_new ();
+
+ _finalize_vcd_iso_track (obj);
+
+@@ -2224,7 +2226,7 @@
+ _vcd_salloc_destroy (obj->iso_bitmap);
+
+ _dict_clean (obj);
+- _vcd_list_free (obj->buffer_dict_list, true);
++ _cdio_list_free (obj->buffer_dict_list, true);
+ }
+
+ int
+@@ -2245,7 +2247,7 @@
+ return -1;
+ }
+
+- _vcd_list_append (obj->pbc_list, _pbc);
++ _cdio_list_append (obj->pbc_list, _pbc);
+
+ return 0;
+ }
+@@ -2255,7 +2257,7 @@
+ progress_callback_t callback, void *user_data,
+ const time_t *create_time)
+ {
+- VcdListNode *node;
++ CdioListNode *node;
+
+ vcd_assert (obj != NULL);
+ vcd_assert (obj->in_output);
+@@ -2266,37 +2268,40 @@
+ /* start with meta info */
+
+ {
+- VcdList *cue_list;
++ CdioList *cue_list;
+ vcd_cue_t *_cue;
+
+- cue_list = _vcd_list_new ();
++ cue_list = _cdio_list_new ();
+
+- _vcd_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
++ _cdio_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
+
+ _cue->lsn = 0;
+ _cue->type = VCD_CUE_TRACK_START;
+
+- _VCD_LIST_FOREACH (node, obj->mpeg_sequence_list)
++ _CDIO_LIST_FOREACH (node, obj->mpeg_sequence_list)
+ {
+- mpeg_sequence_t *track = _vcd_list_node_data (node);
+- VcdListNode *entry_node;
++ mpeg_sequence_t *track = _cdio_list_node_data (node);
++ CdioListNode *entry_node;
+
+- _vcd_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
++ _cdio_list_append (cue_list,
++ (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
+
+ _cue->lsn = track->relative_start_extent + obj->iso_size;
+ _cue->lsn -= obj->track_pregap;
+ _cue->type = VCD_CUE_PREGAP_START;
+
+- _vcd_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
++ _cdio_list_append (cue_list,
++ (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
+
+ _cue->lsn = track->relative_start_extent + obj->iso_size;
+ _cue->type = VCD_CUE_TRACK_START;
+
+- _VCD_LIST_FOREACH (entry_node, track->entry_list)
++ _CDIO_LIST_FOREACH (entry_node, track->entry_list)
+ {
+- entry_t *_entry = _vcd_list_node_data (entry_node);
++ entry_t *_entry = _cdio_list_node_data (entry_node);
+
+- _vcd_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
++ _cdio_list_append (cue_list,
++ (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
+
+ _cue->lsn = obj->iso_size;
+ _cue->lsn += track->relative_start_extent;
+@@ -2309,7 +2314,7 @@
+
+ /* add last one... */
+
+- _vcd_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
++ _cdio_list_append (cue_list, (_cue = _vcd_malloc (sizeof (vcd_cue_t))));
+
+ _cue->lsn = obj->relative_end_extent + obj->iso_size;
+
+@@ -2321,7 +2326,7 @@
+
+ vcd_image_sink_set_cuesheet (image_sink, cue_list);
+
+- _vcd_list_free (cue_list, true);
++ _cdio_list_free (cue_list, true);
+ }
+
+ /* and now for the pay load */
+@@ -2347,7 +2352,7 @@
+ if (obj->update_scan_offsets)
+ vcd_info ("'update scan offsets' option enabled for the following tracks!");
+
+- for (track = 0;track < _vcd_list_length (obj->mpeg_sequence_list);track++)
++ for (track = 0;track < _cdio_list_length (obj->mpeg_sequence_list);track++)
+ {
+ obj->in_track++;
+
+--- ./src/input/vcd/libvcd/vcd_read.c 11 Apr 2004 14:59:23 -0000 1.3
++++ ./src/input/vcd/libvcd/vcd_read.c 3 Jan 2005 21:14:00 -0000 1.3.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: vcd_read.c,v 1.3 2004/04/11 14:59:23 mroi Exp $
++ $Id: vcd_read.c,v 1.3.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
+ Copyright (C) 2003 Rocky Bernstein <rocky@gnu.org>
+@@ -19,7 +19,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-
++
+ #include "vcd_read.h"
+ #include "vcd_assert.h"
+ #include <libvcd/inf.h>
+@@ -53,7 +53,7 @@
+ }
+
+ bool
+-read_entries(CdIo *cdio, EntriesVcd *entries)
++read_entries(CdIo *cdio, EntriesVcd_t *entries)
+ {
+ if (cdio_read_mode2_sector (cdio, entries, ENTRIES_VCD_SECTOR, false)) {
+ vcd_error ("error reading Entries sector (%d)", ENTRIES_VCD_SECTOR);
+@@ -74,7 +74,7 @@
+ }
+
+ bool
+-read_info(CdIo *cdio, InfoVcd *info, vcd_type_t *vcd_type)
++read_info(CdIo *cdio, InfoVcd_t *info, vcd_type_t *vcd_type)
+ {
+ if (cdio_read_mode2_sector (cdio, info, INFO_VCD_SECTOR, false)) {
+ vcd_error ("error reading Info sector (%d)", INFO_VCD_SECTOR);
+--- ./src/input/vcd/libvcd/vcd_read.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/vcd_read.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,5 +1,5 @@
+ /*
+- $Id: vcd_read.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: vcd_read.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+ Copyright (C) 2003 Rocky Bernstein <rocky@gnu.org>
+
+@@ -29,8 +29,8 @@
+ #include <libvcd/files_private.h>
+
+ bool read_pvd(CdIo *cdio, iso9660_pvd_t *pvd);
+-bool read_entries(CdIo *cdio, EntriesVcd *entries);
+-bool read_info(CdIo *cdio, InfoVcd *info, vcd_type_t *vcd_type);
++bool read_entries(CdIo *cdio, EntriesVcd_t *entries);
++bool read_info(CdIo *cdio, InfoVcd_t *info, vcd_type_t *vcd_type);
+
+
+
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/input/vcd/libvcd/version.h 3 Jan 2005 21:14:00 -0000 1.1.2.1
+@@ -0,0 +1,11 @@
++/* $Id: version.h,v 1.1.2.1 2005/01/03 21:14:00 mroi Exp $ */
++/** \file version.h
++ * \brief A file simply containing the library version number.
++ */
++
++/*! LIBVCD_VERSION can as a string in programs to show what version is used. */
++#define LIBVCD_VERSION "0.7.21-"
++
++/*! LIBCDIO_VERSION_NUM can be used for testing in the C preprocessor */
++#define LIBVCD_VERSION_NUM 21
++
+--- ./src/input/vcd/libvcd/libvcd/inf.h 13 Oct 2003 11:47:12 -0000 1.1
++++ ./src/input/vcd/libvcd/libvcd/inf.h 3 Jan 2005 21:14:00 -0000 1.1.2.1
+@@ -1,7 +1,7 @@
+ /*!
+ \file inf.h
+
+- Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ \verbatim
+ This program is free software; you can redistribute it and/or modify
+@@ -29,7 +29,6 @@
+ #ifndef _VCD_INF_H
+ #define _VCD_INF_H
+
+-#include <cdio/iso9660.h>
+ #include <libvcd/info.h>
+
+ const char * vcdinf_area_str (const struct psd_area_t *_area);
+@@ -37,31 +36,25 @@
+ /*!
+ Return a string containing the VCD album id.
+ */
+- const char * vcdinf_get_album_id(const InfoVcd *info);
+-
+- /*!
+- Return the VCD application ID.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_application_id(const iso9660_pvd_t *pvd);
++ const char * vcdinf_get_album_id(const InfoVcd_t *info);
+
+ /*!
+ Get autowait time value for PsdPlayListDescriptor *d.
+ Time is in seconds unless it is -1 (unlimited).
+ */
+- int vcdinf_get_autowait_time (const PsdPlayListDescriptor *d);
++ int vcdinf_get_autowait_time (const PsdPlayListDescriptor_t *d);
+
+ /*!
+ Return the base selection number. VCD_INVALID_BSN is returned if there
+ is an error.
+ */
+- unsigned int vcdinf_get_bsn(const PsdSelectionListDescriptor *psd);
++ unsigned int vcdinf_get_bsn(const PsdSelectionListDescriptor_t *psd);
+
+ /*! Return the starting LBA (logical block address) for sequence
+ entry_num in obj. VCDINFO_NULL_LBA is returned if there is no entry.
+ The first entry number is 0.
+ */
+- lba_t vcdinf_get_entry_lba(const EntriesVcd *entries,
++ lba_t vcdinf_get_entry_lba(const EntriesVcd_t *entries,
+ unsigned int entry_num);
+
+ const char * vcdinf_get_format_version_str (vcd_type_t vcd_type);
+@@ -69,118 +62,85 @@
+ /*!
+ Return loop count. 0 is infinite loop.
+ */
+- uint16_t vcdinf_get_loop_count (const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_get_loop_count (const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ Return LOT offset
+ */
+- uint16_t vcdinf_get_lot_offset (const LotVcd *lot, unsigned int n);
+-
+- /*!
+- Return a string containing the VCD preparer id with trailing
+- blanks removed.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_preparer_id(const iso9660_pvd_t *pvd);
++ uint16_t vcdinf_get_lot_offset (const LotVcd_t *lot, unsigned int n);
+
+ /*!
+ Return number of bytes in PSD.
+ */
+- uint32_t vcdinf_get_psd_size (const InfoVcd *info);
++ uint32_t vcdinf_get_psd_size (const InfoVcd_t *info);
+
+ /*!
+- Return a string containing the VCD publisher id with trailing
+- blanks removed.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_publisher_id(const iso9660_pvd_t *pvd);
+-
+- /*!
+ Return the number of segments in the VCD.
+ */
+- unsigned int vcdinf_get_num_entries(const EntriesVcd *entries);
++ unsigned int vcdinf_get_num_entries(const EntriesVcd_t *entries);
+
+ /*!
+ Return number of LIDs.
+ */
+- lid_t vcdinf_get_num_LIDs (const InfoVcd *info);
++ lid_t vcdinf_get_num_LIDs (const InfoVcd_t *info);
+
+ /*!
+ Return the number of segments in the VCD.
+ */
+- segnum_t vcdinf_get_num_segments(const InfoVcd *info);
++ segnum_t vcdinf_get_num_segments(const InfoVcd_t *info);
+
+ /*!
+ Return the number of menu selections for selection-list descriptor d.
+ */
+- unsigned int vcdinf_get_num_selections(const PsdSelectionListDescriptor *d);
++ unsigned int vcdinf_get_num_selections(const PsdSelectionListDescriptor_t *d);
+
+ /*!
+ Get play-time value for PsdPlayListDescriptor *d.
+ Time is in 1/15-second units.
+ */
+- uint16_t vcdinf_get_play_time (const PsdPlayListDescriptor *d);
+-
+- /*!
+- Return a string containing the VCD system id with trailing
+- blanks removed.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_system_id(const iso9660_pvd_t *pvd);
++ uint16_t vcdinf_get_play_time (const PsdPlayListDescriptor_t *d);
+
+ /*!
+ Get timeout offset for PsdPlayListDescriptor *d. Return
+ VCDINFO_INVALID_OFFSET if d is NULL;
+ Time is in seconds unless it is -1 (unlimited).
+ */
+- uint16_t vcdinf_get_timeout_offset (const PsdSelectionListDescriptor *d);
++ uint16_t vcdinf_get_timeout_offset (const PsdSelectionListDescriptor_t *d);
+
+ /*!
+ Get timeout wait value for PsdPlayListDescriptor *d.
+ Time is in seconds unless it is -1 (unlimited).
+ */
+- int vcdinf_get_timeout_time (const PsdSelectionListDescriptor *d);
++ int vcdinf_get_timeout_time (const PsdSelectionListDescriptor_t *d);
+
+ /*!
+ Return the track number for entry n in obj. The first track starts
+ at 1.
+ */
+- track_t vcdinf_get_track(const EntriesVcd *entries,
++ track_t vcdinf_get_track(const EntriesVcd_t *entries,
+ const unsigned int entry_num);
+
+ /*!
+ Return the VCD volume num - the number of the CD in the collection.
+ This is a number between 1 and the volume count.
+ */
+- unsigned int vcdinf_get_volume_num(const InfoVcd *info);
++ unsigned int vcdinf_get_volume_num(const InfoVcd_t *info);
+
+ /*!
+ Return the VCD volume count - the number of CD's in the collection.
+ */
+- unsigned int vcdinf_get_volume_count(const InfoVcd *info);
+-
+- /*!
+- Return the VCD ID.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_volume_id(const iso9660_pvd_t *pvd);
+-
+- /*!
+- Return the VCD volumeset ID.
+- NULL is returned if there is some problem in getting this.
+- */
+- const char * vcdinf_get_volumeset_id(const iso9660_pvd_t *pvd);
++ unsigned int vcdinf_get_volume_count(const InfoVcd_t *info);
+
+ /*!
+ Get wait time value for PsdPlayListDescriptor *d.
+ Time is in seconds unless it is -1 (unlimited).
+ */
+- int vcdinf_get_wait_time (const PsdPlayListDescriptor *d);
++ int vcdinf_get_wait_time (const PsdPlayListDescriptor_t *d);
+
+ /*!
+ Return true if loop has a jump delay
+ */
+- bool vcdinf_has_jump_delay (const PsdSelectionListDescriptor *psd);
++ bool vcdinf_has_jump_delay (const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ Comparison routine used in sorting. We compare LIDs and if those are
+@@ -197,18 +157,18 @@
+ \return VCDINFO_INVALID_OFFSET is returned on error or if pld has no
+ "next" entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_pld_get_next_offset(const PsdPlayListDescriptor *pld);
++ uint16_t vcdinf_pld_get_next_offset(const PsdPlayListDescriptor_t *pld);
+
+ /*!
+ Get the LID from a given play-list descriptor.
+ VCDINFO_REJECTED_MASK is returned on error or pld is NULL.
+ */
+- uint16_t vcdinf_pld_get_lid(const PsdPlayListDescriptor *pld);
++ uint16_t vcdinf_pld_get_lid(const PsdPlayListDescriptor_t *pld);
+
+ /*!
+ Return the playlist item i in d.
+ */
+- uint16_t vcdinf_pld_get_play_item(const PsdPlayListDescriptor *pld,
++ uint16_t vcdinf_pld_get_play_item(const PsdPlayListDescriptor_t *pld,
+ unsigned int i);
+
+ /**
+@@ -217,7 +177,7 @@
+ \return VCDINFO_INVALID_OFFSET is returned on error or if pld has no
+ "prev" entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_pld_get_prev_offset(const PsdPlayListDescriptor *pld);
++ uint16_t vcdinf_pld_get_prev_offset(const PsdPlayListDescriptor_t *pld);
+
+ /**
+ \fn vcdinf_pld_get_return_offset(const PsdPlayListDescriptor *pld);
+@@ -225,12 +185,12 @@
+ \return VCDINFO_INVALID_OFFSET is returned on error or if pld has no
+ "return" entry or pld is NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_pld_get_return_offset(const PsdPlayListDescriptor *pld);
++ uint16_t vcdinf_pld_get_return_offset(const PsdPlayListDescriptor_t *pld);
+
+ /*!
+ Return number of items in LIDs. Return 0 if error or not found.
+ */
+- int vcdinf_pld_get_noi (const PsdPlayListDescriptor *pld);
++ int vcdinf_pld_get_noi (const PsdPlayListDescriptor_t *pld);
+
+ /**
+ * \fn vcdinfo_psd_get_default_offset(const PsdSelectionListDescriptor *psd);
+@@ -238,26 +198,26 @@
+ * \return VCDINFO_INVALID_OFFSET is returned on error or if psd is
+ * NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_psd_get_default_offset(const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_psd_get_default_offset(const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ Get the item id for a given selection-list descriptor.
+ VCDINFO_REJECTED_MASK is returned on error or if psd is NULL.
+ */
+- uint16_t vcdinf_psd_get_itemid(const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_psd_get_itemid(const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ Get the LID from a given selection-list descriptor.
+ VCDINFO_REJECTED_MASK is returned on error or psd is NULL.
+ */
+- uint16_t vcdinf_psd_get_lid(const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_psd_get_lid(const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ Get the LID rejected status for a given selection-list descriptor.
+ true is also returned d is NULL.
+ */
+ bool
+- vcdinf_psd_get_lid_rejected(const PsdSelectionListDescriptor *psd);
++ vcdinf_psd_get_lid_rejected(const PsdSelectionListDescriptor_t *psd);
+
+ /**
+ \fn vcdinf_psd_get_next_offset(const PsdSelectionListDescriptor *psd);
+@@ -265,7 +225,7 @@
+ \return VCDINFO_INVALID_OFFSET is returned on error or if psd has no
+ "next" entry or psd is NULL. Otherwise the LID offset is returned.
+ */
+- lid_t vcdinf_psd_get_next_offset(const PsdSelectionListDescriptor *psd);
++ lid_t vcdinf_psd_get_next_offset(const PsdSelectionListDescriptor_t *psd);
+
+ /*!
+ \brief Get offset entry_num for a given PSD selector descriptor.
+@@ -274,7 +234,7 @@
+ \return VCDINFO_INVALID_OFFSET is returned if d on error or d is
+ NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_psd_get_offset(const PsdSelectionListDescriptor *d,
++ uint16_t vcdinf_psd_get_offset(const PsdSelectionListDescriptor_t *d,
+ unsigned int entry_num);
+ /**
+ \fn vcdinf_psd_get_prev_offset(const PsdPlayListDescriptor *psd);
+@@ -283,7 +243,7 @@
+ "prev"
+ entry or psd is NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_psd_get_prev_offset(const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_psd_get_prev_offset(const PsdSelectionListDescriptor_t *psd);
+
+ /**
+ * \fn vcdinf_psd_get_return_offset(const PsdSelectionListDescriptor *psd);
+@@ -291,7 +251,7 @@
+ \return VCDINFO_INVALID_OFFSET is returned on error or if psd has no
+ "return" entry or psd is NULL. Otherwise the LID offset is returned.
+ */
+- uint16_t vcdinf_psd_get_return_offset(const PsdSelectionListDescriptor *psd);
++ uint16_t vcdinf_psd_get_return_offset(const PsdSelectionListDescriptor_t *psd);
+
+ #ifdef __cplusplus
+ }
+--- ./src/input/vcd/libvcd/libvcd/info.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/libvcd/info.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*!
+ \file info.h
+
+- Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
++ Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
+
+ \verbatim
+ This program is free software; you can redistribute it and/or modify
+@@ -29,9 +29,11 @@
+ #ifndef _VCD_INFO_H
+ #define _VCD_INFO_H
+
++#include <libvcd/version.h>
+ #include <libvcd/types.h>
+ #include <libvcd/files.h>
+ #include <cdio/cdio.h>
++#include <cdio/ds.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -41,12 +43,13 @@
+
+ /*! \def Max # characters in an album id. */
+ #define MAX_ALBUM_LEN 16
+-#define MAX_APPLICATION_ID 128
+-#define MAX_PREPARER_ID 128
+-#define MAX_PUBLISHER_ID 128
+-#define MAX_SYSTEM_ID 32
+-#define MAX_VOLUME_ID 32
+-#define MAX_VOLUMESET_ID 128
++
++/*! \def Max # of selections allowed in a PBC selection list. */
++#define MAX_PBC_SELECTIONS 99
++
++#define MIN_ENCODED_TRACK_NUM 100
++#define MIN_ENCODED_SEGMENT_NUM 1000
++#define MAX_ENCODED_SEGMENT_NUM 2979
+
+ /*!
+ Invalid LBA, Note: VCD player uses the fact that this is a very high
+@@ -189,11 +192,14 @@
+ /* Only one of pld or psd is used below. Not all
+ C compiler accept the anonymous unions commented out below. */
+ /* union { */
+- PsdPlayListDescriptor *pld;
+- PsdSelectionListDescriptor *psd;
++ PsdPlayListDescriptor_t *pld;
++ PsdSelectionListDescriptor_t *psd;
+ /* }; */
+
+- } PsdListDescriptor;
++ } PsdListDescriptor_t;
++
++ /* For backwards compatibility. Don't use PsdListDescriptor. */
++#define PsdListDescriptor PsdListDescriptor_t
+
+ /*!
+ Return the number of audio channels implied by "audio_type".
+@@ -245,8 +251,8 @@
+ Return the VCD application ID.
+ NULL is returned if there is some problem in getting this.
+ */
+- const char *
+- vcdinfo_get_application_id(const vcdinfo_obj_t *obj);
++ char *
++ vcdinfo_get_application_id(vcdinfo_obj_t *obj);
+
+ /*!
+ Return a pointer to the cdio structure for the CD image opened or
+@@ -324,9 +330,9 @@
+ const char *
+ vcdinfo_get_format_version_str (const vcdinfo_obj_t *obj);
+
+- EntriesVcd * vcdinfo_get_entriesVcd (vcdinfo_obj_t *obj);
++ EntriesVcd_t * vcdinfo_get_entriesVcd (vcdinfo_obj_t *obj);
+
+- InfoVcd * vcdinfo_get_infoVcd (vcdinfo_obj_t *obj);
++ InfoVcd_t * vcdinfo_get_infoVcd (vcdinfo_obj_t *obj);
+
+ /*!
+ \brief Get default or multi-default LID.
+@@ -345,7 +351,7 @@
+ */
+ lid_t
+ vcdinfo_get_multi_default_lid(const vcdinfo_obj_t *obj, lid_t lid,
+- unsigned int selection);
++ lsn_t lsn);
+
+ /*!
+ \brief Get default or multi-default LID offset.
+@@ -377,13 +383,13 @@
+ /*!
+ Get the LOT pointer.
+ */
+- LotVcd *
++ LotVcd_t *
+ vcdinfo_get_lot(const vcdinfo_obj_t *obj);
+
+ /*!
+ Get the extended LOT pointer.
+ */
+- LotVcd *
++ LotVcd_t *
+ vcdinfo_get_lot_x(const vcdinfo_obj_t *obj);
+
+ /*!
+@@ -426,12 +432,12 @@
+ /*!
+ Get the VCD info list.
+ */
+- VcdList *vcdinfo_get_offset_list(const vcdinfo_obj_t *obj);
++ CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *obj);
+
+ /*!
+ Get the VCD info extended offset list.
+ */
+- VcdList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *obj);
++ CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *obj);
+
+ /*!
+ Get the VCD info offset multiplier.
+@@ -726,9 +732,14 @@
+ Get the PSD Selection List Descriptor for a given lid.
+ False is returned if not found.
+ */
+- bool vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor *pxd,
++ bool vcdinfo_lid_get_pxd(const vcdinfo_obj_t *obj, PsdListDescriptor_t *pxd,
+ uint16_t lid);
+
++ /*! Return the entry number closest and before the given LSN.
++ */
++ unsigned int
++ vcdinfo_lsn_get_entry(const vcdinfo_obj_t *obj, lsn_t lsn);
++
+ /*!
+ Convert minutes, seconds and frame (MSF components) into a
+ logical block address (or LBA).
+@@ -789,6 +800,11 @@
+ */
+ const char * vcdinfo_strip_trail (const char str[], size_t n);
+
++ /*! Return the entry number for the given track.
++ */
++ unsigned int
++ vcdinfo_track_get_entry(const vcdinfo_obj_t *obj, track_t track);
++
+ /*!
+ Initialize the vcdinfo structure "obj". Should be done before other
+ routines using obj are called.
+--- ./src/input/vcd/libvcd/libvcd/types.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/libvcd/types.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1,7 +1,7 @@
+ /*
+- $Id: types.h,v 1.2 2004/04/11 12:20:32 miguelfreitas Exp $
++ $Id: types.h,v 1.2.2.1 2005/01/03 21:14:00 mroi Exp $
+
+- Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
++ Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -34,13 +34,13 @@
+ typedef struct _VcdListNode VcdListNode;
+
+ /* Defined fully in files_private.h */
+- typedef struct _InfoVcd_tag InfoVcd;
+- typedef struct _EntriesVcd_tag EntriesVcd;
+- typedef struct _LotVcd_tag LotVcd;
+-
+- typedef struct _PsdPlayListDescriptor_tag PsdPlayListDescriptor;
+- typedef struct _PsdSelectionListDescriptor_tag PsdSelectionListDescriptor;
++ typedef struct _InfoVcd_tag InfoVcd_t;
++ typedef struct _EntriesVcd_tag EntriesVcd_t;
++ typedef struct _LotVcd_tag LotVcd_t;
+
++ typedef struct _PsdPlayListDescriptor_tag PsdPlayListDescriptor_t;
++ typedef struct _PsdSelectionListDescriptor_tag PsdSelectionListDescriptor_t;
++
+ /* Overall data structure representing a VideoCD object.
+ Defined fully in info_private.h.
+ */
+--- ./src/input/vcd/libvcd/libvcd/version.h 11 Apr 2004 12:20:32 -0000 1.2
++++ ./src/input/vcd/libvcd/libvcd/version.h 3 Jan 2005 21:14:00 -0000 1.2.2.1
+@@ -1 +1 @@
+-#define LIBVCD_VERSION "0.7.20"
++#define LIBVCD_VERSION "0.7.20a"
+--- ./src/libmpeg2/decode.c 16 Dec 2004 13:59:11 -0000 1.122
++++ ./src/libmpeg2/decode.c 9 Feb 2005 19:39:26 -0000 1.122.2.1
+@@ -276,38 +276,40 @@
+ mpeg2dec->in_slice = 0;
+
+ if (is_frame_done && picture->current_frame != NULL) {
+-
+- /*
+- * This frame completion code will move to a separate libmpeg2_accel.c file?
+- * int libmpeg2_accel_frame_completion(mpeg2dec_t *, picture_t *, int);
+- */
+-
+- if (mpeg2dec->frame_format == XINE_IMGFMT_XXMC) {
+- xine_xxmc_t *xxmc = (xine_xxmc_t *)
+- picture->current_frame->accel_data;
+- switch(picture->current_frame->format) {
+- case XINE_IMGFMT_XXMC:
+- switch(xxmc->acceleration) {
+- case XINE_XVMC_ACCEL_VLD:
+- mpeg2_xxmc_vld_frame_complete(mpeg2dec, picture, code);
+- break;
+- case XINE_XVMC_ACCEL_IDCT:
+- case XINE_XVMC_ACCEL_MOCOMP:
+- xxmc->decoded = !picture->current_frame->bad_frame;
+- xxmc->proc_xxmc_flush( picture->current_frame );
+- break;
+- default:
+- break;
+- }
+- default:
+- break;
++
++ /*
++ * This frame completion code will move to a separate libmpeg2_accel.c file?
++ * int libmpeg2_accel_frame_completion(mpeg2dec_t *, picture_t *, int);
++ */
++
++ if (mpeg2dec->frame_format == XINE_IMGFMT_XXMC) {
++ xine_xxmc_t *xxmc = (xine_xxmc_t *)
++ picture->current_frame->accel_data;
++ if (!xxmc->decoded) {
++ switch(picture->current_frame->format) {
++ case XINE_IMGFMT_XXMC:
++ switch(xxmc->acceleration) {
++ case XINE_XVMC_ACCEL_VLD:
++ mpeg2_xxmc_vld_frame_complete(mpeg2dec, picture, code);
++ break;
++ case XINE_XVMC_ACCEL_IDCT:
++ case XINE_XVMC_ACCEL_MOCOMP:
++ xxmc->decoded = !picture->current_frame->bad_frame;
++ xxmc->proc_xxmc_flush( picture->current_frame );
++ break;
++ default:
++ break;
++ }
++ default:
++ break;
++ }
++ }
+ }
+- }
+-
+- /*
+- * End of frame completion code.
+- */
+-
++
++ /*
++ * End of frame completion code.
++ */
++
+
+ if (((picture->picture_structure == FRAME_PICTURE) ||
+ (picture->second_field)) ) {
+--- ./src/libmpeg2/slice_xvmc.c 13 Nov 2004 19:32:52 -0000 1.6
++++ ./src/libmpeg2/slice_xvmc.c 9 Feb 2005 19:39:27 -0000 1.6.2.1
+@@ -1707,8 +1707,9 @@
+ if (1 == code) {
+ mpeg2dec->xvmc_last_slice_code = 0;
+ }
+- if (code != mpeg2dec->xvmc_last_slice_code + 1)
+- return;
++ if ((code != mpeg2dec->xvmc_last_slice_code + 1) &&
++ (code != mpeg2dec->xvmc_last_slice_code))
++ return;
+
+ bitstream_init (picture, buffer);
+
+@@ -1936,7 +1937,7 @@
+ default: /* end of slice, or error */
+ if (mpeg2_cpu_state_restore)
+ mpeg2_cpu_state_restore (&cpu_state);
+- mpeg2dec->xvmc_last_slice_code++;
++ mpeg2dec->xvmc_last_slice_code = code;
+ return;
+ }
+ }
+@@ -2036,7 +2037,7 @@
+ }
+ }
+ }
+- mpeg2dec->xvmc_last_slice_code++;
++ mpeg2dec->xvmc_last_slice_code = code;
+ #undef bit_buf
+ #undef bits
+ #undef bit_ptr
+--- ./src/libmpeg2/slice_xvmc_vld.c 13 Nov 2004 19:32:52 -0000 1.3
++++ ./src/libmpeg2/slice_xvmc_vld.c 9 Feb 2005 19:39:29 -0000 1.3.2.1
+@@ -192,7 +192,8 @@
+ }
+ }
+
+- if ((code == mpeg2dec->xvmc_last_slice_code + 1) &&
++ if (((code == mpeg2dec->xvmc_last_slice_code + 1) ||
++ (code == mpeg2dec->xvmc_last_slice_code)) &&
+ code <= mpeg2dec->xxmc_mb_pic_height) {
+
+ /*
+@@ -220,6 +221,7 @@
+ * went well, tell libmpeg2 that we are ready.
+ */
+
++ mpeg2dec->xvmc_last_slice_code = code;
+ mpeg2_xxmc_vld_frame_complete(mpeg2dec,picture,code);
+ return;
+ } else {
+@@ -228,7 +230,7 @@
+ * Keep track of slices.
+ */
+
+- mpeg2dec->xvmc_last_slice_code++;
++ mpeg2dec->xvmc_last_slice_code = code;
+ }
+
+ } else {
+@@ -259,7 +261,6 @@
+ return;
+ }
+ xxmc->decoded = 1;
+- mpeg2dec->xvmc_last_slice_code++;
+ if (picture->picture_structure == 3 || picture->second_field) {
+ if (xxmc->result == 0)
+ frame->bad_frame = 0;
+--- ./src/libmusepack/.cvsignore 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/.cvsignore 9 Feb 2005 19:39:29 -0000 1.1.2.1
+@@ -0,0 +1,6 @@
++Makefile
++Makefile.in
++.libs
++.deps
++*.lo
++*.la
+--- ./src/libmusepack/Makefile.am 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/Makefile.am 9 Feb 2005 19:39:29 -0000 1.2.2.1
+@@ -0,0 +1,15 @@
++include $(top_srcdir)/misc/Makefile.common
++
++SUBDIRS = musepack
++
++EXTRA_DIST = diff_against_svn.patch
++
++libdir = $(XINE_PLUGINDIR)
++
++lib_LTLIBRARIES = xineplug_decode_mpc.la
++
++xineplug_decode_mpc_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c \
++ mpc_reader.c requant.c streaminfo.c synth_filter.c xine_decoder.c
++xineplug_decode_mpc_la_LIBADD = $(XINE_LIB)
++xineplug_decode_mpc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+--- ./src/libmusepack/diff_against_svn.patch 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/diff_against_svn.patch 9 Feb 2005 19:39:29 -0000 1.1.2.1
+@@ -0,0 +1,19 @@
++Use xine's inttypes.
++The file config_types.h is generated from config_types.h.in in musepack SVN.
++
++Index: src/libmusepack/musepack/config_types.h
++===================================================================
++RCS file: /home/valtri/CVS/xine-lib/src/libmusepack/musepack/config_types.h,v
++retrieving revision 1.1.1.2
++diff -u -p -u -p -r1.1.1.2 config_types.h
++--- src/libmusepack/musepack/config_types.h 3 Feb 2005 00:19:24 -0000 1.1.1.2
+++++ src/libmusepack/musepack/config_types.h 3 Feb 2005 00:21:06 -0000
++@@ -1,7 +1,7 @@
++ #ifndef __CONFIG_TYPES_H__
++ #define __CONFIG_TYPES_H__
++
++-#include <stdint.h>
+++#include "os_types.h"
++
++ #ifdef WORDS_BIGENDIAN
++ #undef MPC_LITTLE_ENDIAN
+--- ./src/libmusepack/huffsv46.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/huffsv46.c 9 Feb 2005 19:39:29 -0000 1.1.2.1
+@@ -0,0 +1,268 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file huffsv46.c
++/// Implementations of huffman decoding for streamversions < 7.
++
++#include "musepack/musepack.h"
++#include "musepack/requant.h"
++#include "musepack/huffman.h"
++
++void
++mpc_decoder_init_huffman_sv6(mpc_decoder *d)
++{
++ mpc_decoder_init_huffman_sv6_tables(d);
++ mpc_decoder_resort_huff_tables(16, d->Region_A , 0);
++ mpc_decoder_resort_huff_tables( 8, d->Region_B , 0);
++ mpc_decoder_resort_huff_tables( 4, d->Region_C , 0);
++ mpc_decoder_resort_huff_tables( 8, d->SCFI_Bundle , 0);
++ mpc_decoder_resort_huff_tables(13, d->DSCF_Entropie , 6);
++ mpc_decoder_resort_huff_tables( 3, d->Entropie_1 , Dc[1]);
++ mpc_decoder_resort_huff_tables( 5, d->Entropie_2 , Dc[2]);
++ mpc_decoder_resort_huff_tables( 7, d->Entropie_3 , Dc[3]);
++ mpc_decoder_resort_huff_tables( 9, d->Entropie_4 , Dc[4]);
++ mpc_decoder_resort_huff_tables(15, d->Entropie_5 , Dc[5]);
++ mpc_decoder_resort_huff_tables(31, d->Entropie_6 , Dc[6]);
++ mpc_decoder_resort_huff_tables(63, d->Entropie_7 , Dc[7]);
++}
++
++void
++mpc_decoder_init_huffman_sv6_tables(mpc_decoder *d)
++{
++ // SCFI-bundle
++ d->SCFI_Bundle[7].Code= 1; d->SCFI_Bundle[7].Length= 1;
++ d->SCFI_Bundle[3].Code= 1; d->SCFI_Bundle[3].Length= 2;
++ d->SCFI_Bundle[5].Code= 0; d->SCFI_Bundle[5].Length= 3;
++ d->SCFI_Bundle[1].Code= 7; d->SCFI_Bundle[1].Length= 5;
++ d->SCFI_Bundle[2].Code= 6; d->SCFI_Bundle[2].Length= 5;
++ d->SCFI_Bundle[4].Code= 4; d->SCFI_Bundle[4].Length= 5;
++ d->SCFI_Bundle[0].Code= 11; d->SCFI_Bundle[0].Length= 6;
++ d->SCFI_Bundle[6].Code= 10; d->SCFI_Bundle[6].Length= 6;
++
++ // region A (subbands 0..10)
++ d->Region_A[ 1].Code= 1; d->Region_A[ 1].Length= 1;
++ d->Region_A[ 2].Code= 0; d->Region_A[ 2].Length= 2;
++ d->Region_A[ 0].Code= 2; d->Region_A[ 0].Length= 3;
++ d->Region_A[ 3].Code= 15; d->Region_A[ 3].Length= 5;
++ d->Region_A[ 5].Code= 13; d->Region_A[ 5].Length= 5;
++ d->Region_A[ 6].Code= 12; d->Region_A[ 6].Length= 5;
++ d->Region_A[ 4].Code= 29; d->Region_A[ 4].Length= 6;
++ d->Region_A[ 7].Code= 57; d->Region_A[ 7].Length= 7;
++ d->Region_A[ 8].Code= 113; d->Region_A[ 8].Length= 8;
++ d->Region_A[ 9].Code= 225; d->Region_A[ 9].Length= 9;
++ d->Region_A[10].Code= 449; d->Region_A[10].Length= 10;
++ d->Region_A[11].Code= 897; d->Region_A[11].Length= 11;
++ d->Region_A[12].Code= 1793; d->Region_A[12].Length= 12;
++ d->Region_A[13].Code= 3585; d->Region_A[13].Length= 13;
++ d->Region_A[14].Code= 7169; d->Region_A[14].Length= 14;
++ d->Region_A[15].Code= 7168; d->Region_A[15].Length= 14;
++
++ // region B (subbands 11..22)
++ d->Region_B[1].Code= 1; d->Region_B[1].Length= 1;
++ d->Region_B[0].Code= 1; d->Region_B[0].Length= 2;
++ d->Region_B[2].Code= 1; d->Region_B[2].Length= 3;
++ d->Region_B[3].Code= 1; d->Region_B[3].Length= 4;
++ d->Region_B[4].Code= 1; d->Region_B[4].Length= 5;
++ d->Region_B[5].Code= 1; d->Region_B[5].Length= 6;
++ d->Region_B[6].Code= 1; d->Region_B[6].Length= 7;
++ d->Region_B[7].Code= 0; d->Region_B[7].Length= 7;
++
++ // region C (subbands 23..31)
++ d->Region_C[0].Code= 1; d->Region_C[0].Length= 1;
++ d->Region_C[1].Code= 1; d->Region_C[1].Length= 2;
++ d->Region_C[2].Code= 1; d->Region_C[2].Length= 3;
++ d->Region_C[3].Code= 0; d->Region_C[3].Length= 3;
++
++ // DSCF
++ d->DSCF_Entropie[ 6].Code= 0; d->DSCF_Entropie[ 6].Length= 2;
++ d->DSCF_Entropie[ 7].Code= 7; d->DSCF_Entropie[ 7].Length= 3;
++ d->DSCF_Entropie[ 5].Code= 4; d->DSCF_Entropie[ 5].Length= 3;
++ d->DSCF_Entropie[ 8].Code= 3; d->DSCF_Entropie[ 8].Length= 3;
++ d->DSCF_Entropie[ 9].Code= 13; d->DSCF_Entropie[ 9].Length= 4;
++ d->DSCF_Entropie[ 4].Code= 11; d->DSCF_Entropie[ 4].Length= 4;
++ d->DSCF_Entropie[10].Code= 10; d->DSCF_Entropie[10].Length= 4;
++ d->DSCF_Entropie[ 2].Code= 4; d->DSCF_Entropie[ 2].Length= 4;
++ d->DSCF_Entropie[11].Code= 25; d->DSCF_Entropie[11].Length= 5;
++ d->DSCF_Entropie[ 3].Code= 24; d->DSCF_Entropie[ 3].Length= 5;
++ d->DSCF_Entropie[ 1].Code= 11; d->DSCF_Entropie[ 1].Length= 5;
++ d->DSCF_Entropie[12].Code= 21; d->DSCF_Entropie[12].Length= 6;
++ d->DSCF_Entropie[ 0].Code= 20; d->DSCF_Entropie[ 0].Length= 6;
++
++ // first quantizer
++ d->Entropie_1[1].Code= 1; d->Entropie_1[1].Length= 1;
++ d->Entropie_1[0].Code= 1; d->Entropie_1[0].Length= 2;
++ d->Entropie_1[2].Code= 0; d->Entropie_1[2].Length= 2;
++
++ // second quantizer
++ d->Entropie_2[2].Code= 3; d->Entropie_2[2].Length= 2;
++ d->Entropie_2[3].Code= 1; d->Entropie_2[3].Length= 2;
++ d->Entropie_2[1].Code= 0; d->Entropie_2[1].Length= 2;
++ d->Entropie_2[4].Code= 5; d->Entropie_2[4].Length= 3;
++ d->Entropie_2[0].Code= 4; d->Entropie_2[0].Length= 3;
++
++ // third quantizer
++ d->Entropie_3[3].Code= 3; d->Entropie_3[3].Length= 2;
++ d->Entropie_3[2].Code= 1; d->Entropie_3[2].Length= 2;
++ d->Entropie_3[4].Code= 0; d->Entropie_3[4].Length= 2;
++ d->Entropie_3[1].Code= 5; d->Entropie_3[1].Length= 3;
++ d->Entropie_3[5].Code= 9; d->Entropie_3[5].Length= 4;
++ d->Entropie_3[0].Code= 17; d->Entropie_3[0].Length= 5;
++ d->Entropie_3[6].Code= 16; d->Entropie_3[6].Length= 5;
++
++ // forth quantizer
++ d->Entropie_4[4].Code= 0; d->Entropie_4[4].Length= 2;
++ d->Entropie_4[5].Code= 6; d->Entropie_4[5].Length= 3;
++ d->Entropie_4[3].Code= 5; d->Entropie_4[3].Length= 3;
++ d->Entropie_4[6].Code= 4; d->Entropie_4[6].Length= 3;
++ d->Entropie_4[2].Code= 3; d->Entropie_4[2].Length= 3;
++ d->Entropie_4[7].Code= 15; d->Entropie_4[7].Length= 4;
++ d->Entropie_4[1].Code= 14; d->Entropie_4[1].Length= 4;
++ d->Entropie_4[0].Code= 5; d->Entropie_4[0].Length= 4;
++ d->Entropie_4[8].Code= 4; d->Entropie_4[8].Length= 4;
++
++ // fifth quantizer
++ d->Entropie_5[7 ].Code= 4; d->Entropie_5[7 ].Length= 3;
++ d->Entropie_5[8 ].Code= 3; d->Entropie_5[8 ].Length= 3;
++ d->Entropie_5[6 ].Code= 2; d->Entropie_5[6 ].Length= 3;
++ d->Entropie_5[9 ].Code= 0; d->Entropie_5[9 ].Length= 3;
++ d->Entropie_5[5 ].Code= 15; d->Entropie_5[5 ].Length= 4;
++ d->Entropie_5[4 ].Code= 13; d->Entropie_5[4 ].Length= 4;
++ d->Entropie_5[10].Code= 12; d->Entropie_5[10].Length= 4;
++ d->Entropie_5[11].Code= 10; d->Entropie_5[11].Length= 4;
++ d->Entropie_5[3 ].Code= 3; d->Entropie_5[3 ].Length= 4;
++ d->Entropie_5[12].Code= 2; d->Entropie_5[12].Length= 4;
++ d->Entropie_5[2 ].Code= 29; d->Entropie_5[2 ].Length= 5;
++ d->Entropie_5[1 ].Code= 23; d->Entropie_5[1 ].Length= 5;
++ d->Entropie_5[13].Code= 22; d->Entropie_5[13].Length= 5;
++ d->Entropie_5[0 ].Code= 57; d->Entropie_5[0 ].Length= 6;
++ d->Entropie_5[14].Code= 56; d->Entropie_5[14].Length= 6;
++
++ // sixth quantizer
++ d->Entropie_6[15].Code= 9; d->Entropie_6[15].Length= 4;
++ d->Entropie_6[16].Code= 8; d->Entropie_6[16].Length= 4;
++ d->Entropie_6[14].Code= 7; d->Entropie_6[14].Length= 4;
++ d->Entropie_6[18].Code= 6; d->Entropie_6[18].Length= 4;
++ d->Entropie_6[17].Code= 5; d->Entropie_6[17].Length= 4;
++ d->Entropie_6[12].Code= 3; d->Entropie_6[12].Length= 4;
++ d->Entropie_6[13].Code= 2; d->Entropie_6[13].Length= 4;
++ d->Entropie_6[19].Code= 0; d->Entropie_6[19].Length= 4;
++ d->Entropie_6[11].Code= 31; d->Entropie_6[11].Length= 5;
++ d->Entropie_6[20].Code= 30; d->Entropie_6[20].Length= 5;
++ d->Entropie_6[10].Code= 29; d->Entropie_6[10].Length= 5;
++ d->Entropie_6[9 ].Code= 27; d->Entropie_6[9 ].Length= 5;
++ d->Entropie_6[21].Code= 26; d->Entropie_6[21].Length= 5;
++ d->Entropie_6[22].Code= 25; d->Entropie_6[22].Length= 5;
++ d->Entropie_6[8 ].Code= 24; d->Entropie_6[8 ].Length= 5;
++ d->Entropie_6[7 ].Code= 23; d->Entropie_6[7 ].Length= 5;
++ d->Entropie_6[23].Code= 21; d->Entropie_6[23].Length= 5;
++ d->Entropie_6[6 ].Code= 9; d->Entropie_6[6 ].Length= 5;
++ d->Entropie_6[24].Code= 3; d->Entropie_6[24].Length= 5;
++ d->Entropie_6[25].Code= 57; d->Entropie_6[25].Length= 6;
++ d->Entropie_6[5 ].Code= 56; d->Entropie_6[5 ].Length= 6;
++ d->Entropie_6[4 ].Code= 45; d->Entropie_6[4 ].Length= 6;
++ d->Entropie_6[26].Code= 41; d->Entropie_6[26].Length= 6;
++ d->Entropie_6[2 ].Code= 40; d->Entropie_6[2 ].Length= 6;
++ d->Entropie_6[27].Code= 17; d->Entropie_6[27].Length= 6;
++ d->Entropie_6[28].Code= 16; d->Entropie_6[28].Length= 6;
++ d->Entropie_6[3 ].Code= 5; d->Entropie_6[3 ].Length= 6;
++ d->Entropie_6[29].Code= 89; d->Entropie_6[29].Length= 7;
++ d->Entropie_6[1 ].Code= 88; d->Entropie_6[1 ].Length= 7;
++ d->Entropie_6[30].Code= 9; d->Entropie_6[30].Length= 7;
++ d->Entropie_6[0 ].Code= 8; d->Entropie_6[0 ].Length= 7;
++
++ // seventh quantizer
++ d->Entropie_7[25].Code= 0; d->Entropie_7[25].Length= 5;
++ d->Entropie_7[37].Code= 1; d->Entropie_7[37].Length= 5;
++ d->Entropie_7[62].Code= 16; d->Entropie_7[62].Length= 8;
++ d->Entropie_7[ 0].Code= 17; d->Entropie_7[ 0].Length= 8;
++ d->Entropie_7[ 3].Code= 9; d->Entropie_7[ 3].Length= 7;
++ d->Entropie_7[ 5].Code= 10; d->Entropie_7[ 5].Length= 7;
++ d->Entropie_7[ 6].Code= 11; d->Entropie_7[ 6].Length= 7;
++ d->Entropie_7[38].Code= 3; d->Entropie_7[38].Length= 5;
++ d->Entropie_7[35].Code= 4; d->Entropie_7[35].Length= 5;
++ d->Entropie_7[33].Code= 5; d->Entropie_7[33].Length= 5;
++ d->Entropie_7[24].Code= 6; d->Entropie_7[24].Length= 5;
++ d->Entropie_7[27].Code= 7; d->Entropie_7[27].Length= 5;
++ d->Entropie_7[26].Code= 8; d->Entropie_7[26].Length= 5;
++ d->Entropie_7[12].Code= 18; d->Entropie_7[12].Length= 6;
++ d->Entropie_7[50].Code= 19; d->Entropie_7[50].Length= 6;
++ d->Entropie_7[29].Code= 10; d->Entropie_7[29].Length= 5;
++ d->Entropie_7[31].Code= 11; d->Entropie_7[31].Length= 5;
++ d->Entropie_7[36].Code= 12; d->Entropie_7[36].Length= 5;
++ d->Entropie_7[34].Code= 13; d->Entropie_7[34].Length= 5;
++ d->Entropie_7[28].Code= 14; d->Entropie_7[28].Length= 5;
++ d->Entropie_7[49].Code= 30; d->Entropie_7[49].Length= 6;
++ d->Entropie_7[56].Code= 62; d->Entropie_7[56].Length= 7;
++ d->Entropie_7[ 7].Code= 63; d->Entropie_7[ 7].Length= 7;
++ d->Entropie_7[32].Code= 16; d->Entropie_7[32].Length= 5;
++ d->Entropie_7[30].Code= 17; d->Entropie_7[30].Length= 5;
++ d->Entropie_7[13].Code= 36; d->Entropie_7[13].Length= 6;
++ d->Entropie_7[55].Code= 74; d->Entropie_7[55].Length= 7;
++ d->Entropie_7[61].Code= 150; d->Entropie_7[61].Length= 8;
++ d->Entropie_7[ 1].Code= 151; d->Entropie_7[ 1].Length= 8;
++ d->Entropie_7[14].Code= 38; d->Entropie_7[14].Length= 6;
++ d->Entropie_7[48].Code= 39; d->Entropie_7[48].Length= 6;
++ d->Entropie_7[ 4].Code= 80; d->Entropie_7[ 4].Length= 7;
++ d->Entropie_7[58].Code= 81; d->Entropie_7[58].Length= 7;
++ d->Entropie_7[47].Code= 41; d->Entropie_7[47].Length= 6;
++ d->Entropie_7[15].Code= 42; d->Entropie_7[15].Length= 6;
++ d->Entropie_7[16].Code= 43; d->Entropie_7[16].Length= 6;
++ d->Entropie_7[54].Code= 88; d->Entropie_7[54].Length= 7;
++ d->Entropie_7[ 8].Code= 89; d->Entropie_7[ 8].Length= 7;
++ d->Entropie_7[17].Code= 45; d->Entropie_7[17].Length= 6;
++ d->Entropie_7[46].Code= 46; d->Entropie_7[46].Length= 6;
++ d->Entropie_7[45].Code= 47; d->Entropie_7[45].Length= 6;
++ d->Entropie_7[53].Code= 96; d->Entropie_7[53].Length= 7;
++ d->Entropie_7[ 9].Code= 97; d->Entropie_7[ 9].Length= 7;
++ d->Entropie_7[43].Code= 49; d->Entropie_7[43].Length= 6;
++ d->Entropie_7[19].Code= 50; d->Entropie_7[19].Length= 6;
++ d->Entropie_7[18].Code= 51; d->Entropie_7[18].Length= 6;
++ d->Entropie_7[44].Code= 52; d->Entropie_7[44].Length= 6;
++ d->Entropie_7[ 2].Code= 212; d->Entropie_7[ 2].Length= 8;
++ d->Entropie_7[60].Code= 213; d->Entropie_7[60].Length= 8;
++ d->Entropie_7[10].Code= 107; d->Entropie_7[10].Length= 7;
++ d->Entropie_7[42].Code= 54; d->Entropie_7[42].Length= 6;
++ d->Entropie_7[41].Code= 55; d->Entropie_7[41].Length= 6;
++ d->Entropie_7[20].Code= 56; d->Entropie_7[20].Length= 6;
++ d->Entropie_7[21].Code= 57; d->Entropie_7[21].Length= 6;
++ d->Entropie_7[52].Code= 116; d->Entropie_7[52].Length= 7;
++ d->Entropie_7[51].Code= 117; d->Entropie_7[51].Length= 7;
++ d->Entropie_7[40].Code= 59; d->Entropie_7[40].Length= 6;
++ d->Entropie_7[22].Code= 60; d->Entropie_7[22].Length= 6;
++ d->Entropie_7[23].Code= 61; d->Entropie_7[23].Length= 6;
++ d->Entropie_7[39].Code= 62; d->Entropie_7[39].Length= 6;
++ d->Entropie_7[11].Code= 126; d->Entropie_7[11].Length= 7;
++ d->Entropie_7[57].Code= 254; d->Entropie_7[57].Length= 8;
++ d->Entropie_7[59].Code= 255; d->Entropie_7[59].Length= 8;
++}
+--- ./src/libmusepack/huffsv7.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/huffsv7.c 9 Feb 2005 19:39:29 -0000 1.1.2.1
+@@ -0,0 +1,500 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file huffsv7.c
++/// Implementations of sv7 huffman decoding functions.
++
++#include "musepack/musepack.h"
++#include "musepack/huffman.h"
++#include "musepack/requant.h"
++
++void
++mpc_decoder_init_huffman_sv7(mpc_decoder *d)
++{
++ mpc_decoder_init_huffman_sv7_tables(d);
++ mpc_decoder_resort_huff_tables(10, &(d->HuffHdr[0]) , 5);
++ mpc_decoder_resort_huff_tables( 4, &(d->HuffSCFI[0]) , 0);
++ mpc_decoder_resort_huff_tables(16, &(d->HuffDSCF[0]) , 7);
++ mpc_decoder_resort_huff_tables(27, &(d->HuffQ1[0][0]) , 0);
++ mpc_decoder_resort_huff_tables(27, &(d->HuffQ1[1][0]) , 0);
++ mpc_decoder_resort_huff_tables(25, &(d->HuffQ2[0][0]) , 0);
++ mpc_decoder_resort_huff_tables(25, &(d->HuffQ2[1][0]) , 0);
++ mpc_decoder_resort_huff_tables( 7, &(d->HuffQ3[0][0]) , Dc[3]);
++ mpc_decoder_resort_huff_tables( 7, &(d->HuffQ3[1][0]) , Dc[3]);
++ mpc_decoder_resort_huff_tables( 9, &(d->HuffQ4[0][0]) , Dc[4]);
++ mpc_decoder_resort_huff_tables( 9, &(d->HuffQ4[1][0]) , Dc[4]);
++ mpc_decoder_resort_huff_tables(15, &(d->HuffQ5[0][0]) , Dc[5]);
++ mpc_decoder_resort_huff_tables(15, &(d->HuffQ5[1][0]) , Dc[5]);
++ mpc_decoder_resort_huff_tables(31, &(d->HuffQ6[0][0]) , Dc[6]);
++ mpc_decoder_resort_huff_tables(31, &(d->HuffQ6[1][0]) , Dc[6]);
++ mpc_decoder_resort_huff_tables(63, &(d->HuffQ7[0][0]) , Dc[7]);
++ mpc_decoder_resort_huff_tables(63, &(d->HuffQ7[1][0]) , Dc[7]);
++}
++
++void
++mpc_decoder_init_huffman_sv7_tables(mpc_decoder *d)
++{
++ /***************************** SCFI *******************************/
++ d->HuffSCFI[0].Code = 2; d->HuffSCFI[0].Length = 3;
++ d->HuffSCFI[1].Code = 1; d->HuffSCFI[1].Length = 1;
++ d->HuffSCFI[2].Code = 3; d->HuffSCFI[2].Length = 3;
++ d->HuffSCFI[3].Code = 0; d->HuffSCFI[3].Length = 2;
++
++ /***************************** DSCF *******************************/
++ d->HuffDSCF[ 0].Code = 32; d->HuffDSCF[ 0].Length = 6;
++ d->HuffDSCF[ 1].Code = 4; d->HuffDSCF[ 1].Length = 5;
++ d->HuffDSCF[ 2].Code = 17; d->HuffDSCF[ 2].Length = 5;
++ d->HuffDSCF[ 3].Code = 30; d->HuffDSCF[ 3].Length = 5;
++ d->HuffDSCF[ 4].Code = 13; d->HuffDSCF[ 4].Length = 4;
++ d->HuffDSCF[ 5].Code = 0; d->HuffDSCF[ 5].Length = 3;
++ d->HuffDSCF[ 6].Code = 3; d->HuffDSCF[ 6].Length = 3;
++ d->HuffDSCF[ 7].Code = 9; d->HuffDSCF[ 7].Length = 4;
++ d->HuffDSCF[ 8].Code = 5; d->HuffDSCF[ 8].Length = 3;
++ d->HuffDSCF[ 9].Code = 2; d->HuffDSCF[ 9].Length = 3;
++ d->HuffDSCF[10].Code = 14; d->HuffDSCF[10].Length = 4;
++ d->HuffDSCF[11].Code = 3; d->HuffDSCF[11].Length = 4;
++ d->HuffDSCF[12].Code = 31; d->HuffDSCF[12].Length = 5;
++ d->HuffDSCF[13].Code = 5; d->HuffDSCF[13].Length = 5;
++ d->HuffDSCF[14].Code = 33; d->HuffDSCF[14].Length = 6;
++ d->HuffDSCF[15].Code = 12; d->HuffDSCF[15].Length = 4;
++
++ /************************* frame-header ***************************/
++ /***************** differential quantizer indizes *****************/
++ d->HuffHdr[0].Code = 92; d->HuffHdr[0].Length = 8;
++ d->HuffHdr[1].Code = 47; d->HuffHdr[1].Length = 7;
++ d->HuffHdr[2].Code = 10; d->HuffHdr[2].Length = 5;
++ d->HuffHdr[3].Code = 4; d->HuffHdr[3].Length = 4;
++ d->HuffHdr[4].Code = 0; d->HuffHdr[4].Length = 2;
++ d->HuffHdr[5].Code = 1; d->HuffHdr[5].Length = 1;
++ d->HuffHdr[6].Code = 3; d->HuffHdr[6].Length = 3;
++ d->HuffHdr[7].Code = 22; d->HuffHdr[7].Length = 6;
++ d->HuffHdr[8].Code = 187; d->HuffHdr[8].Length = 9;
++ d->HuffHdr[9].Code = 186; d->HuffHdr[9].Length = 9;
++
++ /********************** 3-step quantizer **************************/
++ /********************* 3 bundled samples **************************/
++ //less shaped, book 0
++ d->HuffQ1[0][ 0].Code = 54; d->HuffQ1[0][ 0].Length = 6;
++ d->HuffQ1[0][ 1].Code = 9; d->HuffQ1[0][ 1].Length = 5;
++ d->HuffQ1[0][ 2].Code = 32; d->HuffQ1[0][ 2].Length = 6;
++ d->HuffQ1[0][ 3].Code = 5; d->HuffQ1[0][ 3].Length = 5;
++ d->HuffQ1[0][ 4].Code = 10; d->HuffQ1[0][ 4].Length = 4;
++ d->HuffQ1[0][ 5].Code = 7; d->HuffQ1[0][ 5].Length = 5;
++ d->HuffQ1[0][ 6].Code = 52; d->HuffQ1[0][ 6].Length = 6;
++ d->HuffQ1[0][ 7].Code = 0; d->HuffQ1[0][ 7].Length = 5;
++ d->HuffQ1[0][ 8].Code = 35; d->HuffQ1[0][ 8].Length = 6;
++ d->HuffQ1[0][ 9].Code = 10; d->HuffQ1[0][ 9].Length = 5;
++ d->HuffQ1[0][10].Code = 6; d->HuffQ1[0][10].Length = 4;
++ d->HuffQ1[0][11].Code = 4; d->HuffQ1[0][11].Length = 5;
++ d->HuffQ1[0][12].Code = 11; d->HuffQ1[0][12].Length = 4;
++ d->HuffQ1[0][13].Code = 7; d->HuffQ1[0][13].Length = 3;
++ d->HuffQ1[0][14].Code = 12; d->HuffQ1[0][14].Length = 4;
++ d->HuffQ1[0][15].Code = 3; d->HuffQ1[0][15].Length = 5;
++ d->HuffQ1[0][16].Code = 7; d->HuffQ1[0][16].Length = 4;
++ d->HuffQ1[0][17].Code = 11; d->HuffQ1[0][17].Length = 5;
++ d->HuffQ1[0][18].Code = 34; d->HuffQ1[0][18].Length = 6;
++ d->HuffQ1[0][19].Code = 1; d->HuffQ1[0][19].Length = 5;
++ d->HuffQ1[0][20].Code = 53; d->HuffQ1[0][20].Length = 6;
++ d->HuffQ1[0][21].Code = 6; d->HuffQ1[0][21].Length = 5;
++ d->HuffQ1[0][22].Code = 9; d->HuffQ1[0][22].Length = 4;
++ d->HuffQ1[0][23].Code = 2; d->HuffQ1[0][23].Length = 5;
++ d->HuffQ1[0][24].Code = 33; d->HuffQ1[0][24].Length = 6;
++ d->HuffQ1[0][25].Code = 8; d->HuffQ1[0][25].Length = 5;
++ d->HuffQ1[0][26].Code = 55; d->HuffQ1[0][26].Length = 6;
++
++ //more shaped, book 1
++ d->HuffQ1[1][ 0].Code = 103; d->HuffQ1[1][ 0].Length = 8;
++ d->HuffQ1[1][ 1].Code = 62; d->HuffQ1[1][ 1].Length = 7;
++ d->HuffQ1[1][ 2].Code = 225; d->HuffQ1[1][ 2].Length = 9;
++ d->HuffQ1[1][ 3].Code = 55; d->HuffQ1[1][ 3].Length = 7;
++ d->HuffQ1[1][ 4].Code = 3; d->HuffQ1[1][ 4].Length = 4;
++ d->HuffQ1[1][ 5].Code = 52; d->HuffQ1[1][ 5].Length = 7;
++ d->HuffQ1[1][ 6].Code = 101; d->HuffQ1[1][ 6].Length = 8;
++ d->HuffQ1[1][ 7].Code = 60; d->HuffQ1[1][ 7].Length = 7;
++ d->HuffQ1[1][ 8].Code = 227; d->HuffQ1[1][ 8].Length = 9;
++ d->HuffQ1[1][ 9].Code = 24; d->HuffQ1[1][ 9].Length = 6;
++ d->HuffQ1[1][10].Code = 0; d->HuffQ1[1][10].Length = 4;
++ d->HuffQ1[1][11].Code = 61; d->HuffQ1[1][11].Length = 7;
++ d->HuffQ1[1][12].Code = 4; d->HuffQ1[1][12].Length = 4;
++ d->HuffQ1[1][13].Code = 1; d->HuffQ1[1][13].Length = 1;
++ d->HuffQ1[1][14].Code = 5; d->HuffQ1[1][14].Length = 4;
++ d->HuffQ1[1][15].Code = 63; d->HuffQ1[1][15].Length = 7;
++ d->HuffQ1[1][16].Code = 1; d->HuffQ1[1][16].Length = 4;
++ d->HuffQ1[1][17].Code = 59; d->HuffQ1[1][17].Length = 7;
++ d->HuffQ1[1][18].Code = 226; d->HuffQ1[1][18].Length = 9;
++ d->HuffQ1[1][19].Code = 57; d->HuffQ1[1][19].Length = 7;
++ d->HuffQ1[1][20].Code = 100; d->HuffQ1[1][20].Length = 8;
++ d->HuffQ1[1][21].Code = 53; d->HuffQ1[1][21].Length = 7;
++ d->HuffQ1[1][22].Code = 2; d->HuffQ1[1][22].Length = 4;
++ d->HuffQ1[1][23].Code = 54; d->HuffQ1[1][23].Length = 7;
++ d->HuffQ1[1][24].Code = 224; d->HuffQ1[1][24].Length = 9;
++ d->HuffQ1[1][25].Code = 58; d->HuffQ1[1][25].Length = 7;
++ d->HuffQ1[1][26].Code = 102; d->HuffQ1[1][26].Length = 8;
++
++ /********************** 5-step quantizer **************************/
++ /********************* 2 bundled samples **************************/
++ //less shaped, book 0
++ d->HuffQ2[0][ 0].Code = 89; d->HuffQ2[0][ 0].Length = 7;
++ d->HuffQ2[0][ 1].Code = 47; d->HuffQ2[0][ 1].Length = 6;
++ d->HuffQ2[0][ 2].Code = 15; d->HuffQ2[0][ 2].Length = 5;
++ d->HuffQ2[0][ 3].Code = 0; d->HuffQ2[0][ 3].Length = 5;
++ d->HuffQ2[0][ 4].Code = 91; d->HuffQ2[0][ 4].Length = 7;
++ d->HuffQ2[0][ 5].Code = 4; d->HuffQ2[0][ 5].Length = 5;
++ d->HuffQ2[0][ 6].Code = 6; d->HuffQ2[0][ 6].Length = 4;
++ d->HuffQ2[0][ 7].Code = 13; d->HuffQ2[0][ 7].Length = 4;
++ d->HuffQ2[0][ 8].Code = 4; d->HuffQ2[0][ 8].Length = 4;
++ d->HuffQ2[0][ 9].Code = 5; d->HuffQ2[0][ 9].Length = 5;
++ d->HuffQ2[0][10].Code = 20; d->HuffQ2[0][10].Length = 5;
++ d->HuffQ2[0][11].Code = 12; d->HuffQ2[0][11].Length = 4;
++ d->HuffQ2[0][12].Code = 4; d->HuffQ2[0][12].Length = 3;
++ d->HuffQ2[0][13].Code = 15; d->HuffQ2[0][13].Length = 4;
++ d->HuffQ2[0][14].Code = 14; d->HuffQ2[0][14].Length = 5;
++ d->HuffQ2[0][15].Code = 3; d->HuffQ2[0][15].Length = 5;
++ d->HuffQ2[0][16].Code = 3; d->HuffQ2[0][16].Length = 4;
++ d->HuffQ2[0][17].Code = 14; d->HuffQ2[0][17].Length = 4;
++ d->HuffQ2[0][18].Code = 5; d->HuffQ2[0][18].Length = 4;
++ d->HuffQ2[0][19].Code = 1; d->HuffQ2[0][19].Length = 5;
++ d->HuffQ2[0][20].Code = 90; d->HuffQ2[0][20].Length = 7;
++ d->HuffQ2[0][21].Code = 2; d->HuffQ2[0][21].Length = 5;
++ d->HuffQ2[0][22].Code = 21; d->HuffQ2[0][22].Length = 5;
++ d->HuffQ2[0][23].Code = 46; d->HuffQ2[0][23].Length = 6;
++ d->HuffQ2[0][24].Code = 88; d->HuffQ2[0][24].Length = 7;
++
++ //more shaped, book 1
++ d->HuffQ2[1][ 0].Code = 921; d->HuffQ2[1][ 0].Length = 10;
++ d->HuffQ2[1][ 1].Code = 113; d->HuffQ2[1][ 1].Length = 7;
++ d->HuffQ2[1][ 2].Code = 51; d->HuffQ2[1][ 2].Length = 6;
++ d->HuffQ2[1][ 3].Code = 231; d->HuffQ2[1][ 3].Length = 8;
++ d->HuffQ2[1][ 4].Code = 922; d->HuffQ2[1][ 4].Length = 10;
++ d->HuffQ2[1][ 5].Code = 104; d->HuffQ2[1][ 5].Length = 7;
++ d->HuffQ2[1][ 6].Code = 30; d->HuffQ2[1][ 6].Length = 5;
++ d->HuffQ2[1][ 7].Code = 0; d->HuffQ2[1][ 7].Length = 3;
++ d->HuffQ2[1][ 8].Code = 29; d->HuffQ2[1][ 8].Length = 5;
++ d->HuffQ2[1][ 9].Code = 105; d->HuffQ2[1][ 9].Length = 7;
++ d->HuffQ2[1][10].Code = 50; d->HuffQ2[1][10].Length = 6;
++ d->HuffQ2[1][11].Code = 1; d->HuffQ2[1][11].Length = 3;
++ d->HuffQ2[1][12].Code = 2; d->HuffQ2[1][12].Length = 2;
++ d->HuffQ2[1][13].Code = 3; d->HuffQ2[1][13].Length = 3;
++ d->HuffQ2[1][14].Code = 49; d->HuffQ2[1][14].Length = 6;
++ d->HuffQ2[1][15].Code = 107; d->HuffQ2[1][15].Length = 7;
++ d->HuffQ2[1][16].Code = 27; d->HuffQ2[1][16].Length = 5;
++ d->HuffQ2[1][17].Code = 2; d->HuffQ2[1][17].Length = 3;
++ d->HuffQ2[1][18].Code = 31; d->HuffQ2[1][18].Length = 5;
++ d->HuffQ2[1][19].Code = 112; d->HuffQ2[1][19].Length = 7;
++ d->HuffQ2[1][20].Code = 920; d->HuffQ2[1][20].Length = 10;
++ d->HuffQ2[1][21].Code = 106; d->HuffQ2[1][21].Length = 7;
++ d->HuffQ2[1][22].Code = 48; d->HuffQ2[1][22].Length = 6;
++ d->HuffQ2[1][23].Code = 114; d->HuffQ2[1][23].Length = 7;
++ d->HuffQ2[1][24].Code = 923; d->HuffQ2[1][24].Length = 10;
++
++ /********************** 7-step quantizer **************************/
++ /*********************** single samples ***************************/
++ //less shaped, book 0
++ d->HuffQ3[0][0].Code = 12; d->HuffQ3[0][0].Length = 4;
++ d->HuffQ3[0][1].Code = 4; d->HuffQ3[0][1].Length = 3;
++ d->HuffQ3[0][2].Code = 0; d->HuffQ3[0][2].Length = 2;
++ d->HuffQ3[0][3].Code = 1; d->HuffQ3[0][3].Length = 2;
++ d->HuffQ3[0][4].Code = 7; d->HuffQ3[0][4].Length = 3;
++ d->HuffQ3[0][5].Code = 5; d->HuffQ3[0][5].Length = 3;
++ d->HuffQ3[0][6].Code = 13; d->HuffQ3[0][6].Length = 4;
++
++ //more shaped, book 1
++ d->HuffQ3[1][0].Code = 4; d->HuffQ3[1][0].Length = 5;
++ d->HuffQ3[1][1].Code = 3; d->HuffQ3[1][1].Length = 4;
++ d->HuffQ3[1][2].Code = 2; d->HuffQ3[1][2].Length = 2;
++ d->HuffQ3[1][3].Code = 3; d->HuffQ3[1][3].Length = 2;
++ d->HuffQ3[1][4].Code = 1; d->HuffQ3[1][4].Length = 2;
++ d->HuffQ3[1][5].Code = 0; d->HuffQ3[1][5].Length = 3;
++ d->HuffQ3[1][6].Code = 5; d->HuffQ3[1][6].Length = 5;
++
++ /********************** 9-step quantizer **************************/
++ /*********************** single samples ***************************/
++ //less shaped, book 0
++ d->HuffQ4[0][0].Code = 5; d->HuffQ4[0][0].Length = 4;
++ d->HuffQ4[0][1].Code = 0; d->HuffQ4[0][1].Length = 3;
++ d->HuffQ4[0][2].Code = 4; d->HuffQ4[0][2].Length = 3;
++ d->HuffQ4[0][3].Code = 6; d->HuffQ4[0][3].Length = 3;
++ d->HuffQ4[0][4].Code = 7; d->HuffQ4[0][4].Length = 3;
++ d->HuffQ4[0][5].Code = 5; d->HuffQ4[0][5].Length = 3;
++ d->HuffQ4[0][6].Code = 3; d->HuffQ4[0][6].Length = 3;
++ d->HuffQ4[0][7].Code = 1; d->HuffQ4[0][7].Length = 3;
++ d->HuffQ4[0][8].Code = 4; d->HuffQ4[0][8].Length = 4;
++
++ //more shaped, book 1
++ d->HuffQ4[1][0].Code = 9; d->HuffQ4[1][0].Length = 5;
++ d->HuffQ4[1][1].Code = 12; d->HuffQ4[1][1].Length = 4;
++ d->HuffQ4[1][2].Code = 3; d->HuffQ4[1][2].Length = 3;
++ d->HuffQ4[1][3].Code = 0; d->HuffQ4[1][3].Length = 2;
++ d->HuffQ4[1][4].Code = 2; d->HuffQ4[1][4].Length = 2;
++ d->HuffQ4[1][5].Code = 7; d->HuffQ4[1][5].Length = 3;
++ d->HuffQ4[1][6].Code = 13; d->HuffQ4[1][6].Length = 4;
++ d->HuffQ4[1][7].Code = 5; d->HuffQ4[1][7].Length = 4;
++ d->HuffQ4[1][8].Code = 8; d->HuffQ4[1][8].Length = 5;
++
++ /********************* 15-step quantizer **************************/
++ /*********************** single samples ***************************/
++ //less shaped, book 0
++ d->HuffQ5[0][ 0].Code = 57; d->HuffQ5[0][ 0].Length = 6;
++ d->HuffQ5[0][ 1].Code = 23; d->HuffQ5[0][ 1].Length = 5;
++ d->HuffQ5[0][ 2].Code = 8; d->HuffQ5[0][ 2].Length = 4;
++ d->HuffQ5[0][ 3].Code = 10; d->HuffQ5[0][ 3].Length = 4;
++ d->HuffQ5[0][ 4].Code = 13; d->HuffQ5[0][ 4].Length = 4;
++ d->HuffQ5[0][ 5].Code = 0; d->HuffQ5[0][ 5].Length = 3;
++ d->HuffQ5[0][ 6].Code = 2; d->HuffQ5[0][ 6].Length = 3;
++ d->HuffQ5[0][ 7].Code = 3; d->HuffQ5[0][ 7].Length = 3;
++ d->HuffQ5[0][ 8].Code = 1; d->HuffQ5[0][ 8].Length = 3;
++ d->HuffQ5[0][ 9].Code = 15; d->HuffQ5[0][ 9].Length = 4;
++ d->HuffQ5[0][10].Code = 12; d->HuffQ5[0][10].Length = 4;
++ d->HuffQ5[0][11].Code = 9; d->HuffQ5[0][11].Length = 4;
++ d->HuffQ5[0][12].Code = 29; d->HuffQ5[0][12].Length = 5;
++ d->HuffQ5[0][13].Code = 22; d->HuffQ5[0][13].Length = 5;
++ d->HuffQ5[0][14].Code = 56; d->HuffQ5[0][14].Length = 6;
++
++ //more shaped, book 1
++ d->HuffQ5[1][ 0].Code = 229; d->HuffQ5[1][ 0].Length = 8;
++ d->HuffQ5[1][ 1].Code = 56; d->HuffQ5[1][ 1].Length = 6;
++ d->HuffQ5[1][ 2].Code = 7; d->HuffQ5[1][ 2].Length = 5;
++ d->HuffQ5[1][ 3].Code = 2; d->HuffQ5[1][ 3].Length = 4;
++ d->HuffQ5[1][ 4].Code = 0; d->HuffQ5[1][ 4].Length = 3;
++ d->HuffQ5[1][ 5].Code = 3; d->HuffQ5[1][ 5].Length = 3;
++ d->HuffQ5[1][ 6].Code = 5; d->HuffQ5[1][ 6].Length = 3;
++ d->HuffQ5[1][ 7].Code = 6; d->HuffQ5[1][ 7].Length = 3;
++ d->HuffQ5[1][ 8].Code = 4; d->HuffQ5[1][ 8].Length = 3;
++ d->HuffQ5[1][ 9].Code = 2; d->HuffQ5[1][ 9].Length = 3;
++ d->HuffQ5[1][10].Code = 15; d->HuffQ5[1][10].Length = 4;
++ d->HuffQ5[1][11].Code = 29; d->HuffQ5[1][11].Length = 5;
++ d->HuffQ5[1][12].Code = 6; d->HuffQ5[1][12].Length = 5;
++ d->HuffQ5[1][13].Code = 115; d->HuffQ5[1][13].Length = 7;
++ d->HuffQ5[1][14].Code = 228; d->HuffQ5[1][14].Length = 8;
++
++ /********************* 31-step quantizer **************************/
++ /*********************** single samples ***************************/
++ //less shaped, book 0
++ d->HuffQ6[0][ 0].Code = 65; d->HuffQ6[0][ 0].Length = 7;
++ d->HuffQ6[0][ 1].Code = 6; d->HuffQ6[0][ 1].Length = 6;
++ d->HuffQ6[0][ 2].Code = 44; d->HuffQ6[0][ 2].Length = 6;
++ d->HuffQ6[0][ 3].Code = 45; d->HuffQ6[0][ 3].Length = 6;
++ d->HuffQ6[0][ 4].Code = 59; d->HuffQ6[0][ 4].Length = 6;
++ d->HuffQ6[0][ 5].Code = 13; d->HuffQ6[0][ 5].Length = 5;
++ d->HuffQ6[0][ 6].Code = 17; d->HuffQ6[0][ 6].Length = 5;
++ d->HuffQ6[0][ 7].Code = 19; d->HuffQ6[0][ 7].Length = 5;
++ d->HuffQ6[0][ 8].Code = 23; d->HuffQ6[0][ 8].Length = 5;
++ d->HuffQ6[0][ 9].Code = 21; d->HuffQ6[0][ 9].Length = 5;
++ d->HuffQ6[0][10].Code = 26; d->HuffQ6[0][10].Length = 5;
++ d->HuffQ6[0][11].Code = 30; d->HuffQ6[0][11].Length = 5;
++ d->HuffQ6[0][12].Code = 0; d->HuffQ6[0][12].Length = 4;
++ d->HuffQ6[0][13].Code = 2; d->HuffQ6[0][13].Length = 4;
++ d->HuffQ6[0][14].Code = 5; d->HuffQ6[0][14].Length = 4;
++ d->HuffQ6[0][15].Code = 7; d->HuffQ6[0][15].Length = 4;
++ d->HuffQ6[0][16].Code = 3; d->HuffQ6[0][16].Length = 4;
++ d->HuffQ6[0][17].Code = 4; d->HuffQ6[0][17].Length = 4;
++ d->HuffQ6[0][18].Code = 31; d->HuffQ6[0][18].Length = 5;
++ d->HuffQ6[0][19].Code = 28; d->HuffQ6[0][19].Length = 5;
++ d->HuffQ6[0][20].Code = 25; d->HuffQ6[0][20].Length = 5;
++ d->HuffQ6[0][21].Code = 27; d->HuffQ6[0][21].Length = 5;
++ d->HuffQ6[0][22].Code = 24; d->HuffQ6[0][22].Length = 5;
++ d->HuffQ6[0][23].Code = 20; d->HuffQ6[0][23].Length = 5;
++ d->HuffQ6[0][24].Code = 18; d->HuffQ6[0][24].Length = 5;
++ d->HuffQ6[0][25].Code = 12; d->HuffQ6[0][25].Length = 5;
++ d->HuffQ6[0][26].Code = 2; d->HuffQ6[0][26].Length = 5;
++ d->HuffQ6[0][27].Code = 58; d->HuffQ6[0][27].Length = 6;
++ d->HuffQ6[0][28].Code = 33; d->HuffQ6[0][28].Length = 6;
++ d->HuffQ6[0][29].Code = 7; d->HuffQ6[0][29].Length = 6;
++ d->HuffQ6[0][30].Code = 64; d->HuffQ6[0][30].Length = 7;
++
++ //more shaped, book 1
++ d->HuffQ6[1][ 0].Code = 6472; d->HuffQ6[1][ 0].Length = 13;
++ d->HuffQ6[1][ 1].Code = 6474; d->HuffQ6[1][ 1].Length = 13;
++ d->HuffQ6[1][ 2].Code = 808; d->HuffQ6[1][ 2].Length = 10;
++ d->HuffQ6[1][ 3].Code = 405; d->HuffQ6[1][ 3].Length = 9;
++ d->HuffQ6[1][ 4].Code = 203; d->HuffQ6[1][ 4].Length = 8;
++ d->HuffQ6[1][ 5].Code = 102; d->HuffQ6[1][ 5].Length = 7;
++ d->HuffQ6[1][ 6].Code = 49; d->HuffQ6[1][ 6].Length = 6;
++ d->HuffQ6[1][ 7].Code = 9; d->HuffQ6[1][ 7].Length = 5;
++ d->HuffQ6[1][ 8].Code = 15; d->HuffQ6[1][ 8].Length = 5;
++ d->HuffQ6[1][ 9].Code = 31; d->HuffQ6[1][ 9].Length = 5;
++ d->HuffQ6[1][10].Code = 2; d->HuffQ6[1][10].Length = 4;
++ d->HuffQ6[1][11].Code = 6; d->HuffQ6[1][11].Length = 4;
++ d->HuffQ6[1][12].Code = 8; d->HuffQ6[1][12].Length = 4;
++ d->HuffQ6[1][13].Code = 11; d->HuffQ6[1][13].Length = 4;
++ d->HuffQ6[1][14].Code = 13; d->HuffQ6[1][14].Length = 4;
++ d->HuffQ6[1][15].Code = 0; d->HuffQ6[1][15].Length = 3;
++ d->HuffQ6[1][16].Code = 14; d->HuffQ6[1][16].Length = 4;
++ d->HuffQ6[1][17].Code = 10; d->HuffQ6[1][17].Length = 4;
++ d->HuffQ6[1][18].Code = 9; d->HuffQ6[1][18].Length = 4;
++ d->HuffQ6[1][19].Code = 5; d->HuffQ6[1][19].Length = 4;
++ d->HuffQ6[1][20].Code = 3; d->HuffQ6[1][20].Length = 4;
++ d->HuffQ6[1][21].Code = 30; d->HuffQ6[1][21].Length = 5;
++ d->HuffQ6[1][22].Code = 14; d->HuffQ6[1][22].Length = 5;
++ d->HuffQ6[1][23].Code = 8; d->HuffQ6[1][23].Length = 5;
++ d->HuffQ6[1][24].Code = 48; d->HuffQ6[1][24].Length = 6;
++ d->HuffQ6[1][25].Code = 103; d->HuffQ6[1][25].Length = 7;
++ d->HuffQ6[1][26].Code = 201; d->HuffQ6[1][26].Length = 8;
++ d->HuffQ6[1][27].Code = 200; d->HuffQ6[1][27].Length = 8;
++ d->HuffQ6[1][28].Code = 1619; d->HuffQ6[1][28].Length = 11;
++ d->HuffQ6[1][29].Code = 6473; d->HuffQ6[1][29].Length = 13;
++ d->HuffQ6[1][30].Code = 6475; d->HuffQ6[1][30].Length = 13;
++
++ /********************* 63-step quantizer **************************/
++ /*********************** single samples ***************************/
++ //less shaped, book 0
++ d->HuffQ7[0][ 0].Code = 103; d->HuffQ7[0][ 0].Length = 8; /* 0.003338 - 01100111 */
++ d->HuffQ7[0][ 1].Code = 153; d->HuffQ7[0][ 1].Length = 8; /* 0.003766 - 10011001 */
++ d->HuffQ7[0][ 2].Code = 181; d->HuffQ7[0][ 2].Length = 8; /* 0.004715 - 10110101 */
++ d->HuffQ7[0][ 3].Code = 233; d->HuffQ7[0][ 3].Length = 8; /* 0.005528 - 11101001 */
++ d->HuffQ7[0][ 4].Code = 64; d->HuffQ7[0][ 4].Length = 7; /* 0.006677 - 1000000 */
++ d->HuffQ7[0][ 5].Code = 65; d->HuffQ7[0][ 5].Length = 7; /* 0.007041 - 1000001 */
++ d->HuffQ7[0][ 6].Code = 77; d->HuffQ7[0][ 6].Length = 7; /* 0.007733 - 1001101 */
++ d->HuffQ7[0][ 7].Code = 81; d->HuffQ7[0][ 7].Length = 7; /* 0.008296 - 1010001 */
++ d->HuffQ7[0][ 8].Code = 91; d->HuffQ7[0][ 8].Length = 7; /* 0.009295 - 1011011 */
++ d->HuffQ7[0][ 9].Code = 113; d->HuffQ7[0][ 9].Length = 7; /* 0.010814 - 1110001 */
++ d->HuffQ7[0][10].Code = 112; d->HuffQ7[0][10].Length = 7; /* 0.010807 - 1110000 */
++ d->HuffQ7[0][11].Code = 24; d->HuffQ7[0][11].Length = 6; /* 0.012748 - 011000 */
++ d->HuffQ7[0][12].Code = 29; d->HuffQ7[0][12].Length = 6; /* 0.013390 - 011101 */
++ d->HuffQ7[0][13].Code = 35; d->HuffQ7[0][13].Length = 6; /* 0.014224 - 100011 */
++ d->HuffQ7[0][14].Code = 37; d->HuffQ7[0][14].Length = 6; /* 0.015201 - 100101 */
++ d->HuffQ7[0][15].Code = 41; d->HuffQ7[0][15].Length = 6; /* 0.016642 - 101001 */
++ d->HuffQ7[0][16].Code = 44; d->HuffQ7[0][16].Length = 6; /* 0.017292 - 101100 */
++ d->HuffQ7[0][17].Code = 46; d->HuffQ7[0][17].Length = 6; /* 0.018647 - 101110 */
++ d->HuffQ7[0][18].Code = 51; d->HuffQ7[0][18].Length = 6; /* 0.020473 - 110011 */
++ d->HuffQ7[0][19].Code = 49; d->HuffQ7[0][19].Length = 6; /* 0.020152 - 110001 */
++ d->HuffQ7[0][20].Code = 54; d->HuffQ7[0][20].Length = 6; /* 0.021315 - 110110 */
++ d->HuffQ7[0][21].Code = 55; d->HuffQ7[0][21].Length = 6; /* 0.021358 - 110111 */
++ d->HuffQ7[0][22].Code = 57; d->HuffQ7[0][22].Length = 6; /* 0.021700 - 111001 */
++ d->HuffQ7[0][23].Code = 60; d->HuffQ7[0][23].Length = 6; /* 0.022449 - 111100 */
++ d->HuffQ7[0][24].Code = 0; d->HuffQ7[0][24].Length = 5; /* 0.023063 - 00000 */
++ d->HuffQ7[0][25].Code = 2; d->HuffQ7[0][25].Length = 5; /* 0.023854 - 00010 */
++ d->HuffQ7[0][26].Code = 10; d->HuffQ7[0][26].Length = 5; /* 0.025481 - 01010 */
++ d->HuffQ7[0][27].Code = 5; d->HuffQ7[0][27].Length = 5; /* 0.024867 - 00101 */
++ d->HuffQ7[0][28].Code = 9; d->HuffQ7[0][28].Length = 5; /* 0.025352 - 01001 */
++ d->HuffQ7[0][29].Code = 6; d->HuffQ7[0][29].Length = 5; /* 0.025074 - 00110 */
++ d->HuffQ7[0][30].Code = 13; d->HuffQ7[0][30].Length = 5; /* 0.025745 - 01101 */
++ d->HuffQ7[0][31].Code = 7; d->HuffQ7[0][31].Length = 5; /* 0.025195 - 00111 */
++ d->HuffQ7[0][32].Code = 11; d->HuffQ7[0][32].Length = 5; /* 0.025502 - 01011 */
++ d->HuffQ7[0][33].Code = 15; d->HuffQ7[0][33].Length = 5; /* 0.026251 - 01111 */
++ d->HuffQ7[0][34].Code = 8; d->HuffQ7[0][34].Length = 5; /* 0.025260 - 01000 */
++ d->HuffQ7[0][35].Code = 4; d->HuffQ7[0][35].Length = 5; /* 0.024418 - 00100 */
++ d->HuffQ7[0][36].Code = 3; d->HuffQ7[0][36].Length = 5; /* 0.023983 - 00011 */
++ d->HuffQ7[0][37].Code = 1; d->HuffQ7[0][37].Length = 5; /* 0.023697 - 00001 */
++ d->HuffQ7[0][38].Code = 63; d->HuffQ7[0][38].Length = 6; /* 0.023041 - 111111 */
++ d->HuffQ7[0][39].Code = 62; d->HuffQ7[0][39].Length = 6; /* 0.022656 - 111110 */
++ d->HuffQ7[0][40].Code = 61; d->HuffQ7[0][40].Length = 6; /* 0.022549 - 111101 */
++ d->HuffQ7[0][41].Code = 53; d->HuffQ7[0][41].Length = 6; /* 0.021151 - 110101 */
++ d->HuffQ7[0][42].Code = 59; d->HuffQ7[0][42].Length = 6; /* 0.022042 - 111011 */
++ d->HuffQ7[0][43].Code = 52; d->HuffQ7[0][43].Length = 6; /* 0.020837 - 110100 */
++ d->HuffQ7[0][44].Code = 48; d->HuffQ7[0][44].Length = 6; /* 0.019446 - 110000 */
++ d->HuffQ7[0][45].Code = 47; d->HuffQ7[0][45].Length = 6; /* 0.019189 - 101111 */
++ d->HuffQ7[0][46].Code = 43; d->HuffQ7[0][46].Length = 6; /* 0.017177 - 101011 */
++ d->HuffQ7[0][47].Code = 42; d->HuffQ7[0][47].Length = 6; /* 0.017035 - 101010 */
++ d->HuffQ7[0][48].Code = 39; d->HuffQ7[0][48].Length = 6; /* 0.015287 - 100111 */
++ d->HuffQ7[0][49].Code = 36; d->HuffQ7[0][49].Length = 6; /* 0.014559 - 100100 */
++ d->HuffQ7[0][50].Code = 33; d->HuffQ7[0][50].Length = 6; /* 0.014117 - 100001 */
++ d->HuffQ7[0][51].Code = 28; d->HuffQ7[0][51].Length = 6; /* 0.012776 - 011100 */
++ d->HuffQ7[0][52].Code = 117; d->HuffQ7[0][52].Length = 7; /* 0.011107 - 1110101 */
++ d->HuffQ7[0][53].Code = 101; d->HuffQ7[0][53].Length = 7; /* 0.010636 - 1100101 */
++ d->HuffQ7[0][54].Code = 100; d->HuffQ7[0][54].Length = 7; /* 0.009751 - 1100100 */
++ d->HuffQ7[0][55].Code = 80; d->HuffQ7[0][55].Length = 7; /* 0.008132 - 1010000 */
++ d->HuffQ7[0][56].Code = 69; d->HuffQ7[0][56].Length = 7; /* 0.007091 - 1000101 */
++ d->HuffQ7[0][57].Code = 68; d->HuffQ7[0][57].Length = 7; /* 0.007084 - 1000100 */
++ d->HuffQ7[0][58].Code = 50; d->HuffQ7[0][58].Length = 7; /* 0.006277 - 0110010 */
++ d->HuffQ7[0][59].Code = 232; d->HuffQ7[0][59].Length = 8; /* 0.005386 - 11101000 */
++ d->HuffQ7[0][60].Code = 180; d->HuffQ7[0][60].Length = 8; /* 0.004408 - 10110100 */
++ d->HuffQ7[0][61].Code = 152; d->HuffQ7[0][61].Length = 8; /* 0.003759 - 10011000 */
++ d->HuffQ7[0][62].Code = 102; d->HuffQ7[0][62].Length = 8; /* 0.003160 - 01100110 */
++
++ //more shaped, book 1
++ d->HuffQ7[1][ 0].Code = 14244; d->HuffQ7[1][ 0].Length = 14; /* 0.000059 - 11011110100100 */
++ d->HuffQ7[1][ 1].Code = 14253; d->HuffQ7[1][ 1].Length = 14; /* 0.000098 - 11011110101101 */
++ d->HuffQ7[1][ 2].Code = 14246; d->HuffQ7[1][ 2].Length = 14; /* 0.000078 - 11011110100110 */
++ d->HuffQ7[1][ 3].Code = 14254; d->HuffQ7[1][ 3].Length = 14; /* 0.000111 - 11011110101110 */
++ d->HuffQ7[1][ 4].Code = 3562; d->HuffQ7[1][ 4].Length = 12; /* 0.000320 - 110111101010 */
++ d->HuffQ7[1][ 5].Code = 752; d->HuffQ7[1][ 5].Length = 10; /* 0.000920 - 1011110000 */
++ d->HuffQ7[1][ 6].Code = 753; d->HuffQ7[1][ 6].Length = 10; /* 0.001057 - 1011110001 */
++ d->HuffQ7[1][ 7].Code = 160; d->HuffQ7[1][ 7].Length = 9; /* 0.001403 - 010100000 */
++ d->HuffQ7[1][ 8].Code = 162; d->HuffQ7[1][ 8].Length = 9; /* 0.001579 - 010100010 */
++ d->HuffQ7[1][ 9].Code = 444; d->HuffQ7[1][ 9].Length = 9; /* 0.002486 - 110111100 */
++ d->HuffQ7[1][10].Code = 122; d->HuffQ7[1][10].Length = 8; /* 0.003772 - 01111010 */
++ d->HuffQ7[1][11].Code = 223; d->HuffQ7[1][11].Length = 8; /* 0.005710 - 11011111 */
++ d->HuffQ7[1][12].Code = 60; d->HuffQ7[1][12].Length = 7; /* 0.006858 - 0111100 */
++ d->HuffQ7[1][13].Code = 73; d->HuffQ7[1][13].Length = 7; /* 0.008033 - 1001001 */
++ d->HuffQ7[1][14].Code = 110; d->HuffQ7[1][14].Length = 7; /* 0.009827 - 1101110 */
++ d->HuffQ7[1][15].Code = 14; d->HuffQ7[1][15].Length = 6; /* 0.012601 - 001110 */
++ d->HuffQ7[1][16].Code = 24; d->HuffQ7[1][16].Length = 6; /* 0.013194 - 011000 */
++ d->HuffQ7[1][17].Code = 25; d->HuffQ7[1][17].Length = 6; /* 0.013938 - 011001 */
++ d->HuffQ7[1][18].Code = 34; d->HuffQ7[1][18].Length = 6; /* 0.015693 - 100010 */
++ d->HuffQ7[1][19].Code = 37; d->HuffQ7[1][19].Length = 6; /* 0.017846 - 100101 */
++ d->HuffQ7[1][20].Code = 54; d->HuffQ7[1][20].Length = 6; /* 0.020078 - 110110 */
++ d->HuffQ7[1][21].Code = 3; d->HuffQ7[1][21].Length = 5; /* 0.022975 - 00011 */
++ d->HuffQ7[1][22].Code = 9; d->HuffQ7[1][22].Length = 5; /* 0.025631 - 01001 */
++ d->HuffQ7[1][23].Code = 11; d->HuffQ7[1][23].Length = 5; /* 0.027021 - 01011 */
++ d->HuffQ7[1][24].Code = 16; d->HuffQ7[1][24].Length = 5; /* 0.031465 - 10000 */
++ d->HuffQ7[1][25].Code = 19; d->HuffQ7[1][25].Length = 5; /* 0.034244 - 10011 */
++ d->HuffQ7[1][26].Code = 21; d->HuffQ7[1][26].Length = 5; /* 0.035921 - 10101 */
++ d->HuffQ7[1][27].Code = 24; d->HuffQ7[1][27].Length = 5; /* 0.037938 - 11000 */
++ d->HuffQ7[1][28].Code = 26; d->HuffQ7[1][28].Length = 5; /* 0.039595 - 11010 */
++ d->HuffQ7[1][29].Code = 29; d->HuffQ7[1][29].Length = 5; /* 0.041546 - 11101 */
++ d->HuffQ7[1][30].Code = 31; d->HuffQ7[1][30].Length = 5; /* 0.042623 - 11111 */
++ d->HuffQ7[1][31].Code = 2; d->HuffQ7[1][31].Length = 4; /* 0.045180 - 0010 */
++ d->HuffQ7[1][32].Code = 0; d->HuffQ7[1][32].Length = 4; /* 0.043151 - 0000 */
++ d->HuffQ7[1][33].Code = 30; d->HuffQ7[1][33].Length = 5; /* 0.042538 - 11110 */
++ d->HuffQ7[1][34].Code = 28; d->HuffQ7[1][34].Length = 5; /* 0.041422 - 11100 */
++ d->HuffQ7[1][35].Code = 25; d->HuffQ7[1][35].Length = 5; /* 0.039145 - 11001 */
++ d->HuffQ7[1][36].Code = 22; d->HuffQ7[1][36].Length = 5; /* 0.036691 - 10110 */
++ d->HuffQ7[1][37].Code = 20; d->HuffQ7[1][37].Length = 5; /* 0.034955 - 10100 */
++ d->HuffQ7[1][38].Code = 14; d->HuffQ7[1][38].Length = 5; /* 0.029155 - 01110 */
++ d->HuffQ7[1][39].Code = 13; d->HuffQ7[1][39].Length = 5; /* 0.027921 - 01101 */
++ d->HuffQ7[1][40].Code = 8; d->HuffQ7[1][40].Length = 5; /* 0.025553 - 01000 */
++ d->HuffQ7[1][41].Code = 6; d->HuffQ7[1][41].Length = 5; /* 0.023093 - 00110 */
++ d->HuffQ7[1][42].Code = 2; d->HuffQ7[1][42].Length = 5; /* 0.021200 - 00010 */
++ d->HuffQ7[1][43].Code = 46; d->HuffQ7[1][43].Length = 6; /* 0.018134 - 101110 */
++ d->HuffQ7[1][44].Code = 35; d->HuffQ7[1][44].Length = 6; /* 0.015824 - 100011 */
++ d->HuffQ7[1][45].Code = 31; d->HuffQ7[1][45].Length = 6; /* 0.014701 - 011111 */
++ d->HuffQ7[1][46].Code = 21; d->HuffQ7[1][46].Length = 6; /* 0.013187 - 010101 */
++ d->HuffQ7[1][47].Code = 15; d->HuffQ7[1][47].Length = 6; /* 0.012776 - 001111 */
++ d->HuffQ7[1][48].Code = 95; d->HuffQ7[1][48].Length = 7; /* 0.009664 - 1011111 */
++ d->HuffQ7[1][49].Code = 72; d->HuffQ7[1][49].Length = 7; /* 0.007922 - 1001000 */
++ d->HuffQ7[1][50].Code = 41; d->HuffQ7[1][50].Length = 7; /* 0.006838 - 0101001 */
++ d->HuffQ7[1][51].Code = 189; d->HuffQ7[1][51].Length = 8; /* 0.005024 - 10111101 */
++ d->HuffQ7[1][52].Code = 123; d->HuffQ7[1][52].Length = 8; /* 0.003830 - 01111011 */
++ d->HuffQ7[1][53].Code = 377; d->HuffQ7[1][53].Length = 9; /* 0.002232 - 101111001 */
++ d->HuffQ7[1][54].Code = 161; d->HuffQ7[1][54].Length = 9; /* 0.001566 - 010100001 */
++ d->HuffQ7[1][55].Code = 891; d->HuffQ7[1][55].Length = 10; /* 0.001383 - 1101111011 */
++ d->HuffQ7[1][56].Code = 327; d->HuffQ7[1][56].Length = 10; /* 0.000900 - 0101000111 */
++ d->HuffQ7[1][57].Code = 326; d->HuffQ7[1][57].Length = 10; /* 0.000790 - 0101000110 */
++ d->HuffQ7[1][58].Code = 3560; d->HuffQ7[1][58].Length = 12; /* 0.000254 - 110111101000 */
++ d->HuffQ7[1][59].Code = 14255; d->HuffQ7[1][59].Length = 14; /* 0.000117 - 11011110101111 */
++ d->HuffQ7[1][60].Code = 14247; d->HuffQ7[1][60].Length = 14; /* 0.000085 - 11011110100111 */
++ d->HuffQ7[1][61].Code = 14252; d->HuffQ7[1][61].Length = 14; /* 0.000085 - 11011110101100 */
++ d->HuffQ7[1][62].Code = 14245; d->HuffQ7[1][62].Length = 14; /* 0.000065 - 11011110100101 */
++}
+--- ./src/libmusepack/idtag.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/idtag.c 9 Feb 2005 19:39:29 -0000 1.1.2.1
+@@ -0,0 +1,83 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file idtag.c
++/// Rudimentary id3tag handling routines, just enough to skip id3v2 tags,
++/// if present.
++
++#include "musepack/musepack.h"
++#include "musepack/internal.h"
++
++mpc_int32_t
++JumpID3v2 (mpc_reader* r) {
++ unsigned char tmp [10];
++ mpc_uint32_t Unsynchronisation; // ID3v2.4-flag
++ mpc_uint32_t ExtHeaderPresent; // ID3v2.4-flag
++ mpc_uint32_t ExperimentalFlag; // ID3v2.4-flag
++ mpc_uint32_t FooterPresent; // ID3v2.4-flag
++ mpc_int32_t ret;
++
++ // seek to first byte of mpc data
++ if (!r->seek (r->data, 0)) {
++ return 0;
++ }
++
++ r->read(r->data, tmp, sizeof(tmp));
++
++ // check id3-tag
++ if ( 0 != memcmp ( tmp, "ID3", 3) )
++ return 0;
++
++ // read flags
++ Unsynchronisation = tmp[5] & 0x80;
++ ExtHeaderPresent = tmp[5] & 0x40;
++ ExperimentalFlag = tmp[5] & 0x20;
++ FooterPresent = tmp[5] & 0x10;
++
++ if ( tmp[5] & 0x0F )
++ return -1; // not (yet???) allowed
++ if ( (tmp[6] | tmp[7] | tmp[8] | tmp[9]) & 0x80 )
++ return -1; // not allowed
++
++ // read HeaderSize (syncsave: 4 * $0xxxxxxx = 28 significant bits)
++ ret = tmp[6] << 21;
++ ret += tmp[7] << 14;
++ ret += tmp[8] << 7;
++ ret += tmp[9] ;
++ ret += 10;
++ if ( FooterPresent )
++ ret += 10;
++
++ return ret;
++}
+--- ./src/libmusepack/mpc_decoder.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/mpc_decoder.c 9 Feb 2005 19:39:30 -0000 1.3.2.1
+@@ -0,0 +1,1349 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file mpc_decoder.c
++/// Core decoding routines and logic.
++
++#include "musepack/musepack.h"
++#include "musepack/internal.h"
++#include "musepack/requant.h"
++#include "musepack/huffman.h"
++
++//------------------------------------------------------------------------------
++// types
++//------------------------------------------------------------------------------
++enum
++ {
++ EQ_TAP = 13, // length of FIR filter for EQ
++ DELAY = ((EQ_TAP + 1) / 2), // delay of FIR
++ FIR_BANDS = 4, // number of subbands to be FIR filtered
++ MEMSIZE = MPC_DECODER_MEMSIZE, // overall buffer size
++ MEMSIZE2 = (MEMSIZE/2), // size of one buffer
++ MEMMASK = (MEMSIZE-1)
++ };
++
++//------------------------------------------------------------------------------
++// forward declarations
++//------------------------------------------------------------------------------
++void mpc_decoder_init_huffman_sv6(mpc_decoder *d);
++void mpc_decoder_init_huffman_sv7(mpc_decoder *d);
++void mpc_decoder_read_bitstream_sv6(mpc_decoder *d);
++void mpc_decoder_read_bitstream_sv7(mpc_decoder *d);
++void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING);
++mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
++void mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band);
++
++//------------------------------------------------------------------------------
++// utility functions
++//------------------------------------------------------------------------------
++static mpc_int32_t f_read(mpc_decoder *d, void *ptr, size_t size)
++{
++ return d->r->read(d->r->data, ptr, size);
++};
++
++static mpc_bool_t f_seek(mpc_decoder *d, mpc_int32_t offset)
++{
++ return d->r->seek(d->r->data, offset);
++};
++
++static mpc_int32_t f_read_dword(mpc_decoder *d, mpc_uint32_t * ptr, mpc_uint32_t count)
++{
++ count = f_read(d, ptr, count << 2) >> 2;
++#ifndef MPC_LITTLE_ENDIAN
++ mpc_uint32_t n;
++ for(n = 0; n< count; n++) {
++ ptr[n] = swap32(ptr[n]);
++ }
++#endif
++ return count;
++}
++
++//------------------------------------------------------------------------------
++// huffman & bitstream functions
++//------------------------------------------------------------------------------
++static const mpc_uint32_t mask [33] = {
++ 0x00000000, 0x00000001, 0x00000003, 0x00000007,
++ 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F,
++ 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF,
++ 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF,
++ 0x0000FFFF, 0x0001FFFF, 0x0003FFFF, 0x0007FFFF,
++ 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF,
++ 0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF,
++ 0x0FFFFFFF, 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF,
++ 0xFFFFFFFF
++};
++
++/* F U N C T I O N S */
++
++// resets bitstream decoding
++static void
++mpc_decoder_reset_bitstream_decode(mpc_decoder *d)
++{
++ d->dword = 0;
++ d->pos = 0;
++ d->Zaehler = 0;
++ d->WordsRead = 0;
++}
++
++// reports the number of read bits
++static mpc_uint32_t
++mpc_decoder_bits_read(mpc_decoder *d)
++{
++ return 32 * d->WordsRead + d->pos;
++}
++
++// read desired number of bits out of the bitstream
++static mpc_uint32_t
++mpc_decoder_bitstream_read(mpc_decoder *d, const mpc_uint32_t bits)
++{
++ mpc_uint32_t out = d->dword;
++
++ d->pos += bits;
++
++ if (d->pos < 32) {
++ out >>= (32 - d->pos);
++ }
++ else {
++ d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK];
++ d->pos -= 32;
++ if (d->pos) {
++ out <<= d->pos;
++ out |= d->dword >> (32 - d->pos);
++ }
++ ++(d->WordsRead);
++ }
++
++ return out & mask[bits];
++}
++
++// decode SCFI-bundle (sv4,5,6)
++static void
++mpc_decoder_scfi_bundle_read(
++ mpc_decoder *d,
++ HuffmanTyp* Table, mpc_int32_t* SCFI, mpc_int32_t* DSCF)
++{
++ // load preview and decode
++ mpc_uint32_t code = d->dword << d->pos;
++ if (d->pos > 26) {
++ code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos);
++ }
++ while (code < Table->Code) {
++ Table++;
++ }
++
++ // set the new position within bitstream without performing a dummy-read
++ if ((d->pos += Table->Length) >= 32) {
++ d->pos -= 32;
++ d->dword = d->Speicher[d->Zaehler = (d->Zaehler+1) & MEMMASK];
++ ++(d->WordsRead);
++ }
++
++ *SCFI = Table->Value >> 1;
++ *DSCF = Table->Value & 1;
++}
++
++static int
++mpc_decoder_huffman_typ_cmpfn(const void* p1, const void* p2)
++{
++ if (((HuffmanTyp*) p1)->Code < ((HuffmanTyp*) p2)->Code ) return +1;
++ if (((HuffmanTyp*) p1)->Code > ((HuffmanTyp*) p2)->Code ) return -1;
++ return 0;
++}
++
++// sort huffman-tables by codeword
++// offset resulting value
++void
++mpc_decoder_resort_huff_tables(
++ const mpc_uint32_t elements, HuffmanTyp* Table, const mpc_int32_t offset )
++{
++ mpc_uint32_t i;
++
++ for ( i = 0; i < elements; i++ ) {
++ Table[i].Code <<= 32 - Table[i].Length;
++ Table[i].Value = i - offset;
++ }
++ qsort(Table, elements, sizeof(*Table), mpc_decoder_huffman_typ_cmpfn);
++}
++
++// basic huffman decoding routine
++// works with maximum lengths up to 14
++static mpc_int32_t
++mpc_decoder_huffman_decode(mpc_decoder *d, const HuffmanTyp *Table)
++{
++ // load preview and decode
++ mpc_uint32_t code = d->dword << d->pos;
++ if (d->pos > 18) {
++ code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos);
++ }
++ while (code < Table->Code) {
++ Table++;
++ }
++
++ // set the new position within bitstream without performing a dummy-read
++ if ((d->pos += Table->Length) >= 32) {
++ d->pos -= 32;
++ d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK];
++ ++(d->WordsRead);
++ }
++
++ return Table->Value;
++}
++
++// faster huffman through previewing less bits
++// works with maximum lengths up to 10
++static mpc_int32_t
++mpc_decoder_huffman_decode_fast(mpc_decoder *d, const HuffmanTyp* Table)
++{
++ // load preview and decode
++ mpc_uint32_t code = d->dword << d->pos;
++ if (d->pos > 22) {
++ code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos);
++ }
++ while (code < Table->Code) {
++ Table++;
++ }
++
++ // set the new position within bitstream without performing a dummy-read
++ if ((d->pos += Table->Length) >= 32) {
++ d->pos -= 32;
++ d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK];
++ ++(d->WordsRead);
++ }
++
++ return Table->Value;
++}
++
++// even faster huffman through previewing even less bits
++// works with maximum lengths up to 5
++static mpc_int32_t
++mpc_decoder_huffman_decode_faster(mpc_decoder *d, const HuffmanTyp* Table)
++{
++ // load preview and decode
++ mpc_uint32_t code = d->dword << d->pos;
++ if (d->pos > 27) {
++ code |= d->Speicher[(d->Zaehler + 1) & MEMMASK] >> (32 - d->pos);
++ }
++ while (code < Table->Code) {
++ Table++;
++ }
++
++ // set the new position within bitstream without performing a dummy-read
++ if ((d->pos += Table->Length) >= 32) {
++ d->pos -= 32;
++ d->dword = d->Speicher[d->Zaehler = (d->Zaehler + 1) & MEMMASK];
++ ++(d->WordsRead);
++ }
++
++ return Table->Value;
++}
++
++static void
++mpc_decoder_reset_v(mpc_decoder *d)
++{
++ memset(d->V_L, 0, sizeof d->V_L);
++ memset(d->V_R, 0, sizeof d->V_R);
++}
++
++static void
++mpc_decoder_reset_synthesis(mpc_decoder *d)
++{
++ mpc_decoder_reset_v(d);
++}
++
++static void
++mpc_decoder_reset_y(mpc_decoder *d)
++{
++ memset(d->Y_L, 0, sizeof d->Y_L);
++ memset(d->Y_R, 0, sizeof d->Y_R);
++}
++
++static void
++mpc_decoder_reset_globals(mpc_decoder *d)
++{
++ mpc_decoder_reset_bitstream_decode(d);
++
++ d->DecodedFrames = 0;
++ d->StreamVersion = 0;
++ d->MS_used = 0;
++
++ memset(d->Y_L , 0, sizeof d->Y_L );
++ memset(d->Y_R , 0, sizeof d->Y_R );
++ memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L );
++ memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R );
++ memset(d->Res_L , 0, sizeof d->Res_L );
++ memset(d->Res_R , 0, sizeof d->Res_R );
++ memset(d->SCFI_L , 0, sizeof d->SCFI_L );
++ memset(d->SCFI_R , 0, sizeof d->SCFI_R );
++ memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L );
++ memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R );
++ memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L );
++ memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R );
++ memset(d->Q , 0, sizeof d->Q );
++ memset(d->MS_Flag , 0, sizeof d->MS_Flag );
++}
++
++static mpc_uint32_t
++mpc_decoder_decode_internal(mpc_decoder *d, MPC_SAMPLE_FORMAT *buffer)
++{
++ mpc_uint32_t output_frame_length = MPC_FRAME_LENGTH;
++
++ mpc_uint32_t FrameBitCnt = 0;
++
++ if (d->DecodedFrames >= d->OverallFrames) {
++ return (mpc_uint32_t)(-1); // end of file -> abort decoding
++ }
++
++ // read jump-info for validity check of frame
++ d->FwdJumpInfo = mpc_decoder_bitstream_read(d, 20);
++
++ d->ActDecodePos = (d->Zaehler << 5) + d->pos;
++
++ // decode data and check for validity of frame
++ FrameBitCnt = mpc_decoder_bits_read(d);
++ switch (d->StreamVersion) {
++ case 0x04:
++ case 0x05:
++ case 0x06:
++ mpc_decoder_read_bitstream_sv6(d);
++ break;
++ case 0x07:
++ case 0x17:
++ mpc_decoder_read_bitstream_sv7(d);
++ break;
++ default:
++ return (mpc_uint32_t)(-1);
++ }
++ d->FrameWasValid = mpc_decoder_bits_read(d) - FrameBitCnt == d->FwdJumpInfo;
++
++ // synthesize signal
++ mpc_decoder_requantisierung(d, d->Max_Band);
++
++ //if ( d->EQ_activated && PluginSettings.EQbyMPC )
++ // perform_EQ ();
++
++ mpc_decoder_synthese_filter_float(d, buffer);
++
++ d->DecodedFrames++;
++
++ // cut off first MPC_DECODER_SYNTH_DELAY zero-samples
++ if (d->DecodedFrames == d->OverallFrames && d->StreamVersion >= 6) {
++ // reconstruct exact filelength
++ mpc_int32_t mod_block = mpc_decoder_bitstream_read(d, 11);
++ mpc_int32_t FilterDecay;
++
++ if (mod_block == 0) {
++ // Encoder bugfix
++ mod_block = 1152;
++ }
++ FilterDecay = (mod_block + MPC_DECODER_SYNTH_DELAY) % MPC_FRAME_LENGTH;
++
++ // additional FilterDecay samples are needed for decay of synthesis filter
++ if (MPC_DECODER_SYNTH_DELAY + mod_block >= MPC_FRAME_LENGTH) {
++
++ // **********************************************************************
++ // Rhoades 4/16/2002
++ // Commented out are blocks of code which cause gapless playback to fail.
++ // Temporary fix...
++ // **********************************************************************
++
++ if (!d->TrueGaplessPresent) {
++ mpc_decoder_reset_y(d);
++ }
++ else {
++ //if ( MPC_FRAME_LENGTH != d->LastValidSamples ) {
++ mpc_decoder_bitstream_read(d, 20);
++ mpc_decoder_read_bitstream_sv7(d);
++ mpc_decoder_requantisierung(d, d->Max_Band);
++ //FilterDecay = d->LastValidSamples;
++ //}
++ //else {
++ //FilterDecay = 0;
++ //}
++ }
++
++ mpc_decoder_synthese_filter_float(d, buffer + 2304);
++
++ output_frame_length = MPC_FRAME_LENGTH + FilterDecay;
++ }
++ else { // there are only FilterDecay samples needed for this frame
++ output_frame_length = FilterDecay;
++ }
++ }
++
++ if (d->samples_to_skip) {
++ if (output_frame_length < d->samples_to_skip) {
++ d->samples_to_skip -= output_frame_length;
++ output_frame_length = 0;
++ }
++ else {
++ output_frame_length -= d->samples_to_skip;
++ memmove(
++ buffer,
++ buffer + d->samples_to_skip * 2,
++ output_frame_length * 2 * sizeof (MPC_SAMPLE_FORMAT));
++ d->samples_to_skip = 0;
++ }
++ }
++
++ return output_frame_length;
++}
++
++mpc_uint32_t mpc_decoder_decode(
++ mpc_decoder *d,
++ MPC_SAMPLE_FORMAT *buffer,
++ mpc_uint32_t *vbr_update_acc,
++ mpc_uint32_t *vbr_update_bits)
++{
++ for(;;)
++ {
++ //const mpc_int32_t MaxBrokenFrames = 0; // PluginSettings.MaxBrokenFrames
++
++ mpc_uint32_t RING = d->Zaehler;
++ mpc_int32_t vbr_ring = (RING << 5) + d->pos;
++
++ mpc_uint32_t valid_samples = mpc_decoder_decode_internal(d, buffer);
++
++ if (valid_samples == (mpc_uint32_t)(-1) ) {
++ return 0;
++ }
++
++ /**************** ERROR CONCEALMENT *****************/
++ if (d->FrameWasValid == 0 ) {
++ // error occurred in bitstream
++ return (mpc_uint32_t)(-1);
++ }
++ else {
++ if (vbr_update_acc && vbr_update_bits) {
++ (*vbr_update_acc) ++;
++ vbr_ring = (d->Zaehler << 5) + d->pos - vbr_ring;
++ if (vbr_ring < 0) {
++ vbr_ring += 524288;
++ }
++ (*vbr_update_bits) += vbr_ring;
++ }
++
++ }
++ mpc_decoder_update_buffer(d, RING);
++
++ if (valid_samples > 0) {
++ return valid_samples;
++ }
++ }
++}
++
++void
++mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band)
++{
++ mpc_int32_t Band;
++ mpc_int32_t n;
++ MPC_SAMPLE_FORMAT facL;
++ MPC_SAMPLE_FORMAT facR;
++ MPC_SAMPLE_FORMAT templ;
++ MPC_SAMPLE_FORMAT tempr;
++ MPC_SAMPLE_FORMAT* YL;
++ MPC_SAMPLE_FORMAT* YR;
++ mpc_int32_t* L;
++ mpc_int32_t* R;
++
++#ifdef MPC_FIXED_POINT
++#if MPC_FIXED_POINT_FRACTPART == 14
++#define MPC_MULTIPLY_SCF(CcVal, SCF_idx) \
++ MPC_MULTIPLY_EX(CcVal, d->SCF[SCF_idx], d->SCF_shift[SCF_idx])
++#else
++
++#error FIXME, Cc table is in 18.14 format
++
++#endif
++#else
++#define MPC_MULTIPLY_SCF(CcVal, SCF_idx) \
++ MPC_MULTIPLY(CcVal, d->SCF[SCF_idx])
++#endif
++ // requantization and scaling of subband-samples
++ for ( Band = 0; Band <= Last_Band; Band++ ) { // setting pointers
++ YL = d->Y_L[0] + Band;
++ YR = d->Y_R[0] + Band;
++ L = d->Q[Band].L;
++ R = d->Q[Band].R;
++ /************************** MS-coded **************************/
++ if ( d->MS_Flag [Band] ) {
++ if ( d->Res_L [Band] ) {
++ if ( d->Res_R [Band] ) { // M!=0, S!=0
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][0]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][0]);
++ for ( n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YL = (templ = MPC_MULTIPLY_FLOAT_INT(facL,*L++))+(tempr = MPC_MULTIPLY_FLOAT_INT(facR,*R++));
++ *YR = templ - tempr;
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][1]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][1]);
++ for ( ; n < 24; n++, YL += 32, YR += 32 ) {
++ *YL = (templ = MPC_MULTIPLY_FLOAT_INT(facL,*L++))+(tempr = MPC_MULTIPLY_FLOAT_INT(facR,*R++));
++ *YR = templ - tempr;
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][2]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][2]);
++ for ( ; n < 36; n++, YL += 32, YR += 32 ) {
++ *YL = (templ = MPC_MULTIPLY_FLOAT_INT(facL,*L++))+(tempr = MPC_MULTIPLY_FLOAT_INT(facR,*R++));
++ *YR = templ - tempr;
++ }
++ } else { // M!=0, S==0
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][0]);
++ for ( n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YR = *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][1]);
++ for ( ; n < 24; n++, YL += 32, YR += 32 ) {
++ *YR = *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][2]);
++ for ( ; n < 36; n++, YL += 32, YR += 32 ) {
++ *YR = *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ }
++ }
++ } else {
++ if (d->Res_R[Band]) // M==0, S!=0
++ {
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][0]);
++ for ( n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YR = - (*YL = MPC_MULTIPLY_FLOAT_INT(facR,*(R++)));
++ }
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][1]);
++ for ( ; n < 24; n++, YL += 32, YR += 32 ) {
++ *YR = - (*YL = MPC_MULTIPLY_FLOAT_INT(facR,*(R++)));
++ }
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][2]);
++ for ( ; n < 36; n++, YL += 32, YR += 32 ) {
++ *YR = - (*YL = MPC_MULTIPLY_FLOAT_INT(facR,*(R++)));
++ }
++ } else { // M==0, S==0
++ for ( n = 0; n < 36; n++, YL += 32, YR += 32 ) {
++ *YR = *YL = 0;
++ }
++ }
++ }
++ }
++ /************************** LR-coded **************************/
++ else {
++ if ( d->Res_L [Band] ) {
++ if ( d->Res_R [Band] ) { // L!=0, R!=0
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][0]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][0]);
++ for (n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][1]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][1]);
++ for (; n < 24; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][2]);
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][2]);
++ for (; n < 36; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ } else { // L!=0, R==0
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][0]);
++ for ( n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = 0;
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][1]);
++ for ( ; n < 24; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = 0;
++ }
++ facL = MPC_MULTIPLY_SCF( Cc[d->Res_L[Band]] , (unsigned char)d->SCF_Index_L[Band][2]);
++ for ( ; n < 36; n++, YL += 32, YR += 32 ) {
++ *YL = MPC_MULTIPLY_FLOAT_INT(facL,*L++);
++ *YR = 0;
++ }
++ }
++ }
++ else {
++ if ( d->Res_R [Band] ) { // L==0, R!=0
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][0]);
++ for ( n = 0; n < 12; n++, YL += 32, YR += 32 ) {
++ *YL = 0;
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][1]);
++ for ( ; n < 24; n++, YL += 32, YR += 32 ) {
++ *YL = 0;
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ facR = MPC_MULTIPLY_SCF( Cc[d->Res_R[Band]] , (unsigned char)d->SCF_Index_R[Band][2]);
++ for ( ; n < 36; n++, YL += 32, YR += 32 ) {
++ *YL = 0;
++ *YR = MPC_MULTIPLY_FLOAT_INT(facR,*R++);
++ }
++ } else { // L==0, R==0
++ for ( n = 0; n < 36; n++, YL += 32, YR += 32 ) {
++ *YR = *YL = 0;
++ }
++ }
++ }
++ }
++ }
++}
++
++/****************************************** SV 6 ******************************************/
++void
++mpc_decoder_read_bitstream_sv6(mpc_decoder *d)
++{
++ mpc_int32_t n,k;
++ mpc_int32_t Max_used_Band=0;
++ HuffmanTyp *Table;
++ const HuffmanTyp *x1;
++ const HuffmanTyp *x2;
++ mpc_int32_t *L;
++ mpc_int32_t *R;
++ mpc_int32_t *ResL = d->Res_L;
++ mpc_int32_t *ResR = d->Res_R;
++
++ /************************ HEADER **************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ for (n=0; n <= d->Max_Band; ++n, ++ResL, ++ResR)
++ {
++ if (n<11) Table = d->Region_A;
++ else if (n>=11 && n<=22) Table = d->Region_B;
++ else /*if (n>=23)*/ Table = d->Region_C;
++
++ *ResL = d->Q_res[n][mpc_decoder_huffman_decode(d, Table)];
++ if (d->MS_used) {
++ d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1);
++ }
++ *ResR = d->Q_res[n][mpc_decoder_huffman_decode(d, Table)];
++
++ // only perform the following procedure up to the maximum non-zero subband
++ if (*ResL || *ResR) Max_used_Band = n;
++ }
++
++ /************************* SCFI-Bundle *****************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ for (n=0; n<=Max_used_Band; ++n, ++ResL, ++ResR) {
++ if (*ResL) mpc_decoder_scfi_bundle_read(d, d->SCFI_Bundle, &(d->SCFI_L[n]), &(d->DSCF_Flag_L[n]));
++ if (*ResR) mpc_decoder_scfi_bundle_read(d, d->SCFI_Bundle, &(d->SCFI_R[n]), &(d->DSCF_Flag_R[n]));
++ }
++
++ /***************************** SCFI ********************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ L = d->SCF_Index_L[0];
++ R = d->SCF_Index_R[0];
++ for (n=0; n <= Max_used_Band; ++n, ++ResL, ++ResR, L+=3, R+=3)
++ {
++ if (*ResL)
++ {
++ /*********** DSCF ************/
++ if (d->DSCF_Flag_L[n]==1)
++ {
++ L[2] = d->DSCF_Reference_L[n];
++ switch (d->SCFI_L[n])
++ {
++ case 3:
++ L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[1] = L[0];
++ L[2] = L[1];
++ break;
++ case 1:
++ L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[1] = L[0] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[2] = L[1];
++ break;
++ case 2:
++ L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[1] = L[0];
++ L[2] = L[1] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ break;
++ case 0:
++ L[0] = L[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[1] = L[0] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ L[2] = L[1] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ break;
++ default:
++ return;
++ break;
++ }
++ }
++ /************ SCF ************/
++ else
++ {
++ switch (d->SCFI_L[n])
++ {
++ case 3:
++ L[0] = mpc_decoder_bitstream_read(d, 6);
++ L[1] = L[0];
++ L[2] = L[1];
++ break;
++ case 1:
++ L[0] = mpc_decoder_bitstream_read(d, 6);
++ L[1] = mpc_decoder_bitstream_read(d, 6);
++ L[2] = L[1];
++ break;
++ case 2:
++ L[0] = mpc_decoder_bitstream_read(d, 6);
++ L[1] = L[0];
++ L[2] = mpc_decoder_bitstream_read(d, 6);
++ break;
++ case 0:
++ L[0] = mpc_decoder_bitstream_read(d, 6);
++ L[1] = mpc_decoder_bitstream_read(d, 6);
++ L[2] = mpc_decoder_bitstream_read(d, 6);
++ break;
++ default:
++ return;
++ break;
++ }
++ }
++ // update Reference for DSCF
++ d->DSCF_Reference_L[n] = L[2];
++ }
++ if (*ResR)
++ {
++ R[2] = d->DSCF_Reference_R[n];
++ /*********** DSCF ************/
++ if (d->DSCF_Flag_R[n]==1)
++ {
++ switch (d->SCFI_R[n])
++ {
++ case 3:
++ R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[1] = R[0];
++ R[2] = R[1];
++ break;
++ case 1:
++ R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[1] = R[0] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[2] = R[1];
++ break;
++ case 2:
++ R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[1] = R[0];
++ R[2] = R[1] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ break;
++ case 0:
++ R[0] = R[2] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[1] = R[0] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ R[2] = R[1] + mpc_decoder_huffman_decode_fast(d, d->DSCF_Entropie);
++ break;
++ default:
++ return;
++ break;
++ }
++ }
++ /************ SCF ************/
++ else
++ {
++ switch (d->SCFI_R[n])
++ {
++ case 3:
++ R[0] = mpc_decoder_bitstream_read(d, 6);
++ R[1] = R[0];
++ R[2] = R[1];
++ break;
++ case 1:
++ R[0] = mpc_decoder_bitstream_read(d, 6);
++ R[1] = mpc_decoder_bitstream_read(d, 6);
++ R[2] = R[1];
++ break;
++ case 2:
++ R[0] = mpc_decoder_bitstream_read(d, 6);
++ R[1] = R[0];
++ R[2] = mpc_decoder_bitstream_read(d, 6);
++ break;
++ case 0:
++ R[0] = mpc_decoder_bitstream_read(d, 6);
++ R[1] = mpc_decoder_bitstream_read(d, 6);
++ R[2] = mpc_decoder_bitstream_read(d, 6);
++ break;
++ default:
++ return;
++ break;
++ }
++ }
++ // update Reference for DSCF
++ d->DSCF_Reference_R[n] = R[2];
++ }
++ }
++
++ /**************************** Samples ****************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ for (n=0; n <= Max_used_Band; ++n, ++ResL, ++ResR)
++ {
++ // setting pointers
++ x1 = d->SampleHuff[*ResL];
++ x2 = d->SampleHuff[*ResR];
++ L = d->Q[n].L;
++ R = d->Q[n].R;
++
++ if (x1!=NULL || x2!=NULL)
++ for (k=0; k<36; ++k)
++ {
++ if (x1 != NULL) *L++ = mpc_decoder_huffman_decode_fast(d, x1);
++ if (x2 != NULL) *R++ = mpc_decoder_huffman_decode_fast(d, x2);
++ }
++
++ if (*ResL>7 || *ResR>7)
++ for (k=0; k<36; ++k)
++ {
++ if (*ResL>7) *L++ = (mpc_int32_t)mpc_decoder_bitstream_read(d, Res_bit[*ResL]) - Dc[*ResL];
++ if (*ResR>7) *R++ = (mpc_int32_t)mpc_decoder_bitstream_read(d, Res_bit[*ResR]) - Dc[*ResR];
++ }
++ }
++}
++
++/****************************************** SV 7 ******************************************/
++void
++mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
++{
++ // these arrays hold decoding results for bundled quantizers (3- and 5-step)
++ /*static*/ mpc_int32_t idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
++ /*static*/ mpc_int32_t idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
++ /*static*/ mpc_int32_t idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
++ /*static*/ mpc_int32_t idx50[] = { -2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2,-2,-1, 0, 1, 2};
++ /*static*/ mpc_int32_t idx51[] = { -2,-2,-2,-2,-2,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2};
++
++ mpc_int32_t n,k;
++ mpc_int32_t Max_used_Band=0;
++ const HuffmanTyp *Table;
++ mpc_int32_t idx;
++ mpc_int32_t *L ,*R;
++ mpc_int32_t *ResL,*ResR;
++ mpc_uint32_t tmp;
++
++ /***************************** Header *****************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++
++ // first subband
++ *ResL = mpc_decoder_bitstream_read(d, 4);
++ *ResR = mpc_decoder_bitstream_read(d, 4);
++ if (d->MS_used && !(*ResL==0 && *ResR==0)) {
++ d->MS_Flag[0] = mpc_decoder_bitstream_read(d, 1);
++ }
++
++ // consecutive subbands
++ ++ResL; ++ResR; // increase pointers
++ for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR)
++ {
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
++ *ResL = (idx!=4) ? *(ResL-1) + idx : mpc_decoder_bitstream_read(d, 4);
++
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
++ *ResR = (idx!=4) ? *(ResR-1) + idx : mpc_decoder_bitstream_read(d, 4);
++
++ if (d->MS_used && !(*ResL==0 && *ResR==0)) {
++ d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1);
++ }
++
++ // only perform following procedures up to the maximum non-zero subband
++ if (*ResL!=0 || *ResR!=0) {
++ Max_used_Band = n;
++ }
++ }
++ /****************************** SCFI ******************************/
++ L = d->SCFI_L;
++ R = d->SCFI_R;
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ for (n=0; n <= Max_used_Band; ++n, ++L, ++R, ++ResL, ++ResR) {
++ if (*ResL) *L = mpc_decoder_huffman_decode_faster(d, d->HuffSCFI);
++ if (*ResR) *R = mpc_decoder_huffman_decode_faster(d, d->HuffSCFI);
++ }
++
++ /**************************** SCF/DSCF ****************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ L = d->SCF_Index_L[0];
++ R = d->SCF_Index_R[0];
++ for (n=0; n<=Max_used_Band; ++n, ++ResL, ++ResR, L+=3, R+=3) {
++ if (*ResL)
++ {
++ L[2] = d->DSCF_Reference_L[n];
++ switch (d->SCFI_L[n])
++ {
++ case 1:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6);
++ L[2] = L[1];
++ break;
++ case 3:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ L[1] = L[0];
++ L[2] = L[1];
++ break;
++ case 2:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ L[1] = L[0];
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6);
++ break;
++ case 0:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6);
++ break;
++ default:
++ return;
++ break;
++ }
++ // update Reference for DSCF
++ d->DSCF_Reference_L[n] = L[2];
++ }
++ if (*ResR)
++ {
++ R[2] = d->DSCF_Reference_R[n];
++ switch (d->SCFI_R[n])
++ {
++ case 1:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6);
++ R[2] = R[1];
++ break;
++ case 3:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ R[1] = R[0];
++ R[2] = R[1];
++ break;
++ case 2:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ R[1] = R[0];
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6);
++ break;
++ case 0:
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6);
++ idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
++ R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6);
++ break;
++ default:
++ return;
++ break;
++ }
++ // update Reference for DSCF
++ d->DSCF_Reference_R[n] = R[2];
++ }
++ }
++ /***************************** Samples ****************************/
++ ResL = d->Res_L;
++ ResR = d->Res_R;
++ L = d->Q[0].L;
++ R = d->Q[0].R;
++ for (n=0; n <= Max_used_Band; ++n, ++ResL, ++ResR, L+=36, R+=36)
++ {
++ /************** links **************/
++ switch (*ResL)
++ {
++ case -2: case -3: case -4: case -5: case -6: case -7: case -8: case -9:
++ case -10: case -11: case -12: case -13: case -14: case -15: case -16: case -17:
++ L += 36;
++ break;
++ case -1:
++ for (k=0; k<36; k++ ) {
++ tmp = random_int(d);
++ *L++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >> 8) & 0xFF) + ((tmp >> 0) & 0xFF) - 510;
++ }
++ break;
++ case 0:
++ L += 36;// increase pointer
++ break;
++ case 1:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][1];
++ for (k=0; k<12; ++k)
++ {
++ idx = mpc_decoder_huffman_decode_fast(d, Table);
++ *L++ = idx30[idx];
++ *L++ = idx31[idx];
++ *L++ = idx32[idx];
++ }
++ break;
++ case 2:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][2];
++ for (k=0; k<18; ++k)
++ {
++ idx = mpc_decoder_huffman_decode_fast(d, Table);
++ *L++ = idx50[idx];
++ *L++ = idx51[idx];
++ }
++ break;
++ case 3:
++ case 4:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL];
++ for (k=0; k<36; ++k)
++ *L++ = mpc_decoder_huffman_decode_faster(d, Table);
++ break;
++ case 5:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL];
++ for (k=0; k<36; ++k)
++ *L++ = mpc_decoder_huffman_decode_fast(d, Table);
++ break;
++ case 6:
++ case 7:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResL];
++ for (k=0; k<36; ++k)
++ *L++ = mpc_decoder_huffman_decode(d, Table);
++ break;
++ case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17:
++ tmp = Dc[*ResL];
++ for (k=0; k<36; ++k)
++ *L++ = (mpc_int32_t)mpc_decoder_bitstream_read(d, Res_bit[*ResL]) - tmp;
++ break;
++ default:
++ return;
++ }
++ /************** rechts **************/
++ switch (*ResR)
++ {
++ case -2: case -3: case -4: case -5: case -6: case -7: case -8: case -9:
++ case -10: case -11: case -12: case -13: case -14: case -15: case -16: case -17:
++ R += 36;
++ break;
++ case -1:
++ for (k=0; k<36; k++ ) {
++ tmp = random_int(d);
++ *R++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >> 8) & 0xFF) + ((tmp >> 0) & 0xFF) - 510;
++ }
++ break;
++ case 0:
++ R += 36;// increase pointer
++ break;
++ case 1:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][1];
++ for (k=0; k<12; ++k)
++ {
++ idx = mpc_decoder_huffman_decode_fast(d, Table);
++ *R++ = idx30[idx];
++ *R++ = idx31[idx];
++ *R++ = idx32[idx];
++ }
++ break;
++ case 2:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][2];
++ for (k=0; k<18; ++k)
++ {
++ idx = mpc_decoder_huffman_decode_fast(d, Table);
++ *R++ = idx50[idx];
++ *R++ = idx51[idx];
++ }
++ break;
++ case 3:
++ case 4:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR];
++ for (k=0; k<36; ++k)
++ *R++ = mpc_decoder_huffman_decode_faster(d, Table);
++ break;
++ case 5:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR];
++ for (k=0; k<36; ++k)
++ *R++ = mpc_decoder_huffman_decode_fast(d, Table);
++ break;
++ case 6:
++ case 7:
++ Table = d->HuffQ[mpc_decoder_bitstream_read(d, 1)][*ResR];
++ for (k=0; k<36; ++k)
++ *R++ = mpc_decoder_huffman_decode(d, Table);
++ break;
++ case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17:
++ tmp = Dc[*ResR];
++ for (k=0; k<36; ++k)
++ *R++ = (mpc_int32_t)mpc_decoder_bitstream_read(d, Res_bit[*ResR]) - tmp;
++ break;
++ default:
++ return;
++ }
++ }
++}
++
++void mpc_decoder_setup(mpc_decoder *d, mpc_reader *r)
++{
++ d->r = r;
++
++ d->HuffQ[0][0] = 0;
++ d->HuffQ[1][0] = 0;
++ d->HuffQ[0][1] = d->HuffQ1[0];
++ d->HuffQ[1][1] = d->HuffQ1[1];
++ d->HuffQ[0][2] = d->HuffQ2[0];
++ d->HuffQ[1][2] = d->HuffQ2[1];
++ d->HuffQ[0][3] = d->HuffQ3[0];
++ d->HuffQ[1][3] = d->HuffQ3[1];
++ d->HuffQ[0][4] = d->HuffQ4[0];
++ d->HuffQ[1][4] = d->HuffQ4[1];
++ d->HuffQ[0][5] = d->HuffQ5[0];
++ d->HuffQ[1][5] = d->HuffQ5[1];
++ d->HuffQ[0][6] = d->HuffQ6[0];
++ d->HuffQ[1][6] = d->HuffQ6[1];
++ d->HuffQ[0][7] = d->HuffQ7[0];
++ d->HuffQ[1][7] = d->HuffQ7[1];
++
++ d->SampleHuff[0] = NULL;
++ d->SampleHuff[1] = d->Entropie_1;
++ d->SampleHuff[2] = d->Entropie_2;
++ d->SampleHuff[3] = d->Entropie_3;
++ d->SampleHuff[4] = d->Entropie_4;
++ d->SampleHuff[5] = d->Entropie_5;
++ d->SampleHuff[6] = d->Entropie_6;
++ d->SampleHuff[7] = d->Entropie_7;
++ d->SampleHuff[8] = NULL;
++ d->SampleHuff[9] = NULL;
++ d->SampleHuff[10] = NULL;
++ d->SampleHuff[11] = NULL;
++ d->SampleHuff[12] = NULL;
++ d->SampleHuff[13] = NULL;
++ d->SampleHuff[14] = NULL;
++ d->SampleHuff[15] = NULL;
++ d->SampleHuff[16] = NULL;
++ d->SampleHuff[17] = NULL;
++
++ d->EQ_activated = 0;
++ d->MPCHeaderPos = 0;
++ d->StreamVersion = 0;
++ d->MS_used = 0;
++ d->FwdJumpInfo = 0;
++ d->ActDecodePos = 0;
++ d->FrameWasValid = 0;
++ d->OverallFrames = 0;
++ d->DecodedFrames = 0;
++ d->LastValidSamples = 0;
++ d->TrueGaplessPresent = 0;
++ d->WordsRead = 0;
++ d->Max_Band = 0;
++ d->SampleRate = 0;
++// clips = 0;
++ d->__r1 = 1;
++ d->__r2 = 1;
++
++ d->dword = 0;
++ d->pos = 0;
++ d->Zaehler = 0;
++ d->WordsRead = 0;
++ d->Max_Band = 0;
++
++ mpc_decoder_initialisiere_quantisierungstabellen(d, 1.0f);
++ mpc_decoder_init_huffman_sv6(d);
++ mpc_decoder_init_huffman_sv7(d);
++}
++
++static void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si)
++{
++ mpc_decoder_reset_synthesis(d);
++ mpc_decoder_reset_globals(d);
++
++ d->StreamVersion = si->stream_version;
++ d->MS_used = si->ms;
++ d->Max_Band = si->max_band;
++ d->OverallFrames = si->frames;
++ d->MPCHeaderPos = si->header_position;
++ d->LastValidSamples = si->last_frame_samples;
++ d->TrueGaplessPresent = si->is_true_gapless;
++ d->SampleRate = (mpc_int32_t)si->sample_freq;
++
++ d->samples_to_skip = MPC_DECODER_SYNTH_DELAY;
++}
++
++mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si)
++{
++ mpc_decoder_set_streaminfo(d, si);
++
++ // AB: setting position to the beginning of the data-bitstream
++ switch (d->StreamVersion) {
++ case 0x04: f_seek(d, 4 + d->MPCHeaderPos); d->pos = 16; break; // Geht auch ber eine der Helperfunktionen
++ case 0x05:
++ case 0x06: f_seek(d, 8 + d->MPCHeaderPos); d->pos = 0; break;
++ case 0x07:
++ case 0x17: /*f_seek ( 24 + d->MPCHeaderPos );*/ d->pos = 8; break;
++ default: return FALSE;
++ }
++
++ // AB: fill buffer and initialize decoder
++ f_read_dword(d, d->Speicher, MEMSIZE );
++ d->dword = d->Speicher[d->Zaehler = 0];
++
++ return TRUE;
++}
++
++//---------------------------------------------------------------
++// will seek from the beginning of the file to the desired
++// position in ms (given by seek_needed)
++//---------------------------------------------------------------
++#if 0
++static void
++helper1(mpc_decoder *d, mpc_uint32_t bitpos)
++{
++ f_seek(d, (bitpos >> 5) * 4 + d->MPCHeaderPos);
++ f_read_dword(d, d->Speicher, 2);
++ d->dword = d->Speicher[d->Zaehler = 0];
++ d->pos = bitpos & 31;
++}
++#endif
++
++static void
++helper2(mpc_decoder *d, mpc_uint32_t bitpos)
++{
++ f_seek(d, (bitpos>>5) * 4 + d->MPCHeaderPos);
++ f_read_dword(d, d->Speicher, MEMSIZE);
++ d->dword = d->Speicher[d->Zaehler = 0];
++ d->pos = bitpos & 31;
++}
++
++#if 0
++static void
++helper3(mpc_decoder *d, mpc_uint32_t bitpos, mpc_uint32_t* buffoffs)
++{
++ d->pos = bitpos & 31;
++ bitpos >>= 5;
++ if ((mpc_uint32_t)(bitpos - *buffoffs) >= MEMSIZE - 2) {
++ *buffoffs = bitpos;
++ f_seek(d, bitpos * 4L + d->MPCHeaderPos);
++ f_read_dword(d, d->Speicher, MEMSIZE );
++ }
++ d->dword = d->Speicher[d->Zaehler = bitpos - *buffoffs ];
++}
++#endif
++
++static mpc_uint32_t get_initial_fpos(mpc_decoder *d, mpc_uint32_t StreamVersion)
++{
++ mpc_uint32_t fpos = 0;
++ switch ( d->StreamVersion ) { // setting position to the beginning of the data-bitstream
++ case 0x04: fpos = 48; break;
++ case 0x05:
++ case 0x06: fpos = 64; break;
++ case 0x07:
++ case 0x17: fpos = 200; break;
++ }
++ return fpos;
++}
++
++mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *d, double seconds)
++{
++ return mpc_decoder_seek_sample(d, (mpc_int64_t)(seconds * (double)d->SampleRate + 0.5));
++}
++
++mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample)
++{
++ mpc_uint32_t fpos;
++ mpc_uint32_t fwd;
++
++ fwd = (mpc_uint32_t) (destsample / MPC_FRAME_LENGTH);
++ d->samples_to_skip = MPC_DECODER_SYNTH_DELAY + (mpc_uint32_t)(destsample % MPC_FRAME_LENGTH);
++
++ memset(d->Y_L , 0, sizeof d->Y_L );
++ memset(d->Y_R , 0, sizeof d->Y_R );
++ memset(d->SCF_Index_L , 0, sizeof d->SCF_Index_L );
++ memset(d->SCF_Index_R , 0, sizeof d->SCF_Index_R );
++ memset(d->Res_L , 0, sizeof d->Res_L );
++ memset(d->Res_R , 0, sizeof d->Res_R );
++ memset(d->SCFI_L , 0, sizeof d->SCFI_L );
++ memset(d->SCFI_R , 0, sizeof d->SCFI_R );
++ memset(d->DSCF_Flag_L , 0, sizeof d->DSCF_Flag_L );
++ memset(d->DSCF_Flag_R , 0, sizeof d->DSCF_Flag_R );
++ memset(d->DSCF_Reference_L, 0, sizeof d->DSCF_Reference_L );
++ memset(d->DSCF_Reference_R, 0, sizeof d->DSCF_Reference_R );
++ memset(d->Q , 0, sizeof d->Q );
++ memset(d->MS_Flag , 0, sizeof d->MS_Flag );
++
++ // resetting synthesis filter to avoid "clicks"
++ mpc_decoder_reset_synthesis(d);
++
++ // prevent from desired position out of allowed range
++ fwd = fwd < d->OverallFrames ? fwd : d->OverallFrames;
++
++ // reset number of decoded frames
++ d->DecodedFrames = 0;
++
++ fpos = get_initial_fpos(d, d->StreamVersion);
++ if (fpos == 0) {
++ return FALSE;
++ }
++
++ helper2(d, fpos);
++
++ // read the last 32 frames before the desired position to scan the scalefactors (artifactless jumping)
++ for ( ; d->DecodedFrames < fwd; d->DecodedFrames++ ) {
++ mpc_uint32_t FrameBitCnt;
++ mpc_uint32_t RING;
++ RING = d->Zaehler;
++ d->FwdJumpInfo = mpc_decoder_bitstream_read(d, 20); // read jump-info
++ d->ActDecodePos = (d->Zaehler << 5) + d->pos;
++ FrameBitCnt = mpc_decoder_bits_read(d); // scanning the scalefactors and check for validity of frame
++ if (d->StreamVersion >= 7) {
++ mpc_decoder_read_bitstream_sv7(d);
++ }
++ else {
++ mpc_decoder_read_bitstream_sv6(d);
++ }
++ if (mpc_decoder_bits_read(d) - FrameBitCnt != d->FwdJumpInfo ) {
++ // Box ("Bug in perform_jump");
++ return FALSE;
++ }
++ // update buffer
++ if ((RING ^ d->Zaehler) & MEMSIZE2) {
++ f_read_dword(d, d->Speicher + (RING & MEMSIZE2), MEMSIZE2);
++ }
++ }
++
++ // LastBitsRead = BitsRead ();
++ // LastFrame = d->DecodedFrames;
++
++ return TRUE;
++}
++
++void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING)
++{
++ if ((RING ^ d->Zaehler) & MEMSIZE2 ) {
++ // update buffer
++ f_read_dword(d, d->Speicher + (RING & MEMSIZE2), MEMSIZE2);
++ }
++}
++
++
+--- ./src/libmusepack/mpc_reader.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/mpc_reader.c 9 Feb 2005 19:39:37 -0000 1.2.2.1
+@@ -0,0 +1,96 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file mpc_reader.c
++/// Contains implementations for simple file-based mpc_reader
++
++#include "musepack/musepack.h"
++
++/// mpc_reader callback implementations
++static mpc_int32_t
++read_impl(void *data, void *ptr, mpc_int32_t size)
++{
++ mpc_reader *d = (mpc_reader *) data;
++
++ return fread(ptr, 1, size, d->file);
++}
++
++static mpc_bool_t
++seek_impl(void *data, int offset)
++{
++ mpc_reader *d = (mpc_reader *) data;
++
++ return d->is_seekable ? !fseek(d->file, offset, SEEK_SET) : FALSE;
++}
++
++static mpc_int32_t
++tell_impl(void *data)
++{
++ mpc_reader *d = (mpc_reader *) data;
++
++ return ftell(d->file);
++}
++
++static mpc_int32_t
++get_size_impl(void *data)
++{
++ mpc_reader *d = (mpc_reader *) data;
++
++ return d->file_size;
++}
++
++static mpc_bool_t
++canseek_impl(void *data)
++{
++ mpc_reader *d = (mpc_reader *) data;
++
++ return d->is_seekable;
++}
++
++void
++mpc_reader_setup_file_reader(mpc_reader *reader, FILE *input)
++{
++ reader->seek = seek_impl;
++ reader->read = read_impl;
++ reader->tell = tell_impl;
++ reader->get_size = get_size_impl;
++ reader->canseek = canseek_impl;
++ reader->data = reader; // point back to ourselves
++
++ reader->file = input;
++ reader->is_seekable = TRUE;
++ fseek(reader->file, 0, SEEK_END);
++ reader->file_size = ftell(reader->file);
++ fseek(reader->file, 0, SEEK_SET);
++}
+--- ./src/libmusepack/requant.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/requant.c 9 Feb 2005 19:39:38 -0000 1.2.2.1
+@@ -0,0 +1,152 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file requant.c
++/// Requantization function implementations.
++/// \todo document me
++
++#include "musepack/musepack.h"
++#include "musepack/internal.h"
++
++/* C O N S T A N T S */
++// bits per sample for chosen quantizer
++const mpc_uint32_t Res_bit [18] = {
++ 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
++};
++
++// coefficients for requantization
++// 65536/step bzw. 65536/(2*D+1)
++
++#define _(X) MAKE_MPC_SAMPLE_EX(X,14)
++
++const MPC_SAMPLE_FORMAT __Cc [1 + 18] = {
++ _(111.285962475327f), // 32768/2/255*sqrt(3)
++ _(65536.000000000000f), _(21845.333333333332f), _(13107.200000000001f), _(9362.285714285713f),
++ _(7281.777777777777f), _(4369.066666666666f), _(2114.064516129032f), _(1040.253968253968f),
++ _(516.031496062992f), _(257.003921568627f), _(128.250489236790f), _(64.062561094819f),
++ _(32.015632633121f), _(16.003907203907f), _(8.000976681723f), _(4.000244155527f),
++ _(2.000061037018f), _(1.000015259021f)
++};
++
++#undef _
++
++// offset for requantization
++// 2*D+1 = steps of quantizer
++const mpc_int32_t __Dc [1 + 18] = {
++ 2,
++ 0, 1, 2, 3, 4, 7, 15, 31, 63,
++ 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767
++};
++
++#ifdef MPC_FIXED_POINT
++static mpc_uint32_t find_shift(double fval)
++{
++ mpc_int64_t val = (mpc_int64_t)fval;
++ if (val<0) val = -val;
++ mpc_uint32_t ptr = 0;
++ while(val) {val>>=1;ptr++;}
++
++ return ptr > 31 ? 0 : 31 - ptr;
++}
++#endif
++
++/* F U N C T I O N S */
++
++#define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,SCF_shift[N] = (unsigned char)find_shift(X));
++
++void
++mpc_decoder_scale_output(mpc_decoder *d, double factor)
++{
++ mpc_int32_t n;
++ double f1;
++ double f2;
++#ifndef MPC_FIXED_POINT
++ factor *= 1.0 / (double)(1<<(MPC_FIXED_POINT_SHIFT-1));
++#else
++ factor *= 1.0 / (double)(1<<(16 - MPC_FIXED_POINT_SHIFT));
++#endif
++ f1 = f2 = factor;
++
++ // handles +1.58...-98.41 dB, where's scf[n] / scf[n-1] = 1.20050805774840750476
++
++ SET_SCF(1,factor);
++
++ f1 *= 0.83298066476582673961;
++ f2 *= 1/0.83298066476582673961;
++
++ for ( n = 1; n <= 128; n++ ) {
++ SET_SCF((unsigned char)(1+n),f1);
++ SET_SCF((unsigned char)(1-n),f2);
++ f1 *= 0.83298066476582673961;
++ f2 *= 1/0.83298066476582673961;
++ }
++}
++
++static void
++mpc_decoder_quantisierungsmodes(mpc_decoder *d) // conversion: index -> quantizer (bitstream reading)
++{ // conversion: quantizer -> index (bitstream writing)
++ mpc_int32_t Band = 0;
++ mpc_int32_t i;
++
++ do {
++ d->Q_bit [Band] = 4;
++ for ( i = 0; i < 16-1; i++ )
++ d->Q_res [Band] [i] = i;
++ d->Q_res [Band][i] = 17;
++ Band++;
++ } while ( Band < 11 );
++
++ do {
++ d->Q_bit [Band] = 3;
++ for ( i = 0; i < 8-1; i++ )
++ d->Q_res [Band] [i] = i;
++ d->Q_res [Band] [i] = 17;
++ Band++;
++ } while ( Band < 23 );
++
++ do {
++ d->Q_bit [Band] = 2;
++ for ( i = 0; i < 4-1; i++ )
++ d->Q_res [Band] [i] = i;
++ d->Q_res [Band] [i] = 17;
++ Band++;
++ } while ( Band < 32 );
++}
++
++void
++mpc_decoder_initialisiere_quantisierungstabellen(mpc_decoder *d, double scale_factor)
++{
++ mpc_decoder_quantisierungsmodes(d);
++ mpc_decoder_scale_output(d, scale_factor);
++}
+--- ./src/libmusepack/streaminfo.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/streaminfo.c 9 Feb 2005 19:39:38 -0000 1.2.2.1
+@@ -0,0 +1,280 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file streaminfo.c
++/// Implementation of streaminfo reading functions.
++
++#include "musepack/musepack.h"
++#include "musepack/internal.h"
++
++static const char *
++Stringify(mpc_uint32_t profile) // profile is 0...15, where 7...13 is used
++{
++ static const char na[] = "n.a.";
++ static const char *Names[] = {
++ na, "'Unstable/Experimental'", na, na,
++ na, "'quality 0'", "'quality 1'", "'Telephone'",
++ "'Thumb'", "'Radio'", "'Standard'", "'Xtreme'",
++ "'Insane'", "'BrainDead'", "'quality 9'", "'quality 10'"
++ };
++
++ return profile >= sizeof(Names) / sizeof(*Names) ? na : Names[profile];
++}
++
++void
++mpc_streaminfo_init(mpc_streaminfo * si)
++{
++ memset(si, 0, sizeof(mpc_streaminfo));
++}
++
++// read information from SV8 header
++// not yet implemented
++static mpc_int32_t
++streaminfo_read_header_sv8(mpc_streaminfo * si, mpc_reader * fp)
++{
++ return 0;
++}
++
++/// Reads streaminfo from SV7 header.
++static mpc_int32_t
++streaminfo_read_header_sv7(mpc_streaminfo * si, mpc_uint32_t HeaderData[8])
++{
++ const mpc_int32_t samplefreqs[4] = { 44100, 48000, 37800, 32000 };
++
++ //mpc_uint32_t HeaderData [8];
++ mpc_uint16_t Estimatedpeak_title = 0;
++
++ if (si->stream_version > 0x71) {
++ // Update (si->stream_version);
++ return 0;
++ }
++
++ /*
++ if ( !fp->seek ( si->header_position ) ) // seek to header start
++ return ERROR_CODE_FILE;
++ if ( fp->read ( HeaderData, sizeof HeaderData) != sizeof HeaderData )
++ return ERROR_CODE_FILE;
++ */
++
++ si->bitrate = 0;
++ si->frames = HeaderData[1];
++ si->is = 0;
++ si->ms = (HeaderData[2] >> 30) & 0x0001;
++ si->max_band = (HeaderData[2] >> 24) & 0x003F;
++ si->block_size = 1;
++ si->profile = (HeaderData[2] << 8) >> 28;
++ si->profile_name = Stringify(si->profile);
++ si->sample_freq = samplefreqs[(HeaderData[2] >> 16) & 0x0003];
++ Estimatedpeak_title = (mpc_uint16_t) (HeaderData[2] & 0xFFFF); // read the ReplayGain data
++ si->gain_title = (mpc_uint16_t) ((HeaderData[3] >> 16) & 0xFFFF);
++ si->peak_title = (mpc_uint16_t) (HeaderData[3] & 0xFFFF);
++ si->gain_album = (mpc_uint16_t) ((HeaderData[4] >> 16) & 0xFFFF);
++ si->peak_album = (mpc_uint16_t) (HeaderData[4] & 0xFFFF);
++ si->is_true_gapless = (HeaderData[5] >> 31) & 0x0001; // true gapless: used?
++ si->last_frame_samples = (HeaderData[5] >> 20) & 0x07FF; // true gapless: valid samples for last frame
++ si->encoder_version = (HeaderData[6] >> 24) & 0x00FF;
++
++ if (si->encoder_version == 0) {
++ sprintf(si->encoder, "Buschmann 1.7.0...9, Klemm 0.90...1.05");
++ }
++ else {
++ switch (si->encoder_version % 10) {
++ case 0:
++ sprintf(si->encoder, "Release %u.%u", si->encoder_version / 100,
++ si->encoder_version / 10 % 10);
++ break;
++ case 2:
++ case 4:
++ case 6:
++ case 8:
++ sprintf(si->encoder, "Beta %u.%02u", si->encoder_version / 100,
++ si->encoder_version % 100);
++ break;
++ default:
++ sprintf(si->encoder, "--Alpha-- %u.%02u",
++ si->encoder_version / 100, si->encoder_version % 100);
++ break;
++ }
++ }
++
++ // if ( si->peak_title == 0 ) // there is no correct peak_title contained within header
++ // si->peak_title = (mpc_uint16_t)(Estimatedpeak_title * 1.18);
++ // if ( si->peak_album == 0 )
++ // si->peak_album = si->peak_title; // no correct peak_album, use peak_title
++
++ //si->sample_freq = 44100; // AB: used by all files up to SV7
++ si->channels = 2;
++
++ return ERROR_CODE_OK;
++}
++
++// read information from SV4-SV6 header
++static mpc_int32_t
++streaminfo_read_header_sv6(mpc_streaminfo * si, mpc_uint32_t HeaderData[8])
++{
++ //mpc_uint32_t HeaderData [8];
++
++ /*
++ if ( !fp->seek ( si->header_position ) ) // seek to header start
++ return ERROR_CODE_FILE;
++ if ( fp->read ( HeaderData, sizeof HeaderData ) != sizeof HeaderData )
++ return ERROR_CODE_FILE;
++ */
++
++ si->bitrate = (HeaderData[0] >> 23) & 0x01FF; // read the file-header (SV6 and below)
++ si->is = (HeaderData[0] >> 22) & 0x0001;
++ si->ms = (HeaderData[0] >> 21) & 0x0001;
++ si->stream_version = (HeaderData[0] >> 11) & 0x03FF;
++ si->max_band = (HeaderData[0] >> 6) & 0x001F;
++ si->block_size = (HeaderData[0]) & 0x003F;
++ si->profile = 0;
++ si->profile_name = Stringify((mpc_uint32_t) (-1));
++ if (si->stream_version >= 5)
++ si->frames = HeaderData[1]; // 32 bit
++ else
++ si->frames = (HeaderData[1] >> 16); // 16 bit
++
++ si->gain_title = 0; // not supported
++ si->peak_title = 0;
++ si->gain_album = 0;
++ si->peak_album = 0;
++
++ si->last_frame_samples = 0;
++ si->is_true_gapless = 0;
++
++ si->encoder_version = 0;
++ si->encoder[0] = '\0';
++
++ if (si->stream_version == 7)
++ return ERROR_CODE_SV7BETA; // are there any unsupported parameters used?
++ if (si->bitrate != 0)
++ return ERROR_CODE_CBR;
++ if (si->is != 0)
++ return ERROR_CODE_IS;
++ if (si->block_size != 1)
++ return ERROR_CODE_BLOCKSIZE;
++
++ if (si->stream_version < 6) // Bugfix: last frame was invalid for up to SV5
++ si->frames -= 1;
++
++ si->sample_freq = 44100; // AB: used by all files up to SV7
++ si->channels = 2;
++
++ if (si->stream_version < 4 || si->stream_version > 7)
++ return ERROR_CODE_INVALIDSV;
++
++ return ERROR_CODE_OK;
++}
++
++// reads file header and tags
++mpc_int32_t
++mpc_streaminfo_read(mpc_streaminfo * si, mpc_reader * r)
++{
++ mpc_uint32_t HeaderData[8];
++ mpc_int32_t Error = 0;
++
++ // get header position
++ if ((si->header_position = JumpID3v2(r)) < 0) {
++ return ERROR_CODE_FILE;
++ }
++ // seek to first byte of mpc data
++ if (!r->seek(r->data, si->header_position)) {
++ return ERROR_CODE_FILE;
++ }
++ if (r->read(r->data, HeaderData, 8 * 4) != 8 * 4) {
++ return ERROR_CODE_FILE;
++ }
++ if (!r->seek(r->data, si->header_position + 6 * 4)) {
++ return ERROR_CODE_FILE;
++ }
++
++ si->total_file_length = r->get_size(r->data);
++ si->tag_offset = si->total_file_length;
++ if (memcmp(HeaderData, "MP+", 3) == 0) {
++#ifndef MPC_LITTLE_ENDIAN
++ mpc_uint32_t ptr;
++ for (ptr = 0; ptr < 8; ptr++) {
++ HeaderData[ptr] = swap32(HeaderData[ptr]);
++ }
++#endif
++ si->stream_version = HeaderData[0] >> 24;
++
++ // stream version 8
++ if ((si->stream_version & 15) >= 8) {
++ Error = streaminfo_read_header_sv8(si, r);
++ }
++ // stream version 7
++ else if ((si->stream_version & 15) == 7) {
++ Error = streaminfo_read_header_sv7(si, HeaderData);
++ }
++ }
++ else {
++ // stream version 4-6
++ Error = streaminfo_read_header_sv6(si, HeaderData);
++ }
++
++ // estimation, exact value needs too much time
++ si->pcm_samples = 1152 * si->frames - 576;
++
++ if (si->pcm_samples > 0) {
++ si->average_bitrate =
++ (si->tag_offset -
++ si->header_position) * 8.0 * si->sample_freq / si->pcm_samples;
++ }
++ else {
++ si->average_bitrate = 0;
++ }
++
++ return Error;
++}
++
++double
++mpc_streaminfo_get_length(mpc_streaminfo * si)
++{
++ return (double)mpc_streaminfo_get_length_samples(si) /
++ (double)si->sample_freq;
++}
++
++mpc_int64_t
++mpc_streaminfo_get_length_samples(mpc_streaminfo * si)
++{
++ mpc_int64_t samples = (mpc_int64_t) si->frames * MPC_FRAME_LENGTH;
++ if (si->is_true_gapless) {
++ samples -= (MPC_FRAME_LENGTH - si->last_frame_samples);
++ }
++ else {
++ samples -= MPC_DECODER_SYNTH_DELAY;
++ }
++ return samples;
++}
+--- ./src/libmusepack/synth_filter.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/synth_filter.c 9 Feb 2005 19:39:38 -0000 1.1.2.1
+@@ -0,0 +1,442 @@
++/*
++ Copyright (c) 2004, The Musepack Development Team
++ All rights reserved.
++
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++
++ * Neither the name of the The Musepack Development Team nor the
++ names of its contributors may be used to endorse or promote
++ products derived from this software without specific prior
++ written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/// \file synth_filter.c
++/// Synthesis functions.
++/// \todo document me
++
++#include "musepack/musepack.h"
++#include "musepack/internal.h"
++
++typedef mpc_int32_t ptrdiff_t;
++
++/* C O N S T A N T S */
++#undef _
++
++#define MPC_FIXED_POINT_SYNTH_FIX 2
++
++#ifdef MPC_FIXED_POINT
++#define _(value) MPC_MAKE_FRACT_CONST((double)value/(double)(0x40000))
++#else
++#define _(value) MAKE_MPC_SAMPLE((double)value/(double)(0x10000))
++#endif
++
++
++static const MPC_SAMPLE_FORMAT Di_opt [32] [16] = {
++ { _( 0), _( -29), _( 213), _( -459), _( 2037), _(-5153), _( 6574), _(-37489), _(75038), _(37489), _(6574), _( 5153), _(2037), _( 459), _(213), _(29) },
++ { _( -1), _( -31), _( 218), _( -519), _( 2000), _(-5517), _( 5959), _(-39336), _(74992), _(35640), _(7134), _( 4788), _(2063), _( 401), _(208), _(26) },
++ { _( -1), _( -35), _( 222), _( -581), _( 1952), _(-5879), _( 5288), _(-41176), _(74856), _(33791), _(7640), _( 4425), _(2080), _( 347), _(202), _(24) },
++ { _( -1), _( -38), _( 225), _( -645), _( 1893), _(-6237), _( 4561), _(-43006), _(74630), _(31947), _(8092), _( 4063), _(2087), _( 294), _(196), _(21) },
++ { _( -1), _( -41), _( 227), _( -711), _( 1822), _(-6589), _( 3776), _(-44821), _(74313), _(30112), _(8492), _( 3705), _(2085), _( 244), _(190), _(19) },
++ { _( -1), _( -45), _( 228), _( -779), _( 1739), _(-6935), _( 2935), _(-46617), _(73908), _(28289), _(8840), _( 3351), _(2075), _( 197), _(183), _(17) },
++ { _( -1), _( -49), _( 228), _( -848), _( 1644), _(-7271), _( 2037), _(-48390), _(73415), _(26482), _(9139), _( 3004), _(2057), _( 153), _(176), _(16) },
++ { _( -2), _( -53), _( 227), _( -919), _( 1535), _(-7597), _( 1082), _(-50137), _(72835), _(24694), _(9389), _( 2663), _(2032), _( 111), _(169), _(14) },
++ { _( -2), _( -58), _( 224), _( -991), _( 1414), _(-7910), _( 70), _(-51853), _(72169), _(22929), _(9592), _( 2330), _(2001), _( 72), _(161), _(13) },
++ { _( -2), _( -63), _( 221), _(-1064), _( 1280), _(-8209), _( -998), _(-53534), _(71420), _(21189), _(9750), _( 2006), _(1962), _( 36), _(154), _(11) },
++ { _( -2), _( -68), _( 215), _(-1137), _( 1131), _(-8491), _( -2122), _(-55178), _(70590), _(19478), _(9863), _( 1692), _(1919), _( 2), _(147), _(10) },
++ { _( -3), _( -73), _( 208), _(-1210), _( 970), _(-8755), _( -3300), _(-56778), _(69679), _(17799), _(9935), _( 1388), _(1870), _( -29), _(139), _( 9) },
++ { _( -3), _( -79), _( 200), _(-1283), _( 794), _(-8998), _( -4533), _(-58333), _(68692), _(16155), _(9966), _( 1095), _(1817), _( -57), _(132), _( 8) },
++ { _( -4), _( -85), _( 189), _(-1356), _( 605), _(-9219), _( -5818), _(-59838), _(67629), _(14548), _(9959), _( 814), _(1759), _( -83), _(125), _( 7) },
++ { _( -4), _( -91), _( 177), _(-1428), _( 402), _(-9416), _( -7154), _(-61289), _(66494), _(12980), _(9916), _( 545), _(1698), _(-106), _(117), _( 7) },
++ { _( -5), _( -97), _( 163), _(-1498), _( 185), _(-9585), _( -8540), _(-62684), _(65290), _(11455), _(9838), _( 288), _(1634), _(-127), _(111), _( 6) },
++ { _( -5), _(-104), _( 146), _(-1567), _( -45), _(-9727), _( -9975), _(-64019), _(64019), _( 9975), _(9727), _( 45), _(1567), _(-146), _(104), _( 5) },
++ { _( -6), _(-111), _( 127), _(-1634), _( -288), _(-9838), _(-11455), _(-65290), _(62684), _( 8540), _(9585), _( -185), _(1498), _(-163), _( 97), _( 5) },
++ { _( -7), _(-117), _( 106), _(-1698), _( -545), _(-9916), _(-12980), _(-66494), _(61289), _( 7154), _(9416), _( -402), _(1428), _(-177), _( 91), _( 4) },
++ { _( -7), _(-125), _( 83), _(-1759), _( -814), _(-9959), _(-14548), _(-67629), _(59838), _( 5818), _(9219), _( -605), _(1356), _(-189), _( 85), _( 4) },
++ { _( -8), _(-132), _( 57), _(-1817), _(-1095), _(-9966), _(-16155), _(-68692), _(58333), _( 4533), _(8998), _( -794), _(1283), _(-200), _( 79), _( 3) },
++ { _( -9), _(-139), _( 29), _(-1870), _(-1388), _(-9935), _(-17799), _(-69679), _(56778), _( 3300), _(8755), _( -970), _(1210), _(-208), _( 73), _( 3) },
++ { _(-10), _(-147), _( -2), _(-1919), _(-1692), _(-9863), _(-19478), _(-70590), _(55178), _( 2122), _(8491), _(-1131), _(1137), _(-215), _( 68), _( 2) },
++ { _(-11), _(-154), _( -36), _(-1962), _(-2006), _(-9750), _(-21189), _(-71420), _(53534), _( 998), _(8209), _(-1280), _(1064), _(-221), _( 63), _( 2) },
++ { _(-13), _(-161), _( -72), _(-2001), _(-2330), _(-9592), _(-22929), _(-72169), _(51853), _( -70), _(7910), _(-1414), _( 991), _(-224), _( 58), _( 2) },
++ { _(-14), _(-169), _(-111), _(-2032), _(-2663), _(-9389), _(-24694), _(-72835), _(50137), _(-1082), _(7597), _(-1535), _( 919), _(-227), _( 53), _( 2) },
++ { _(-16), _(-176), _(-153), _(-2057), _(-3004), _(-9139), _(-26482), _(-73415), _(48390), _(-2037), _(7271), _(-1644), _( 848), _(-228), _( 49), _( 1) },
++ { _(-17), _(-183), _(-197), _(-2075), _(-3351), _(-8840), _(-28289), _(-73908), _(46617), _(-2935), _(6935), _(-1739), _( 779), _(-228), _( 45), _( 1) },
++ { _(-19), _(-190), _(-244), _(-2085), _(-3705), _(-8492), _(-30112), _(-74313), _(44821), _(-3776), _(6589), _(-1822), _( 711), _(-227), _( 41), _( 1) },
++ { _(-21), _(-196), _(-294), _(-2087), _(-4063), _(-8092), _(-31947), _(-74630), _(43006), _(-4561), _(6237), _(-1893), _( 645), _(-225), _( 38), _( 1) },
++ { _(-24), _(-202), _(-347), _(-2080), _(-4425), _(-7640), _(-33791), _(-74856), _(41176), _(-5288), _(5879), _(-1952), _( 581), _(-222), _( 35), _( 1) },
++ { _(-26), _(-208), _(-401), _(-2063), _(-4788), _(-7134), _(-35640), _(-74992), _(39336), _(-5959), _(5517), _(-2000), _( 519), _(-218), _( 31), _( 1) }
++};
++
++#undef _
++
++static void Calculate_New_V ( const MPC_SAMPLE_FORMAT * Sample, MPC_SAMPLE_FORMAT * V )
++{
++ // Calculating new V-buffer values for left channel
++ // calculate new V-values (ISO-11172-3, p. 39)
++ // based upon fast-MDCT algorithm by Byeong Gi Lee
++ /*static*/ MPC_SAMPLE_FORMAT A00, A01, A02, A03, A04, A05, A06, A07, A08, A09, A10, A11, A12, A13, A14, A15;
++ /*static*/ MPC_SAMPLE_FORMAT B00, B01, B02, B03, B04, B05, B06, B07, B08, B09, B10, B11, B12, B13, B14, B15;
++ MPC_SAMPLE_FORMAT tmp;
++
++ A00 = Sample[ 0] + Sample[31];
++ A01 = Sample[ 1] + Sample[30];
++ A02 = Sample[ 2] + Sample[29];
++ A03 = Sample[ 3] + Sample[28];
++ A04 = Sample[ 4] + Sample[27];
++ A05 = Sample[ 5] + Sample[26];
++ A06 = Sample[ 6] + Sample[25];
++ A07 = Sample[ 7] + Sample[24];
++ A08 = Sample[ 8] + Sample[23];
++ A09 = Sample[ 9] + Sample[22];
++ A10 = Sample[10] + Sample[21];
++ A11 = Sample[11] + Sample[20];
++ A12 = Sample[12] + Sample[19];
++ A13 = Sample[13] + Sample[18];
++ A14 = Sample[14] + Sample[17];
++ A15 = Sample[15] + Sample[16];
++
++ B00 = A00 + A15;
++ B01 = A01 + A14;
++ B02 = A02 + A13;
++ B03 = A03 + A12;
++ B04 = A04 + A11;
++ B05 = A05 + A10;
++ B06 = A06 + A09;
++ B07 = A07 + A08;;
++ B08 = MPC_SCALE_CONST((A00 - A15) , 0.5024192929f , 31);
++ B09 = MPC_SCALE_CONST((A01 - A14) , 0.5224986076f , 31);
++ B10 = MPC_SCALE_CONST((A02 - A13) , 0.5669440627f , 31);
++ B11 = MPC_SCALE_CONST((A03 - A12) , 0.6468217969f , 31);
++ B12 = MPC_SCALE_CONST((A04 - A11) , 0.7881546021f , 31);
++ B13 = MPC_SCALE_CONST((A05 - A10) , 1.0606776476f , 30);
++ B14 = MPC_SCALE_CONST((A06 - A09) , 1.7224471569f , 30);
++ B15 = MPC_SCALE_CONST((A07 - A08) , 5.1011486053f , 28);
++
++ A00 = B00 + B07;
++ A01 = B01 + B06;
++ A02 = B02 + B05;
++ A03 = B03 + B04;
++ A04 = MPC_SCALE_CONST((B00 - B07) , 0.5097956061f , 31);
++ A05 = MPC_SCALE_CONST((B01 - B06) , 0.6013448834f , 31);
++ A06 = MPC_SCALE_CONST((B02 - B05) , 0.8999761939f , 31);
++ A07 = MPC_SCALE_CONST((B03 - B04) , 2.5629155636f , 29);
++ A08 = B08 + B15;
++ A09 = B09 + B14;
++ A10 = B10 + B13;
++ A11 = B11 + B12;
++ A12 = MPC_SCALE_CONST((B08 - B15) , 0.5097956061f , 31);
++ A13 = MPC_SCALE_CONST((B09 - B14) , 0.6013448834f , 31);
++ A14 = MPC_SCALE_CONST((B10 - B13) , 0.8999761939f , 31);
++ A15 = MPC_SCALE_CONST((B11 - B12) , 2.5629155636f , 29);
++
++ B00 = A00 + A03;
++ B01 = A01 + A02;
++ B02 = MPC_MULTIPLY_FRACT_CONST_FIX((A00 - A03) , 0.5411961079f , 1);
++ B03 = MPC_MULTIPLY_FRACT_CONST_FIX((A01 - A02) , 1.3065630198f , 2);
++ B04 = A04 + A07;
++ B05 = A05 + A06;
++ B06 = MPC_MULTIPLY_FRACT_CONST_FIX((A04 - A07) , 0.5411961079f , 1);
++ B07 = MPC_MULTIPLY_FRACT_CONST_FIX((A05 - A06) , 1.3065630198f , 2);
++ B08 = A08 + A11;
++ B09 = A09 + A10;
++ B10 = MPC_MULTIPLY_FRACT_CONST_FIX((A08 - A11) , 0.5411961079f , 1);
++ B11 = MPC_MULTIPLY_FRACT_CONST_FIX((A09 - A10) , 1.3065630198f , 2);
++ B12 = A12 + A15;
++ B13 = A13 + A14;
++ B14 = MPC_MULTIPLY_FRACT_CONST_FIX((A12 - A15) , 0.5411961079f , 1);
++ B15 = MPC_MULTIPLY_FRACT_CONST_FIX((A13 - A14) , 1.3065630198f , 2);
++
++ A00 = B00 + B01;
++ A01 = MPC_MULTIPLY_FRACT_CONST_FIX((B00 - B01) , 0.7071067691f , 1);
++ A02 = B02 + B03;
++ A03 = MPC_MULTIPLY_FRACT_CONST_FIX((B02 - B03) , 0.7071067691f , 1);
++ A04 = B04 + B05;
++ A05 = MPC_MULTIPLY_FRACT_CONST_FIX((B04 - B05) , 0.7071067691f , 1);
++ A06 = B06 + B07;
++ A07 = MPC_MULTIPLY_FRACT_CONST_FIX((B06 - B07) , 0.7071067691f , 1);
++ A08 = B08 + B09;
++ A09 = MPC_MULTIPLY_FRACT_CONST_FIX((B08 - B09) , 0.7071067691f , 1);
++ A10 = B10 + B11;
++ A11 = MPC_MULTIPLY_FRACT_CONST_FIX((B10 - B11) , 0.7071067691f , 1);
++ A12 = B12 + B13;
++ A13 = MPC_MULTIPLY_FRACT_CONST_FIX((B12 - B13) , 0.7071067691f , 1);
++ A14 = B14 + B15;
++ A15 = MPC_MULTIPLY_FRACT_CONST_FIX((B14 - B15) , 0.7071067691f , 1);
++
++ V[48] = -A00;
++ V[ 0] = A01;
++ V[40] = -A02 - (V[ 8] = A03);
++ V[36] = -((V[ 4] = A05 + (V[12] = A07)) + A06);
++ V[44] = - A04 - A06 - A07;
++ V[ 6] = (V[10] = A11 + (V[14] = A15)) + A13;
++ V[38] = (V[34] = -(V[ 2] = A09 + A13 + A15) - A14) + A09 - A10 - A11;
++ V[46] = (tmp = -(A12 + A14 + A15)) - A08;
++ V[42] = tmp - A10 - A11;
++
++ A00 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 0] - Sample[31]) , 0.5006030202f , MPC_FIXED_POINT_SYNTH_FIX);
++ A01 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 1] - Sample[30]) , 0.5054709315f , MPC_FIXED_POINT_SYNTH_FIX);
++ A02 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 2] - Sample[29]) , 0.5154473186f , MPC_FIXED_POINT_SYNTH_FIX);
++ A03 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 3] - Sample[28]) , 0.5310425758f , MPC_FIXED_POINT_SYNTH_FIX);
++ A04 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 4] - Sample[27]) , 0.5531039238f , MPC_FIXED_POINT_SYNTH_FIX);
++ A05 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 5] - Sample[26]) , 0.5829349756f , MPC_FIXED_POINT_SYNTH_FIX);
++ A06 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 6] - Sample[25]) , 0.6225041151f , MPC_FIXED_POINT_SYNTH_FIX);
++ A07 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 7] - Sample[24]) , 0.6748083234f , MPC_FIXED_POINT_SYNTH_FIX);
++ A08 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 8] - Sample[23]) , 0.7445362806f , MPC_FIXED_POINT_SYNTH_FIX);
++ A09 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[ 9] - Sample[22]) , 0.8393496275f , MPC_FIXED_POINT_SYNTH_FIX);
++ A10 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[10] - Sample[21]) , 0.9725682139f , MPC_FIXED_POINT_SYNTH_FIX);
++#if MPC_FIXED_POINT_SYNTH_FIX>=2
++ A11 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[11] - Sample[20]) , 1.1694399118f , MPC_FIXED_POINT_SYNTH_FIX);
++ A12 = MPC_MULTIPLY_FRACT_CONST_SHR((Sample[12] - Sample[19]) , 1.4841645956f , MPC_FIXED_POINT_SYNTH_FIX);
++#else
++ A11 = MPC_SCALE_CONST_SHR ((Sample[11] - Sample[20]) , 1.1694399118f , 30, MPC_FIXED_POINT_SYNTH_FIX);
++ A12 = MPC_SCALE_CONST_SHR ((Sample[12] - Sample[19]) , 1.4841645956f , 30, MPC_FIXED_POINT_SYNTH_FIX);
++#endif
++ A13 = MPC_SCALE_CONST_SHR ((Sample[13] - Sample[18]) , 2.0577809811f , 29, MPC_FIXED_POINT_SYNTH_FIX);
++ A14 = MPC_SCALE_CONST_SHR ((Sample[14] - Sample[17]) , 3.4076085091f , 29, MPC_FIXED_POINT_SYNTH_FIX);
++ A15 = MPC_SCALE_CONST_SHR ((Sample[15] - Sample[16]) , 10.1900081635f, 27 ,MPC_FIXED_POINT_SYNTH_FIX);
++
++ B00 = A00 + A15;
++ B01 = A01 + A14;
++ B02 = A02 + A13;
++ B03 = A03 + A12;
++ B04 = A04 + A11;
++ B05 = A05 + A10;
++ B06 = A06 + A09;
++ B07 = A07 + A08;
++ B08 = MPC_SCALE_CONST((A00 - A15) , 0.5024192929f , 31);
++ B09 = MPC_SCALE_CONST((A01 - A14) , 0.5224986076f , 31);
++ B10 = MPC_SCALE_CONST((A02 - A13) , 0.5669440627f , 31);
++ B11 = MPC_SCALE_CONST((A03 - A12) , 0.6468217969f , 31);
++ B12 = MPC_SCALE_CONST((A04 - A11) , 0.7881546021f , 31);
++ B13 = MPC_SCALE_CONST((A05 - A10) , 1.0606776476f , 30);
++ B14 = MPC_SCALE_CONST((A06 - A09) , 1.7224471569f , 30);
++ B15 = MPC_SCALE_CONST((A07 - A08) , 5.1011486053f , 28);
++
++ A00 = B00 + B07;
++ A01 = B01 + B06;
++ A02 = B02 + B05;
++ A03 = B03 + B04;
++ A04 = MPC_SCALE_CONST((B00 - B07) , 0.5097956061f , 31);
++ A05 = MPC_SCALE_CONST((B01 - B06) , 0.6013448834f , 31);
++ A06 = MPC_SCALE_CONST((B02 - B05) , 0.8999761939f , 31);
++ A07 = MPC_SCALE_CONST((B03 - B04) , 2.5629155636f , 29);
++ A08 = B08 + B15;
++ A09 = B09 + B14;
++ A10 = B10 + B13;
++ A11 = B11 + B12;
++ A12 = MPC_SCALE_CONST((B08 - B15) , 0.5097956061f , 31);
++ A13 = MPC_SCALE_CONST((B09 - B14) , 0.6013448834f , 31);
++ A14 = MPC_SCALE_CONST((B10 - B13) , 0.8999761939f , 31);
++ A15 = MPC_SCALE_CONST((B11 - B12) , 2.5629155636f , 29);
++
++ B00 = A00 + A03;
++ B01 = A01 + A02;
++ B02 = MPC_SCALE_CONST((A00 - A03) , 0.5411961079f , 31);
++ B03 = MPC_SCALE_CONST((A01 - A02) , 1.3065630198f , 30);
++ B04 = A04 + A07;
++ B05 = A05 + A06;
++ B06 = MPC_SCALE_CONST((A04 - A07) , 0.5411961079f , 31);
++ B07 = MPC_SCALE_CONST((A05 - A06) , 1.3065630198f , 30);
++ B08 = A08 + A11;
++ B09 = A09 + A10;
++ B10 = MPC_SCALE_CONST((A08 - A11) , 0.5411961079f , 31);
++ B11 = MPC_SCALE_CONST((A09 - A10) , 1.3065630198f , 30);
++ B12 = A12 + A15;
++ B13 = A13 + A14;
++ B14 = MPC_SCALE_CONST((A12 - A15) , 0.5411961079f , 31);
++ B15 = MPC_SCALE_CONST((A13 - A14) , 1.3065630198f , 30);
++
++ A00 = MPC_SHL(B00 + B01, MPC_FIXED_POINT_SYNTH_FIX);
++ A01 = MPC_SCALE_CONST_SHL((B00 - B01) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A02 = MPC_SHL(B02 + B03, MPC_FIXED_POINT_SYNTH_FIX);
++ A03 = MPC_SCALE_CONST_SHL((B02 - B03) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A04 = MPC_SHL(B04 + B05, MPC_FIXED_POINT_SYNTH_FIX);
++ A05 = MPC_SCALE_CONST_SHL((B04 - B05) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A06 = MPC_SHL(B06 + B07, MPC_FIXED_POINT_SYNTH_FIX);
++ A07 = MPC_SCALE_CONST_SHL((B06 - B07) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A08 = MPC_SHL(B08 + B09, MPC_FIXED_POINT_SYNTH_FIX);
++ A09 = MPC_SCALE_CONST_SHL((B08 - B09) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A10 = MPC_SHL(B10 + B11, MPC_FIXED_POINT_SYNTH_FIX);
++ A11 = MPC_SCALE_CONST_SHL((B10 - B11) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A12 = MPC_SHL(B12 + B13, MPC_FIXED_POINT_SYNTH_FIX);
++ A13 = MPC_SCALE_CONST_SHL((B12 - B13) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++ A14 = MPC_SHL(B14 + B15, MPC_FIXED_POINT_SYNTH_FIX);
++ A15 = MPC_SCALE_CONST_SHL((B14 - B15) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
++
++ // mehrfach verwendete Ausdrcke: A04+A06+A07, A09+A13+A15
++ V[ 5] = (V[11] = (V[13] = A07 + (V[15] = A15)) + A11) + A05 + A13;
++ V[ 7] = (V[ 9] = A03 + A11 + A15) + A13;
++ V[33] = -(V[ 1] = A01 + A09 + A13 + A15) - A14;
++ V[35] = -(V[ 3] = A05 + A07 + A09 + A13 + A15) - A06 - A14;
++ V[37] = (tmp = -(A10 + A11 + A13 + A14 + A15)) - A05 - A06 - A07;
++ V[39] = tmp - A02 - A03; // abhngig vom Befehl drber
++ V[41] = (tmp += A13 - A12) - A02 - A03; // abhngig vom Befehl 2 drber
++ V[43] = tmp - A04 - A06 - A07; // abhngig von Befehlen 1 und 3 drber
++ V[47] = (tmp = -(A08 + A12 + A14 + A15)) - A00;
++ V[45] = tmp - A04 - A06 - A07; // abhngig vom Befehl drber
++
++ V[32] = -V[ 0];
++ V[31] = -V[ 1];
++ V[30] = -V[ 2];
++ V[29] = -V[ 3];
++ V[28] = -V[ 4];
++ V[27] = -V[ 5];
++ V[26] = -V[ 6];
++ V[25] = -V[ 7];
++ V[24] = -V[ 8];
++ V[23] = -V[ 9];
++ V[22] = -V[10];
++ V[21] = -V[11];
++ V[20] = -V[12];
++ V[19] = -V[13];
++ V[18] = -V[14];
++ V[17] = -V[15];
++
++ V[63] = V[33];
++ V[62] = V[34];
++ V[61] = V[35];
++ V[60] = V[36];
++ V[59] = V[37];
++ V[58] = V[38];
++ V[57] = V[39];
++ V[56] = V[40];
++ V[55] = V[41];
++ V[54] = V[42];
++ V[53] = V[43];
++ V[52] = V[44];
++ V[51] = V[45];
++ V[50] = V[46];
++ V[49] = V[47];
++}
++
++static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPLE_FORMAT * V,const MPC_SAMPLE_FORMAT * Y)
++{
++ mpc_uint32_t n;
++ for ( n = 0; n < 36; n++, Y += 32 ) {
++ V -= 64;
++ Calculate_New_V ( Y, V );
++ {
++ MPC_SAMPLE_FORMAT * Data = OutData;
++ const MPC_SAMPLE_FORMAT * D = (const MPC_SAMPLE_FORMAT *) &Di_opt;
++ mpc_int32_t k;
++ //mpc_int32_t tmp;
++
++
++
++ for ( k = 0; k < 32; k++, D += 16, V++ ) {
++ *Data = MPC_SHL(
++ MPC_MULTIPLY_FRACT(V[ 0],D[ 0]) + MPC_MULTIPLY_FRACT(V[ 96],D[ 1]) + MPC_MULTIPLY_FRACT(V[128],D[ 2]) + MPC_MULTIPLY_FRACT(V[224],D[ 3])
++ + MPC_MULTIPLY_FRACT(V[256],D[ 4]) + MPC_MULTIPLY_FRACT(V[352],D[ 5]) + MPC_MULTIPLY_FRACT(V[384],D[ 6]) + MPC_MULTIPLY_FRACT(V[480],D[ 7])
++ + MPC_MULTIPLY_FRACT(V[512],D[ 8]) + MPC_MULTIPLY_FRACT(V[608],D[ 9]) + MPC_MULTIPLY_FRACT(V[640],D[10]) + MPC_MULTIPLY_FRACT(V[736],D[11])
++ + MPC_MULTIPLY_FRACT(V[768],D[12]) + MPC_MULTIPLY_FRACT(V[864],D[13]) + MPC_MULTIPLY_FRACT(V[896],D[14]) + MPC_MULTIPLY_FRACT(V[992],D[15])
++ , 2);
++
++ Data += 2;
++ }
++ V -= 32;//bleh
++ OutData+=64;
++ }
++ }
++}
++
++void
++mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData)
++{
++ /********* left channel ********/
++ memmove(d->V_L + MPC_V_MEM, d->V_L, 960 * sizeof(MPC_SAMPLE_FORMAT) );
++
++ Synthese_Filter_float_internal(
++ OutData,
++ (MPC_SAMPLE_FORMAT *)(d->V_L + MPC_V_MEM),
++ (MPC_SAMPLE_FORMAT *)(d->Y_L [0]));
++
++ /******** right channel ********/
++ memmove(d->V_R + MPC_V_MEM, d->V_R, 960 * sizeof(MPC_SAMPLE_FORMAT) );
++
++ Synthese_Filter_float_internal(
++ OutData + 1,
++ (MPC_SAMPLE_FORMAT *)(d->V_R + MPC_V_MEM),
++ (MPC_SAMPLE_FORMAT *)(d->Y_R [0]));
++}
++
++/*******************************************/
++/* */
++/* dithered synthesis */
++/* */
++/*******************************************/
++
++static const unsigned char Parity [256] = { // parity
++ 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
++ 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
++ 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
++ 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
++ 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
++ 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
++ 0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
++ 1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0
++};
++
++/*
++ * This is a simple random number generator with good quality for audio purposes.
++ * It consists of two polycounters with opposite rotation direction and different
++ * periods. The periods are coprime, so the total period is the product of both.
++ *
++ * -------------------------------------------------------------------------------------------------
++ * +-> |31:30:29:28:27:26:25:24:23:22:21:20:19:18:17:16:15:14:13:12:11:10: 9: 8: 7: 6: 5: 4: 3: 2: 1: 0|
++ * | -------------------------------------------------------------------------------------------------
++ * | | | | | | |
++ * | +--+--+--+-XOR-+--------+
++ * | |
++ * +--------------------------------------------------------------------------------------+
++ *
++ * -------------------------------------------------------------------------------------------------
++ * |31:30:29:28:27:26:25:24:23:22:21:20:19:18:17:16:15:14:13:12:11:10: 9: 8: 7: 6: 5: 4: 3: 2: 1: 0| <-+
++ * ------------------------------------------------------------------------------------------------- |
++ * | | | | |
++ * +--+----XOR----+--+ |
++ * | |
++ * +----------------------------------------------------------------------------------------+
++ *
++ *
++ * The first has an period of 3*5*17*257*65537, the second of 7*47*73*178481,
++ * which gives a period of 18.410.713.077.675.721.215. The result is the
++ * XORed values of both generators.
++ */
++mpc_uint32_t
++random_int(mpc_decoder *d)
++{
++#if 1
++ mpc_uint32_t t1, t2, t3, t4;
++
++ t3 = t1 = d->__r1; t4 = t2 = d->__r2; // Parity calculation is done via table lookup, this is also available
++ t1 &= 0xF5; t2 >>= 25; // on CPUs without parity, can be implemented in C and avoid unpredictable
++ t1 = Parity [t1]; t2 &= 0x63; // jumps and slow rotate through the carry flag operations.
++ t1 <<= 31; t2 = Parity [t2];
++
++ return (d->__r1 = (t3 >> 1) | t1 ) ^ (d->__r2 = (t4 + t4) | t2 );
++#else
++ return (d->__r1 = (d->__r1 >> 1) | ((mpc_uint32_t)Parity [d->__r1 & 0xF5] << 31) ) ^
++ (d->__r2 = (d->__r2 << 1) | (mpc_uint32_t)Parity [(d->__r2 >> 25) & 0x63] );
++#endif
++}
+--- ./src/libmusepack/xine_decoder.c 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/xine_decoder.c 9 Feb 2005 19:39:39 -0000 1.4.2.1
+@@ -0,0 +1,467 @@
++/*
++ * Copyright (C) 2005 the xine project
++ *
++ * This file is part of xine, a free video player.
++ *
++ * xine is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * xine is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * xine interface to libmusepack by James Stembridge <jstembridge@gmail.com>
++ *
++ * TODO:
++ * 32bit float output
++ * Seeking??
++ *
++ * $Id: xine_decoder.c,v 1.4.2.1 2005/02/09 19:39:39 mroi Exp $
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <unistd.h>
++
++#define LOG_MODULE "mpc_decoder"
++#define LOG_VERBOSE
++/*
++#define LOG
++*/
++
++#include "xine_internal.h"
++#include "audio_out.h"
++#include "buffer.h"
++#include "xineutils.h"
++
++#include "musepack/musepack.h"
++
++#define MPC_DECODER_MEMSIZE 65536
++#define MPC_DECODER_MEMSIZE2 (MPC_DECODER_MEMSIZE/2)
++
++#define INIT_BUFSIZE (MPC_DECODER_MEMSIZE*2)
++
++typedef struct {
++ audio_decoder_class_t decoder_class;
++} mpc_class_t;
++
++typedef struct mpc_decoder_s {
++ audio_decoder_t audio_decoder;
++
++ xine_stream_t *stream;
++
++ int sample_rate; /* audio sample rate */
++ int bits_per_sample; /* bits/sample, usually 8 or 16 */
++ int channels; /* 1 or 2, usually */
++
++ int output_open; /* flag to indicate audio is ready */
++
++ unsigned char *buf; /* data accumulation buffer */
++ unsigned int buf_max; /* maximum size of buf */
++ unsigned int read; /* size of accum. data already read */
++ unsigned int size; /* size of accumulated data in buf */
++
++ mpc_reader reader;
++ mpc_streaminfo streaminfo;
++ mpc_decoder decoder;
++
++ int decoder_ok;
++ unsigned int current_frame;
++
++ int32_t file_size;
++
++} mpc_decoder_t;
++
++
++/**************************************************************************
++ * musepack specific functions
++ *************************************************************************/
++
++/* Reads size bytes of data into buffer at ptr. */
++static int32_t mpc_reader_read(void *data, void *ptr, int32_t size) {
++ mpc_decoder_t *this = (mpc_decoder_t *) data;
++
++ lprintf("mpc_reader_read: size=%d\n", size);
++
++ /* Don't try to read more data than we have */
++ if (size > (this->size - this->read))
++ size = this->size - this->read;
++
++ /* Copy the data */
++ xine_fast_memcpy(ptr, &this->buf[this->read], size);
++
++ /* Update our position in the data buffer */
++ this->read += size;
++
++ return size;
++}
++
++/* Seeks to byte position offset. */
++static mpc_bool_t mpc_reader_seek(void *data, int32_t offset) {
++ mpc_decoder_t *this = (mpc_decoder_t *) data;
++
++ lprintf("mpc_reader_seek: offset=%d\n", offset);
++
++ /* seek is only called when reading the header so we can assume
++ * that the buffer starts at the start of the file */
++ this->read = offset;
++
++ return TRUE;
++}
++
++/* Returns the current byte offset in the stream. */
++static int32_t mpc_reader_tell(void *data) {
++ lprintf("mpc_reader_tell\n");
++
++ /* Tell isn't used so just return 0 */
++ return 0;
++}
++
++/* Returns the total length of the source stream, in bytes. */
++static int32_t mpc_reader_get_size(void *data) {
++ mpc_decoder_t *this = (mpc_decoder_t *) data;
++
++ lprintf("mpc_reader_get_size\n");
++
++ return this->file_size;
++}
++
++/* True if the stream is a seekable stream. */
++static mpc_bool_t mpc_reader_canseek(void *data) {
++ lprintf("mpc_reader_canseek\n");
++
++ return TRUE;
++}
++
++/* Convert 32bit float samples into 16bit int samples */
++static inline void float_to_int(float *_f, int16_t *s16, int samples) {
++ int i;
++ float f;
++ for (i = 0; i < samples; i++) {
++ f = _f[i] * 32767;
++ if (f > INT16_MAX) f = INT16_MAX;
++ if (f < INT16_MIN) f = INT16_MIN;
++ s16[i] = f;
++ /* printf("samples[%d] = %f, %d\n", i, _f[i], s16[num_channels*i]); */
++ }
++}
++
++/* Decode a musepack frame */
++static int mpc_decode_frame (mpc_decoder_t *this) {
++ float buffer[MPC_DECODER_BUFFER_LENGTH];
++ uint32_t frames;
++
++ lprintf("mpd_decode_frame\n");
++
++ frames = mpc_decoder_decode(&this->decoder, buffer, 0, 0);
++
++ if (frames > 0) {
++ audio_buffer_t *audio_buffer;
++ int16_t *int_samples;
++
++ lprintf("got %d samples\n", frames);
++
++ /* Get audio buffer */
++ audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
++ audio_buffer->vpts = 0;
++ audio_buffer->num_frames = frames;
++
++ /* Convert samples */
++ int_samples = (int16_t *) audio_buffer->mem;
++ float_to_int(buffer, int_samples, frames*this->channels);
++
++ /* Output converted samples */
++ this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
++ }
++
++ return frames;
++}
++
++/**************************************************************************
++ * xine audio plugin functions
++ *************************************************************************/
++
++static void mpc_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
++ mpc_decoder_t *this = (mpc_decoder_t *) this_gen;
++ int err;
++
++ lprintf("mpc_decode_data\n");
++
++ if (!_x_stream_info_get(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED))
++ return;
++
++ /* We don't handle special buffers */
++ if (buf->decoder_flags & BUF_FLAG_SPECIAL)
++ return;
++
++ /* Read header */
++ if (buf->decoder_flags & BUF_FLAG_HEADER) {
++
++ lprintf("header\n");
++
++ /* File size is in decoder_info[0] */
++ this->file_size = buf->decoder_info[0];
++
++ /* Initialise the data accumulation buffer */
++ this->buf = xine_xmalloc(INIT_BUFSIZE);
++ this->buf_max = INIT_BUFSIZE;
++ this->read = 0;
++ this->size = 0;
++
++ /* Initialise the reader */
++ this->reader.read = mpc_reader_read;
++ this->reader.seek = mpc_reader_seek;
++ this->reader.tell = mpc_reader_tell;
++ this->reader.get_size = mpc_reader_get_size;
++ this->reader.canseek = mpc_reader_canseek;
++ this->reader.data = this;
++
++ /* Copy header to buffer */
++ xine_fast_memcpy(this->buf, buf->content, buf->size);
++ this->size = buf->size;
++
++ /* Initialise and read stream info */
++ mpc_streaminfo_init(&this->streaminfo);
++
++ if ((err = mpc_streaminfo_read(&this->streaminfo, &this->reader))) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("libmusepack: mpc_streaminfo_read failed: %d\n"), err);
++
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
++ return;
++ }
++
++ this->sample_rate = this->streaminfo.sample_freq;
++ this->channels = this->streaminfo.channels;
++ this->bits_per_sample = 16;
++
++ /* After the header the demuxer starts sending data from an offset
++ * of 28 bytes */
++ this->size = 28;
++
++ /* We need to keep track of the current frame so we now when we've
++ * reached the end of the stream */
++ this->current_frame = 0;
++
++ /* Setup the decoder */
++ mpc_decoder_setup(&this->decoder, &this->reader);
++ this->decoder_ok = 0;
++
++ /* Take this opportunity to initialize stream/meta information */
++ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
++ "Musepack (libmusepack)");
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE,
++ (int) this->streaminfo.average_bitrate);
++
++ return;
++ }
++
++ lprintf("data: %u size=%u read=%u\n", buf->size, this->size, this->read);
++
++ /* if the audio output is not open yet, open the audio output */
++ if (!this->output_open) {
++ this->output_open = this->stream->audio_out->open(
++ this->stream->audio_out,
++ this->stream,
++ this->bits_per_sample,
++ this->sample_rate,
++ (this->channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO);
++ }
++
++ /* if the audio still isn't open, do not go any further with the decode */
++ if (!this->output_open)
++ return;
++
++ /* If we run out of space in our internal buffer we discard what's
++ * already been read */
++ if (((this->size + buf->size) > this->buf_max) && this->read) {
++ lprintf("discarding read data\n");
++ this->size -= this->read;
++ memmove(this->buf, &this->buf[this->read], this->size);
++ this->read = 0;
++ }
++
++ /* If there still isn't space we have to increase the size of the
++ * internal buffer */
++ if ((this->size + buf->size) > this->buf_max) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
++ "libmusepack: increasing internal buffer size\n");
++ this->buf_max += 2*buf->size;
++ this->buf = realloc(this->buf, this->buf_max);
++ }
++
++ /* Copy data */
++ xine_fast_memcpy(&this->buf[this->size], buf->content, buf->size);
++ this->size += buf->size;
++
++ /* Time to decode */
++ if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
++ /* Increment frame count */
++ if (this->current_frame++ == this->streaminfo.frames) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("libmusepack: data after last frame ignored\n"));
++ return;
++ }
++
++ if (!this->decoder_ok) {
++ /* We require MPC_DECODER_MEMSIZE bytes to initialise the decoder */
++ if ((this->size - this->read) >= MPC_DECODER_MEMSIZE) {
++ lprintf("initialise");
++
++ if (!mpc_decoder_initialize(&this->decoder, &this->streaminfo)) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("libmusepack: mpc_decoder_initialise failed\n"));
++
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
++ return;
++ }
++
++ this->decoder_ok = 1;
++ } else {
++ /* Not enough data yet */
++ return;
++ }
++ }
++
++ /* mpc_decoder_decode may cause a read of MPC_DECODER_MEMSIZE/2 bytes so
++ * make sure we have enough data available */
++ if ((this->size - this->read) >= MPC_DECODER_MEMSIZE2) {
++ lprintf("decoding\n");
++
++ if ((err = mpc_decode_frame(this)) < 0) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("libmusepack: mpc_decoder_decode failed: %d\n"), err);
++
++ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
++ return;
++ }
++ }
++
++ /* If we are at the end of the stream we decode the remaining frames as we
++ * know we'll have enough data */
++ if (this->current_frame == this->streaminfo.frames) {
++ lprintf("flushing buffers\n");
++
++ do {
++ if ((err = mpc_decode_frame(this)) < 0) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("libmusepack: mpc_decoder_decode failed: %d\n"), err);
++ }
++ } while (err > 0);
++
++ lprintf("buffers flushed\n");
++ }
++ }
++}
++
++static void mpc_reset (audio_decoder_t *this_gen) {
++ mpc_decoder_t *this = (mpc_decoder_t *) this_gen;
++
++ this->size = 0;
++ this->read = 0;
++}
++
++static void mpc_discontinuity (audio_decoder_t *this_gen) {
++ /* mpc_decoder_t *this = (mpc_decoder_t *) this_gen; */
++}
++
++static void mpc_dispose (audio_decoder_t *this_gen) {
++
++ mpc_decoder_t *this = (mpc_decoder_t *) this_gen;
++
++ /* close the audio output */
++ if (this->output_open)
++ this->stream->audio_out->close (this->stream->audio_out, this->stream);
++ this->output_open = 0;
++
++ /* free anything that was allocated during operation */
++ if (this->buf)
++ free(this->buf);
++
++ free(this);
++}
++
++static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) {
++
++ mpc_decoder_t *this ;
++
++ this = (mpc_decoder_t *) xine_xmalloc (sizeof (mpc_decoder_t));
++
++ /* connect the member functions */
++ this->audio_decoder.decode_data = mpc_decode_data;
++ this->audio_decoder.reset = mpc_reset;
++ this->audio_decoder.discontinuity = mpc_discontinuity;
++ this->audio_decoder.dispose = mpc_dispose;
++
++ /* connect the stream */
++ this->stream = stream;
++
++ /* audio output is not open at the start */
++ this->output_open = 0;
++
++ /* no buffer yet */
++ this->buf = NULL;
++
++ /* initialize the basic audio parameters */
++ this->channels = 0;
++ this->sample_rate = 0;
++ this->bits_per_sample = 0;
++
++ /* return the newly-initialized audio decoder */
++ return &this->audio_decoder;
++}
++
++static char *get_identifier (audio_decoder_class_t *this) {
++ return "mpc";
++}
++
++static char *get_description (audio_decoder_class_t *this) {
++ return "mpc: musepack audio decoder plugin";
++}
++
++static void dispose_class (audio_decoder_class_t *this_gen) {
++
++ mpc_class_t *this = (mpc_class_t *)this_gen;
++
++ free (this);
++}
++
++static void *init_plugin (xine_t *xine, void *data) {
++
++ mpc_class_t *this ;
++
++ this = (mpc_class_t *) xine_xmalloc (sizeof (mpc_class_t));
++
++ this->decoder_class.open_plugin = open_plugin;
++ this->decoder_class.get_identifier = get_identifier;
++ this->decoder_class.get_description = get_description;
++ this->decoder_class.dispose = dispose_class;
++
++ return this;
++}
++
++static uint32_t audio_types[] = {
++ BUF_AUDIO_MPC,
++ 0
++};
++
++static decoder_info_t dec_info_audio = {
++ audio_types, /* supported types */
++ 5 /* priority */
++};
++
++plugin_info_t xine_plugin_info[] = {
++ /* { type, API version, "name", version, special_info, init_function }, */
++ { PLUGIN_AUDIO_DECODER, 15, "mpc", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
++ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
++};
++
+--- ./src/libmusepack/musepack/.cvsignore 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/.cvsignore 9 Feb 2005 19:39:39 -0000 1.1.2.1
+@@ -0,0 +1,2 @@
++Makefile
++Makefile.in
+--- ./src/libmusepack/musepack/Makefile.am 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/Makefile.am 9 Feb 2005 19:39:39 -0000 1.1.2.1
+@@ -0,0 +1,5 @@
++include $(top_srcdir)/misc/Makefile.common
++
++noinst_HEADERS = config_types.h decoder.h huffman.h internal.h math.h \
++ musepack.h reader.h requant.h streaminfo.h
++
+--- ./src/libmusepack/musepack/config_types.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/config_types.h 9 Feb 2005 19:39:39 -0000 1.3.2.1
+@@ -0,0 +1,23 @@
++#ifndef __CONFIG_TYPES_H__
++#define __CONFIG_TYPES_H__
++
++#include "os_types.h"
++
++#ifdef WORDS_BIGENDIAN
++ #undef MPC_LITTLE_ENDIAN
++#else
++ #define MPC_LITTLE_ENDIAN
++#endif
++
++typedef unsigned char mpc_bool_t;
++#define TRUE 1
++#define FALSE 0
++
++/* these are filled in by configure */
++typedef int16_t mpc_int16_t;
++typedef uint16_t mpc_uint16_t;
++typedef int32_t mpc_int32_t;
++typedef uint32_t mpc_uint32_t;
++typedef int64_t mpc_int64_t;
++
++#endif
+--- ./src/libmusepack/musepack/decoder.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/decoder.h 9 Feb 2005 19:39:39 -0000 1.1.2.1
+@@ -0,0 +1,114 @@
++/// \file decoder.h
++
++#ifndef _musepack_decoder_h_
++#define _musepack_decoder_h_
++
++#include "musepack/huffman.h"
++#include "musepack/math.h"
++#include "musepack/musepack.h"
++#include "musepack/reader.h"
++#include "musepack/streaminfo.h"
++
++enum {
++ MPC_V_MEM = 2304,
++ MPC_DECODER_MEMSIZE = 16384, // overall buffer size
++};
++
++typedef struct {
++ mpc_int32_t L [36];
++ mpc_int32_t R [36];
++} QuantTyp;
++
++typedef struct mpc_decoder_t {
++ mpc_reader *r;
++
++ /// @name internal state variables
++ //@{
++
++ mpc_uint32_t dword; /// actually decoded 32bit-word
++ mpc_uint32_t pos; /// bit-position within dword
++ mpc_uint32_t Speicher[MPC_DECODER_MEMSIZE]; /// read-buffer
++ mpc_uint32_t Zaehler; /// actual index within read-buffer
++
++ mpc_uint32_t samples_to_skip;
++
++ mpc_uint32_t FwdJumpInfo;
++ mpc_uint32_t ActDecodePos;
++ mpc_uint32_t FrameWasValid;
++
++ mpc_uint32_t DecodedFrames;
++ mpc_uint32_t OverallFrames;
++ mpc_int32_t SampleRate; // Sample frequency
++
++ mpc_uint32_t StreamVersion; // version of bitstream
++ mpc_uint32_t MS_used; // MS-coding used ?
++ mpc_int32_t Max_Band;
++ mpc_uint32_t MPCHeaderPos; // AB: needed to support ID3v2
++ mpc_uint32_t LastValidSamples;
++ mpc_uint32_t TrueGaplessPresent;
++
++ mpc_uint32_t EQ_activated;
++
++ mpc_uint32_t WordsRead; // counts amount of decoded dwords
++
++ // randomizer state variables
++ mpc_uint32_t __r1;
++ mpc_uint32_t __r2;
++
++ mpc_uint32_t Q_bit [32];
++ mpc_uint32_t Q_res [32][16];
++
++ // huffman table stuff
++ HuffmanTyp HuffHdr [10];
++ HuffmanTyp HuffSCFI [ 4];
++ HuffmanTyp HuffDSCF [16];
++ HuffmanTyp* HuffQ [2] [8];
++
++ HuffmanTyp HuffQ1 [2] [3*3*3];
++ HuffmanTyp HuffQ2 [2] [5*5];
++ HuffmanTyp HuffQ3 [2] [ 7];
++ HuffmanTyp HuffQ4 [2] [ 9];
++ HuffmanTyp HuffQ5 [2] [15];
++ HuffmanTyp HuffQ6 [2] [31];
++ HuffmanTyp HuffQ7 [2] [63];
++ const HuffmanTyp* SampleHuff [18];
++ HuffmanTyp SCFI_Bundle [ 8];
++ HuffmanTyp DSCF_Entropie [13];
++ HuffmanTyp Region_A [16];
++ HuffmanTyp Region_B [ 8];
++ HuffmanTyp Region_C [ 4];
++
++ HuffmanTyp Entropie_1 [ 3];
++ HuffmanTyp Entropie_2 [ 5];
++ HuffmanTyp Entropie_3 [ 7];
++ HuffmanTyp Entropie_4 [ 9];
++ HuffmanTyp Entropie_5 [15];
++ HuffmanTyp Entropie_6 [31];
++ HuffmanTyp Entropie_7 [63];
++
++ mpc_int32_t SCF_Index_L [32] [3];
++ mpc_int32_t SCF_Index_R [32] [3]; // holds scalefactor-indices
++ QuantTyp Q [32]; // holds quantized samples
++ mpc_int32_t Res_L [32];
++ mpc_int32_t Res_R [32]; // holds the chosen quantizer for each subband
++ mpc_int32_t DSCF_Flag_L [32];
++ mpc_int32_t DSCF_Flag_R [32]; // differential SCF used?
++ mpc_int32_t SCFI_L [32];
++ mpc_int32_t SCFI_R [32]; // describes order of transmitted SCF
++ mpc_int32_t DSCF_Reference_L [32];
++ mpc_int32_t DSCF_Reference_R [32]; // holds last frames SCF
++ mpc_int32_t MS_Flag[32]; // MS used?
++#ifdef MPC_FIXED_POINT
++ unsigned char SCF_shift[256];
++#endif
++
++ MPC_SAMPLE_FORMAT V_L[MPC_V_MEM + 960];
++ MPC_SAMPLE_FORMAT V_R[MPC_V_MEM + 960];
++ MPC_SAMPLE_FORMAT Y_L[36][32];
++ MPC_SAMPLE_FORMAT Y_R[36][32];
++ MPC_SAMPLE_FORMAT SCF[256]; ///< holds adapted scalefactors (for clipping prevention)
++ //@}
++
++} mpc_decoder;
++
++#endif // _mpc_decoder_h
+--- ./src/libmusepack/musepack/huffman.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/huffman.h 9 Feb 2005 19:39:40 -0000 1.1.2.1
+@@ -0,0 +1,41 @@
++/// \file huffman.h
++/// Data structures and functions for huffman coding.
++
++#ifndef _musepack_huffman_h_
++#define _musepack_huffman_h_
++
++#include "musepack/config_types.h"
++#include "musepack/decoder.h"
++
++struct mpc_decoder_t; // forward declare to break circular dependencies
++
++/// Huffman table entry.
++typedef struct huffman_type_t {
++ mpc_uint32_t Code;
++ mpc_uint32_t Length;
++ mpc_int32_t Value;
++} HuffmanTyp;
++
++//! \brief Sorts huffman-tables by codeword.
++//!
++//! offset resulting value.
++//! \param elements
++//! \param Table table to sort
++//! \param offset offset of resulting sort
++void
++mpc_decoder_resort_huff_tables(
++ const mpc_uint32_t elements, HuffmanTyp *Table, const mpc_int32_t offset);
++
++/// Initializes sv6 huffman decoding structures.
++void mpc_decoder_init_huffman_sv6(struct mpc_decoder_t *d);
++
++/// Initializes sv6 huffman decoding tables.
++void mpc_decoder_init_huffman_sv6_tables(struct mpc_decoder_t *d);
++
++/// Initializes sv7 huffman decoding structures.
++void mpc_decoder_init_huffman_sv7(struct mpc_decoder_t *d);
++
++/// Initializes sv7 huffman decoding tables.
++void mpc_decoder_init_huffman_sv7_tables(struct mpc_decoder_t *d);
++
++#endif // _musepack_huffman_h_
+--- ./src/libmusepack/musepack/internal.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/internal.h 9 Feb 2005 19:39:40 -0000 1.2.2.1
+@@ -0,0 +1,32 @@
++/// \file musepack_internal.h
++/// Definitions and structures used only internally by the libmusepack.
++
++#ifndef _musepack_internal_h
++#define _musepack_internal_h
++
++enum {
++ MPC_DECODER_SYNTH_DELAY = 481
++};
++
++/// Big/little endian 32 bit byte swapping routine.
++static inline
++mpc_uint32_t swap32(mpc_uint32_t val) {
++ const unsigned char* src = (const unsigned char*)&val;
++ return
++ (mpc_uint32_t)src[0] |
++ ((mpc_uint32_t)src[1] << 8) | ((mpc_uint32_t)src[2] << 16) | ((mpc_uint32_t)src[3] << 24);
++}
++
++/// Searches for a ID3v2-tag and reads the length (in bytes) of it.
++/// \param reader supplying raw stream data
++/// \return size of tag, in bytes
++/// \return -1 on errors of any kind
++mpc_int32_t JumpID3v2(mpc_reader* fp);
++
++/// helper functions used by multiple files
++mpc_uint32_t random_int(mpc_decoder *d); // in synth_filter.c
++void mpc_decoder_initialisiere_quantisierungstabellen(mpc_decoder *d, double scale_factor);
++void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData);
++
++#endif // _musepack_internal_h
++
+--- ./src/libmusepack/musepack/math.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/math.h 9 Feb 2005 19:39:41 -0000 1.1.2.1
+@@ -0,0 +1,110 @@
++/// \file mpc_math.h
++/// Libmusepack internal math routines.
++
++#ifndef _musepack_math_h_
++#define _musepack_math_h_
++
++//#define MPC_FIXED_POINT
++
++#define MPC_FIXED_POINT_SHIFT 16
++
++#ifdef MPC_FIXED_POINT
++
++
++#ifdef _WIN32_WCE
++
++#include <cmnintrin.h>
++
++#define MPC_HAVE_MULHIGH
++
++#endif
++
++
++#define MPC_FIXED_POINT_SCALE_SHIFT (MPC_FIXED_POINT_SHIFT + MPC_FIXED_POINT_FRACTPART)
++#define MPC_FIXED_POINT_SCALE (1 << (MPC_FIXED_POINT_SCALE_SHIFT - 1))
++
++
++//in fixedpoint mode, results in decode output buffer are in -MPC_FIXED_POINT_SCALE ... MPC_FIXED_POINT_SCALE range
++
++#define MPC_FIXED_POINT_FRACTPART 14
++typedef mpc_int32_t MPC_SAMPLE_FORMAT;
++
++typedef mpc_int64_t MPC_SAMPLE_FORMAT_MULTIPLY;
++
++#define MAKE_MPC_SAMPLE(X) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<MPC_FIXED_POINT_FRACTPART))
++#define MAKE_MPC_SAMPLE_EX(X,Y) (MPC_SAMPLE_FORMAT)((double)(X) * (double)(((mpc_int64_t)1)<<(Y)))
++
++#define MPC_MULTIPLY_NOTRUNCATE(X,Y) \
++ (((MPC_SAMPLE_FORMAT_MULTIPLY)(X) * (MPC_SAMPLE_FORMAT_MULTIPLY)(Y)) >> MPC_FIXED_POINT_FRACTPART)
++
++#define MPC_MULTIPLY_EX_NOTRUNCATE(X,Y,Z) \
++ (((MPC_SAMPLE_FORMAT_MULTIPLY)(X) * (MPC_SAMPLE_FORMAT_MULTIPLY)(Y)) >> (Z))
++
++#ifdef _DEBUG
++static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2)
++{
++ MPC_SAMPLE_FORMAT_MULTIPLY temp = MPC_MULTIPLY_NOTRUNCATE(item1,item2);
++ assert(temp == (MPC_SAMPLE_FORMAT_MULTIPLY)(MPC_SAMPLE_FORMAT)temp);
++ return (MPC_SAMPLE_FORMAT)temp;
++}
++
++static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2,unsigned shift)
++{
++ MPC_SAMPLE_FORMAT_MULTIPLY temp = MPC_MULTIPLY_EX_NOTRUNCATE(item1,item2,shift);
++ assert(temp == (MPC_SAMPLE_FORMAT_MULTIPLY)(MPC_SAMPLE_FORMAT)temp);
++ return (MPC_SAMPLE_FORMAT)temp;
++}
++
++#else
++
++#define MPC_MULTIPLY(X,Y) ((MPC_SAMPLE_FORMAT)MPC_MULTIPLY_NOTRUNCATE(X,Y))
++#define MPC_MULTIPLY_EX(X,Y,Z) ((MPC_SAMPLE_FORMAT)MPC_MULTIPLY_EX_NOTRUNCATE(X,Y,Z))
++
++#endif
++
++#ifdef MPC_HAVE_MULHIGH
++#define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y)
++#else
++#define MPC_MULTIPLY_FRACT(X,Y) MPC_MULTIPLY_EX(X,Y,32)
++#endif
++
++#define MPC_MAKE_FRACT_CONST(X) (MPC_SAMPLE_FORMAT)((X) * (double)(((mpc_int64_t)1)<<32) )
++#define MPC_MULTIPLY_FRACT_CONST(X,Y) MPC_MULTIPLY_FRACT(X,MPC_MAKE_FRACT_CONST(Y))
++#define MPC_MULTIPLY_FRACT_CONST_FIX(X,Y,Z) ( MPC_MULTIPLY_FRACT(X,MPC_MAKE_FRACT_CONST( Y / (1<<(Z)) )) << (Z) )
++#define MPC_MULTIPLY_FRACT_CONST_SHR(X,Y,Z) MPC_MULTIPLY_FRACT(X,MPC_MAKE_FRACT_CONST( Y / (1<<(Z)) ))
++
++#define MPC_MULTIPLY_FLOAT_INT(X,Y) ((X)*(Y))
++#define MPC_SCALE_CONST(X,Y,Z) MPC_MULTIPLY_EX(X,MAKE_MPC_SAMPLE_EX(Y,Z),(Z))
++#define MPC_SCALE_CONST_SHL(X,Y,Z,S) MPC_MULTIPLY_EX(X,MAKE_MPC_SAMPLE_EX(Y,Z),(Z)-(S))
++#define MPC_SCALE_CONST_SHR(X,Y,Z,S) MPC_MULTIPLY_EX(X,MAKE_MPC_SAMPLE_EX(Y,Z),(Z)+(S))
++#define MPC_SHR(X,Y) ((X)>>(Y))
++#define MPC_SHL(X,Y) ((X)<<(Y))
++
++#else
++
++//in floating-point mode, decoded samples are in -1...1 range
++
++typedef float MPC_SAMPLE_FORMAT;
++
++#define MAKE_MPC_SAMPLE(X) ((MPC_SAMPLE_FORMAT)(X))
++#define MAKE_MPC_SAMPLE_EX(X,Y) ((MPC_SAMPLE_FORMAT)(X))
++
++#define MPC_MULTIPLY_FRACT(X,Y) ((X)*(Y))
++#define MPC_MAKE_FRACT_CONST(X) (X)
++#define MPC_MULTIPLY_FRACT_CONST(X,Y) MPC_MULTPLY_FRACT(X,MPC_MAKE_FRACT_CONST(Y))
++#define MPC_MULTIPLY_FRACT_CONST_SHR(X,Y,Z) MPC_MULTIPLY_FRACT(X,MPC_MAKE_FRACT_CONST( Y ))
++#define MPC_MULTIPLY_FRACT_CONST_FIX(X,Y,Z) MPC_MULTIPLY_FRACT(X,MPC_MAKE_FRACT_CONST( Y ))
++
++#define MPC_MULTIPLY_FLOAT_INT(X,Y) ((X)*(Y))
++#define MPC_MULTIPLY(X,Y) ((X)*(Y))
++#define MPC_MULTIPLY_EX(X,Y,Z) ((X)*(Y))
++#define MPC_SCALE_CONST(X,Y,Z) ((X)*(Y))
++#define MPC_SCALE_CONST_SHL(X,Y,Z,S) ((X)*(Y))
++#define MPC_SCALE_CONST_SHR(X,Y,Z,S) ((X)*(Y))
++#define MPC_SHR(X,Y) (X)
++#define MPC_SHL(X,Y) (X)
++
++#endif
++
++#endif // _musepack_math_h_
++
+--- ./src/libmusepack/musepack/musepack.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/musepack.h 9 Feb 2005 19:39:41 -0000 1.2.2.1
+@@ -0,0 +1,94 @@
++/// \file musepack.h
++/// Top level include file for libmusepack.
++
++#ifndef _musepack_h_
++#define _musepack_h_
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <math.h>
++
++#include "musepack/config_types.h"
++#include "musepack/decoder.h"
++#include "musepack/math.h"
++#include "musepack/reader.h"
++#include "musepack/streaminfo.h"
++
++enum {
++ MPC_FRAME_LENGTH = (36 * 32), /// samples per mpc frame
++ MPC_DECODER_BUFFER_LENGTH = 4 * MPC_FRAME_LENGTH /// required buffer size for decoder
++};
++
++// error codes
++#define ERROR_CODE_OK 0
++#define ERROR_CODE_FILE -1
++#define ERROR_CODE_SV7BETA 1
++#define ERROR_CODE_CBR 2
++#define ERROR_CODE_IS 3
++#define ERROR_CODE_BLOCKSIZE 4
++#define ERROR_CODE_INVALIDSV 5
++
++/// Initializes a streaminfo structure.
++/// \param si streaminfo structure to initialize
++void mpc_streaminfo_init(mpc_streaminfo *si);
++
++/// Reads streaminfo header from the mpc stream supplied by r.
++/// \param si streaminfo pointer to which info will be written
++/// \param r stream reader to supply raw data
++/// \return error code
++mpc_int32_t mpc_streaminfo_read(mpc_streaminfo *si, mpc_reader *r);
++
++/// Gets length of stream si, in seconds.
++/// \return length of stream in seconds
++double mpc_streaminfo_get_length(mpc_streaminfo *si);
++
++/// Returns length of stream si, in samples.
++/// \return length of stream in samples
++mpc_int64_t mpc_streaminfo_get_length_samples(mpc_streaminfo *si);
++
++/// Sets up decoder library.
++/// Call this first when preparing to decode an mpc stream.
++/// \param r reader that will supply raw data to the decoder
++void mpc_decoder_setup(mpc_decoder *d, mpc_reader *r);
++
++/// Initializes mpc decoder with the supplied stream info parameters.
++/// Call this next after calling mpc_decoder_setup.
++/// \param si streaminfo structure indicating format of source stream
++/// \return TRUE if decoder was initalized successfully, FALSE otherwise
++mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si);
++
++/// Sets decoder sample scaling factor. All decoded samples will be multiplied
++/// by this factor.
++/// \param scale_factor multiplicative scaling factor
++void mpc_decoder_scale_output(mpc_decoder *d, double scale_factor);
++
++/// Actually reads data from previously initialized stream. Call
++/// this iteratively to decode the mpc stream.
++/// \param buffer destination buffer for decoded samples
++/// \param vbr_update_acc \todo document me
++/// \param vbr_update_bits \todo document me
++/// \return -1 if an error is encountered
++/// \return 0 if the stream has been completely decoded successfully and there are no more samples
++/// \return > 0 to indicate the number of bytes that were actually read from the stream.
++mpc_uint32_t mpc_decoder_decode(
++ mpc_decoder *d,
++ MPC_SAMPLE_FORMAT *buffer,
++ mpc_uint32_t *vbr_update_acc,
++ mpc_uint32_t *vbr_update_bits);
++
++/// Seeks to the specified sample in the source stream.
++mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
++
++/// Seeks to specified position in seconds in the source stream.
++mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *d, double seconds);
++
++#ifdef __cplusplus
++}
++#endif // __cplusplus
++
++#endif // _musepack_h_
+--- ./src/libmusepack/musepack/reader.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/reader.h 9 Feb 2005 19:39:41 -0000 1.2.2.1
+@@ -0,0 +1,46 @@
++/// \file reader.h
++
++#ifndef _musepack_reader_h_
++#define _musepack_reader_h_
++
++/// \brief Stream reader interface structure.
++///
++/// This is the structure you must supply to the musepack decoding library
++/// to feed it with raw data. Implement the five member functions to provide
++/// a functional reader.
++typedef struct mpc_reader_t {
++ /// Reads size bytes of data into buffer at ptr.
++ mpc_int32_t (*read)(void *t, void *ptr, mpc_int32_t size);
++
++ /// Seeks to byte position offset.
++ mpc_bool_t (*seek)(void *t, mpc_int32_t offset);
++
++ /// Returns the current byte offset in the stream.
++ mpc_int32_t (*tell)(void *t);
++
++ /// Returns the total length of the source stream, in bytes.
++ mpc_int32_t (*get_size)(void *t);
++
++ /// True if the stream is a seekable stream.
++ mpc_bool_t (*canseek)(void *t);
++
++ /// Optional field that can be used to identify a particular instance of
++ /// reader or carry along data associated with that reader.
++ void *data;
++
++ // These are used by provided internal standard file-based reader implementation.
++ // You shouldn't touch them. They're included in the main struct to avoid
++ // malloc/free.
++ FILE *file;
++ long file_size;
++ mpc_bool_t is_seekable;
++} mpc_reader;
++
++/// Initializes reader with default stdio file reader implementation. Use
++/// this if you're just reading from a plain file.
++///
++/// \param r reader struct to initalize
++/// \param input input stream to attach to the reader
++void mpc_reader_setup_file_reader(mpc_reader *r, FILE *input);
++
++#endif // _musepack_reader_h_
+--- ./src/libmusepack/musepack/requant.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/requant.h 9 Feb 2005 19:39:41 -0000 1.1.2.1
+@@ -0,0 +1,17 @@
++/// \file requant.h
++/// Requantization function definitions.
++
++#ifndef _musepack_requant_h
++#define _musepack_requant_h_
++
++#include "musepack/musepack.h"
++
++/* C O N S T A N T S */
++extern const mpc_uint32_t Res_bit [18]; // bits per sample for chosen quantizer
++extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; // coefficients for requantization
++extern const mpc_int32_t __Dc [1 + 18]; // offset for requantization
++
++#define Cc (__Cc + 1)
++#define Dc (__Dc + 1)
++
++#endif // _musepack_requant_h_
+--- ./src/libmusepack/musepack/streaminfo.h 1 Jan 1970 00:00:00 -0000
++++ ./src/libmusepack/musepack/streaminfo.h 9 Feb 2005 19:39:41 -0000 1.1.2.1
+@@ -0,0 +1,52 @@
++/// \file streaminfo.h
++
++#ifndef _musepack_streaminfo_h_
++#define _musepack_streaminfo_h_
++
++typedef mpc_int32_t mpc_streaminfo_off_t;
++
++/// \brief mpc stream properties structure
++///
++/// Structure containing all the properties of an mpc stream. Populated
++/// by the streaminfo_read function.
++typedef struct mpc_streaminfo {
++ /// @name core mpc stream properties
++ //@{
++ mpc_uint32_t sample_freq; ///< sample frequency of stream
++ mpc_uint32_t channels; ///< number of channels in stream
++ mpc_streaminfo_off_t header_position; ///< byte offset of position of header in stream
++ mpc_uint32_t stream_version; ///< streamversion of stream
++ mpc_uint32_t bitrate; ///< bitrate of stream file (in bps)
++ double average_bitrate; ///< average bitrate of stream (in bits/sec)
++ mpc_uint32_t frames; ///< number of frames in stream
++ mpc_int64_t pcm_samples;
++ mpc_uint32_t max_band; ///< maximum band-index used in stream (0...31)
++ mpc_uint32_t is; ///< intensity stereo (0: off, 1: on)
++ mpc_uint32_t ms; ///< mid/side stereo (0: off, 1: on)
++ mpc_uint32_t block_size; ///< only needed for SV4...SV6 -> not supported
++ mpc_uint32_t profile; ///< quality profile of stream
++ const char* profile_name; ///< name of profile used by stream
++ //@}
++
++ /// @name replaygain related fields
++ //@{
++ mpc_int16_t gain_title; ///< replaygain title value
++ mpc_int16_t gain_album; ///< replaygain album value
++ mpc_uint16_t peak_album; ///< peak album loudness level
++ mpc_uint16_t peak_title; ///< peak title loudness level
++ //@}
++
++ /// @name true gapless support data
++ //@{
++ mpc_uint32_t is_true_gapless; ///< true gapless? (0: no, 1: yes)
++ mpc_uint32_t last_frame_samples; ///< number of valid samples within last frame
++
++ mpc_uint32_t encoder_version; ///< version of encoder used
++ char encoder[256]; ///< encoder name
++
++ mpc_streaminfo_off_t tag_offset; ///< offset to file tags
++ mpc_streaminfo_off_t total_file_length; ///< total length of underlying file
++ //@}
++} mpc_streaminfo;
++
++#endif // _musepack_streaminfo_h_
+--- ./src/libvorbis/xine_decoder.c 16 Dec 2004 13:59:10 -0000 1.42
++++ ./src/libvorbis/xine_decoder.c 9 Feb 2005 19:39:41 -0000 1.42.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xine_decoder.c,v 1.42 2004/12/16 13:59:10 mroi Exp $
++ * $Id: xine_decoder.c,v 1.42.2.1 2005/02/09 19:39:41 mroi Exp $
+ *
+ * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine
+ */
+@@ -100,6 +100,7 @@
+ {"TITLE=", XINE_META_INFO_TITLE},
+ {"GENRE=", XINE_META_INFO_GENRE},
+ {"DESCRIPTION=", XINE_META_INFO_COMMENT},
++ {"COMMENT=", XINE_META_INFO_COMMENT},
+ {"DATE=", XINE_META_INFO_YEAR},
+ {"TRACKNUMBER=", XINE_META_INFO_TRACK_NUMBER},
+ {NULL, 0}
+--- ./src/libw32dll/wine/win32.c 24 Nov 2004 21:43:59 -0000 1.29
++++ ./src/libw32dll/wine/win32.c 15 Jan 2005 17:51:42 -0000 1.29.2.1
+@@ -4243,10 +4243,15 @@
+ );
+ }
+
+-/* #warning check for _CIpow */
+-static double exp_CIpow(double x, double y)
++#define FPU_DOUBLES(var1,var2) double var1,var2; \
++ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \
++ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : )
++
++static double exp_CIpow(void)
+ {
+- /*printf("Pow %f %f 0x%Lx 0x%Lx => %f\n", x, y, *((int64_t*)&x), *((int64_t*)&y), pow(x, y));*/
++ FPU_DOUBLES(x,y);
++
++ dbgprintf("_CIpow(%lf, %lf)\n", x, y);
+ return pow(x, y);
+ }
+
+--- ./src/post/planar/pp.c 17 Apr 2004 19:54:32 -0000 1.6
++++ ./src/post/planar/pp.c 15 Jan 2005 17:51:43 -0000 1.6.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: pp.c,v 1.6 2004/04/17 19:54:32 mroi Exp $
++ * $Id: pp.c,v 1.6.2.1 2005/01/15 17:51:43 mroi Exp $
+ *
+ * plugin for ffmpeg libpostprocess
+ */
+@@ -117,17 +117,10 @@
+ static char *help = NULL;
+
+ if( !help ) {
+- char *s;
+-
+ help = malloc( strlen(help1) + strlen(help2) + strlen(pp_help) + 1);
+ strcpy(help, help1);
+ strcat(help, pp_help);
+ strcat(help, help2);
+-
+- /* tab is not correctly displayed in xine-ui */
+- for( s = help; *s; s++ )
+- if( *s == '\t' )
+- *s = ' ';
+ }
+ return help;
+ }
+--- ./src/post/planar/unsharp.c 17 Apr 2004 19:54:32 -0000 1.14
++++ ./src/post/planar/unsharp.c 9 Feb 2005 19:39:41 -0000 1.14.2.2
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: unsharp.c,v 1.14 2004/04/17 19:54:32 mroi Exp $
++ * $Id: unsharp.c,v 1.14.2.2 2005/02/09 19:39:41 mroi Exp $
+ *
+ * mplayer's unsharp
+ * Copyright (C) 2002 Rmi Guyomarch <rguyom@pobox.com>
+@@ -238,7 +238,7 @@
+ " Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 sharpen)\n"
+ "\n"
+ "\n"
+- "* mplayer's unsharp (C) 2002 Rmi Guyomarch\n"
++ "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
+ );
+ }
+
+--- ./src/video_out/alphablend.c 12 Dec 2004 22:01:27 -0000 1.47
++++ ./src/video_out/alphablend.c 9 Feb 2005 19:39:41 -0000 1.47.2.1
+@@ -863,7 +863,7 @@
+ uint8_t *data[ 3 ][ 2 ];
+ } **header = (struct header_s **)&extra_data->buffer;
+
+- int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ 2 ][ osd_width ]);
++ int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ][ 2 ]);
+
+ if (extra_data->buffer_size < needed_buffer_size) {
+
+@@ -1248,7 +1248,7 @@
+ uint8_t *data[ 3 ];
+ } **header = (struct header_s **)&extra_data->buffer;
+
+- int needed_buffer_size = sizeof (**header) + sizeof (uint8_t[ 3 ][ osd_width ]);
++ int needed_buffer_size = sizeof (**header) + osd_width * sizeof (uint8_t[ 3 ]);
+
+ if (extra_data->buffer_size < needed_buffer_size) {
+
+--- ./src/video_out/video_out_vidix.c 12 Dec 2004 22:01:29 -0000 1.67
++++ ./src/video_out/video_out_vidix.c 9 Feb 2005 19:39:42 -0000 1.67.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: video_out_vidix.c,v 1.67 2004/12/12 22:01:29 mroi Exp $
++ * $Id: video_out_vidix.c,v 1.67.2.1 2005/02/09 19:39:42 mroi Exp $
+ *
+ * video_out_vidix.c
+ *
+@@ -180,16 +180,19 @@
+
+ static void write_frame_YUV420P2(vidix_driver_t* this, vidix_frame_t* frame)
+ {
+- uint8_t* y = (uint8_t *)frame->vo_frame.base[0];
+- uint8_t* cb = (uint8_t *)frame->vo_frame.base[1];
+- uint8_t* cr = (uint8_t *)frame->vo_frame.base[2];
++ uint8_t* y = frame->vo_frame.base[0] + this->sc.displayed_xoffset +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[0];
++ uint8_t* cb = frame->vo_frame.base[1] + this->sc.displayed_xoffset/2 +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[1]/2;
++ uint8_t* cr = frame->vo_frame.base[2]+this->sc.displayed_xoffset/2 +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[2]/2;
+ uint8_t* dst8 = (this->vidix_mem +
+ this->vidix_play.offsets[this->next_frame] +
+ this->vidix_play.offset.y);
+ int h, w;
+
+- for(h = 0; h < frame->height; h++) {
+- xine_fast_memcpy(dst8, y, frame->width);
++ for(h = 0; h < this->sc.displayed_height; h++) {
++ xine_fast_memcpy(dst8, y, this->sc.displayed_width);
+ y += frame->vo_frame.pitches[0];
+ dst8 += this->dstrides.y;
+ }
+@@ -197,8 +200,8 @@
+ dst8 = (this->vidix_mem + this->vidix_play.offsets[this->next_frame] +
+ this->vidix_play.offset.v);
+
+- for(h = 0; h < (frame->height / 2); h++) {
+- for(w = 0; w < (frame->width / 2); w++) {
++ for(h = 0; h < (this->sc.displayed_height / 2); h++) {
++ for(w = 0; w < (this->sc.displayed_height / 2); w++) {
+ dst8[2*w+0] = cb[w];
+ dst8[2*w+1] = cr[w];
+ }
+@@ -216,43 +219,53 @@
+ case XINE_IMGFMT_YUY2:
+ yuy2_to_yuy2(
+ /* src */
+- frame->vo_frame.base[0], frame->vo_frame.pitches[0],
++ frame->vo_frame.base[0]+this->sc.displayed_xoffset*2+
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[0],
++ frame->vo_frame.pitches[0],
+ /* dst */
+ base+this->vidix_play.offset.y, this->dstrides.y,
+ /* width x height */
+- frame->width, frame->height);
++ this->sc.displayed_width, this->sc.displayed_height);
+ break;
+
+- case XINE_IMGFMT_YV12:
++ case XINE_IMGFMT_YV12: {
++ uint8_t* y = frame->vo_frame.base[0] + this->sc.displayed_xoffset +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[0];
++ uint8_t* cb = frame->vo_frame.base[1] + this->sc.displayed_xoffset/2 +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[1]/2;
++ uint8_t* cr = frame->vo_frame.base[2] + this->sc.displayed_xoffset/2 +
++ this->sc.displayed_yoffset*frame->vo_frame.pitches[2]/2;
++
+ if(this->supports_yv12) {
+ if(this->vidix_play.flags & VID_PLAY_INTERLEAVED_UV)
+ write_frame_YUV420P2(this, frame);
+ else
+ yv12_to_yv12(
+ /* Y */
+- frame->vo_frame.base[0], frame->vo_frame.pitches[0],
++ y, frame->vo_frame.pitches[0],
+ base+this->vidix_play.offset.y, this->dstrides.y,
+ /* U */
+- frame->vo_frame.base[2], frame->vo_frame.pitches[2],
++ cr, frame->vo_frame.pitches[2],
+ base+this->vidix_play.offset.u, this->dstrides.u/2,
+ /* V */
+- frame->vo_frame.base[1], frame->vo_frame.pitches[1],
++ cb, frame->vo_frame.pitches[1],
+ base+this->vidix_play.offset.v, this->dstrides.v/2,
+ /* width x height */
+- frame->width, frame->height);
++ this->sc.displayed_width, this->sc.displayed_height);
+ } else
+ yv12_to_yuy2(
+ /* src */
+- frame->vo_frame.base[0], frame->vo_frame.pitches[0],
+- frame->vo_frame.base[1], frame->vo_frame.pitches[1],
+- frame->vo_frame.base[2], frame->vo_frame.pitches[2],
++ y, frame->vo_frame.pitches[0],
++ cb, frame->vo_frame.pitches[1],
++ cr, frame->vo_frame.pitches[2],
+ /* dst */
+ base+this->vidix_play.offset.y, this->dstrides.y,
+ /* width x height */
+- frame->width, frame->height,
++ this->sc.displayed_width, this->sc.displayed_height,
+ /* progressive */
+ frame->vo_frame.progressive_frame);
+ break;
++ }
+
+ default:
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG,
+@@ -399,6 +412,18 @@
+
+ _x_vo_scale_compute_output_size( &this->sc );
+
++ /* We require that the displayed xoffset and width are even.
++ * To prevent displaying more than we're supposed to we round the
++ * xoffset up and the width down */
++ this->sc.displayed_xoffset = (this->sc.displayed_xoffset+1) & ~1;
++ this->sc.displayed_width = this->sc.displayed_width & ~1;
++
++ /* For yv12 source displayed yoffset and height need to be even too */
++ if(this->delivered_format == XINE_IMGFMT_YV12) {
++ this->sc.displayed_yoffset = (this->sc.displayed_yoffset+1) & ~1;
++ this->sc.displayed_height = this->sc.displayed_height & ~1;
++ }
++
+ if( this->vidix_started > 0 ) {
+ lprintf("video_out_vidix: overlay off\n");
+ vdlPlaybackOff(this->vidix_handler);
+@@ -413,8 +438,8 @@
+
+ this->vidix_play.capability = this->vidix_cap.flags; /* every ;) */
+ this->vidix_play.blend_factor = 0; /* for now */
+- this->vidix_play.src.x = this->sc.displayed_xoffset;
+- this->vidix_play.src.y = this->sc.displayed_yoffset;
++ this->vidix_play.src.x = 0;
++ this->vidix_play.src.y = 0;
+ this->vidix_play.src.w = this->sc.displayed_width;
+ this->vidix_play.src.h = this->sc.displayed_height;
+ this->vidix_play.dest.x = this->sc.gui_win_x+this->sc.output_xoffset;
+@@ -432,27 +457,27 @@
+ return;
+ }
+
+- lprintf("video_out_vidix: dga_addr = %p frame_size = %d frames = %d\n",
++ lprintf("video_out_vidix: dga_addr = %p frame_size = %u frames = %u\n",
+ this->vidix_play.dga_addr, this->vidix_play.frame_size,
+ this->vidix_play.num_frames );
+
+- lprintf("video_out_vidix: offsets[0..2] = %d %d %d\n",
++ lprintf("video_out_vidix: offsets[0..2] = %u %u %u\n",
+ this->vidix_play.offsets[0], this->vidix_play.offsets[1],
+ this->vidix_play.offsets[2] );
+
+- lprintf("video_out_vidix: offset.y/u/v = %d/%d/%d\n",
++ lprintf("video_out_vidix: offset.y/u/v = %u/%u/%u\n",
+ this->vidix_play.offset.y, this->vidix_play.offset.u,
+ this->vidix_play.offset.v );
+
+- lprintf("video_out_vidix: src.x/y/w/h = %d/%d/%d/%d\n",
++ lprintf("video_out_vidix: src.x/y/w/h = %u/%u/%u/%u\n",
+ this->vidix_play.src.x, this->vidix_play.src.y,
+ this->vidix_play.src.w, this->vidix_play.src.h );
+
+- lprintf("video_out_vidix: dest.x/y/w/h = %d/%d/%d/%d\n",
++ lprintf("video_out_vidix: dest.x/y/w/h = %u/%u/%u/%u\n",
+ this->vidix_play.dest.x, this->vidix_play.dest.y,
+ this->vidix_play.dest.w, this->vidix_play.dest.h );
+
+- lprintf("video_out_vidix: dest.pitch.y/u/v = %d/%d/%d\n",
++ lprintf("video_out_vidix: dest.pitch.y/u/v = %u/%u/%u\n",
+ this->vidix_play.dest.pitch.y, this->vidix_play.dest.pitch.u,
+ this->vidix_play.dest.pitch.v );
+
+@@ -468,15 +493,15 @@
+ switch(this->vidix_play.fourcc) {
+ case IMGFMT_YV12:
+ apitch = this->vidix_play.dest.pitch.y-1;
+- this->dstrides.y = (this->sc.delivered_width + apitch) & ~apitch;
++ this->dstrides.y = (this->sc.displayed_width + apitch) & ~apitch;
+ apitch = this->vidix_play.dest.pitch.v-1;
+- this->dstrides.v = (this->sc.delivered_width + apitch) & ~apitch;
++ this->dstrides.v = (this->sc.displayed_width + apitch) & ~apitch;
+ apitch = this->vidix_play.dest.pitch.u-1;
+- this->dstrides.u = (this->sc.delivered_width + apitch) & ~apitch;
++ this->dstrides.u = (this->sc.displayed_width + apitch) & ~apitch;
+ break;
+ case IMGFMT_YUY2:
+ apitch = this->vidix_play.dest.pitch.y-1;
+- this->dstrides.y = (this->sc.delivered_width*2 + apitch) & ~apitch;
++ this->dstrides.y = (this->sc.displayed_width*2 + apitch) & ~apitch;
+ break;
+ default:
+ xprintf(this->xine, XINE_VERBOSITY_DEBUG,
+--- ./src/video_out/libdha/oth/pci.db 13 Jan 2004 21:56:15 -0000 1.5
++++ ./src/video_out/libdha/oth/pci.db 9 Feb 2005 19:39:42 -0000 1.5.2.1
+@@ -2,8 +2,28 @@
+ v 001a Ascend Communications, Inc. 0
+ v 0033 Paradyne corp. 0
+ v 003d Lockheed Martin-Marietta Corp 0
++v 0059 Tiger Jet Network Inc. (Wrong ID) 0 Real TJN ID is e159, but they got it wrong several times --mj
+ v 0070 Hauppauge computer works Inc. 0
++d 00704000 WinTV PVR-350 0
++d 00704001 WinTV PVR-250 (v1) 0
++d 00704009 WinTV PVR-250 0
++d 00704801 WinTV PVR-250 MCE 0
++v 0071 Nebula Electronics Ltd. 0
++v 0095 Silicon Image, Inc. (Wrong ID) 0
++d 00950680 Ultra ATA/133 IDE RAID CONTROLLER CARD 0
+ v 0100 Ncipher Corp Ltd 0
++v 018a LevelOne 0 018a is not LevelOne but there is a board misprogrammed
++d 018a0106 FPC-0106TX misprogrammed [RTL81xx] 0
++v 021b Compaq Computer Corporation 0 021b is not Compaq but there is a board misprogrammed
++d 021b8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] 0
++v 0291 Davicom Semiconductor, Inc. 0 http://www.davicom.com.tw/
++d 02918212 DM9102A(DM9102AE, SM9102AF) Ethernet 100/10 MBit(Rev 40) 0
++v 02ac SpeedStream 0 SpeedStream is Efficient Networks, Inc, a Siemens Company
++d 02ac1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] 0
++v 0357 TTTech AG 0
++d 0357000a TTP-Monitoring Card V2.0 0
++v 05e3 CyberDoor 0
++d 05e30701 CBD516 0
+ v 0675 Dynalink 0
+ d 06751700 IS64PH ISDN Adapter 0
+ d 06751702 IS64PH ISDN Adapter 0
+@@ -11,11 +31,28 @@
+ v 09c1 Arris 0
+ d 09c10704 CM 200E Cable Modem 0
+ v 0a89 BREA Technologies Inc 0
++v 0b49 ASCII Corporation 0
++d 0b49064f Trance Vibrator 0 see http://homepage1.nifty.com/mcn/lab/machines/trance_vibrator/usbview.vib.txt
+ v 0e11 Compaq Computer Corporation 0
+ d 0e110001 PCI to EISA Bridge 0
+ d 0e110002 PCI to ISA Bridge 0
++d 0e110046 Smart Array 64xx 0
++s 0e1100460e11409a Smart Array 641 0
++s 0e1100460e11409b Smart Array 642 0
++s 0e1100460e11409c Smart Array 6400 0
++s 0e1100460e11409d Smart Array 6400 EM 0
+ d 0e110049 NC7132 Gigabit Upgrade Module 0
+ d 0e11004a NC6136 Gigabit Server Adapter 0
++d 0e11007c NC7770 1000BaseTX 0
++d 0e11007d NC6770 1000BaseTX 0
++d 0e110085 NC7780 1000BaseTX 0
++d 0e1100bb NC7760 0
++d 0e1100ca NC7771 0
++d 0e1100cb NC7781 0
++d 0e1100cf NC7772 0
++d 0e1100d0 NC7782 0
++d 0e1100d1 NC7783 0
++d 0e1100e3 NC7761 0
+ d 0e110508 Netelligent 4/16 Token Ring 0
+ d 0e111000 Triflex/Pentium Bridge, Model 1000 0
+ d 0e112000 Triflex/Pentium Bridge, Model 2000 0
+@@ -23,6 +60,25 @@
+ d 0e113033 QVision 1280/p 0
+ d 0e113034 QVision 1280/p 0
+ d 0e114000 4000 [Triflex] 0
++d 0e114030 SMART-2/P 0
++d 0e114031 SMART-2SL 0
++d 0e114032 Smart Array 3200 0
++d 0e114033 Smart Array 3100ES 0
++d 0e114034 Smart Array 221 0
++d 0e114040 Integrated Array 0
++d 0e114048 Compaq Raid LC2 0
++d 0e114050 Smart Array 4200 0
++d 0e114051 Smart Array 4250ES 0
++d 0e114058 Smart Array 431 0
++d 0e114070 Smart Array 5300 0
++d 0e114080 Smart Array 5i 0
++d 0e114082 Smart Array 532 0
++d 0e114083 Smart Array 5312 0
++d 0e114091 Smart Array 6i 0
++d 0e11409a Smart Array 641 0
++d 0e11409b Smart Array 642 0
++d 0e11409c Smart Array 6400 0
++d 0e11409d Smart Array 6400 EM 0
+ d 0e116010 HotPlug PCI Bridge 6010 0
+ d 0e117020 USB Controller 0
+ d 0e11a0ec Fibre Channel Host Controller 0
+@@ -32,7 +88,7 @@
+ s 0e11a0f78086002a PCI Hotplug Controller A 0
+ s 0e11a0f78086002b PCI Hotplug Controller B 0
+ d 0e11a0f8 ZFMicro Chipset USB 0
+-d 0e11a0fc Fibre Channel Host Controller 0
++d 0e11a0fc FibreChannel HBA Tachyon 0
+ d 0e11ae10 Smart-2/P RAID Controller 0
+ s 0e11ae100e114030 Smart-2/P Array Controller 0
+ s 0e11ae100e114031 Smart-2SL Array Controller 0
+@@ -42,21 +98,21 @@
+ d 0e11ae2a MPC 0
+ d 0e11ae2b MIS-E 0
+ d 0e11ae31 System Management Controller 0
+-d 0e11ae32 Netelligent 10/100 0
++d 0e11ae32 Netelligent 10/100 TX PCI UTP 0
+ d 0e11ae33 Triflex Dual EIDE Controller 0
+-d 0e11ae34 Netelligent 10 0
++d 0e11ae34 Netelligent 10 T PCI UTP 0
+ d 0e11ae35 Integrated NetFlex-3/P 0
+-d 0e11ae40 Netelligent 10/100 Dual 0
+-d 0e11ae43 ProLiant Integrated Netelligent 10/100 0
++d 0e11ae40 Netelligent Dual 10/100 TX PCI UTP 0
++d 0e11ae43 Netelligent Integrated 10/100 TX UTP 0
+ d 0e11ae69 CETUS-L 0
+ d 0e11ae6c Northstar 0
+ d 0e11ae6d NorthStar CPU to PCI Bridge 0
+-d 0e11b011 Integrated Netelligent 10/100 0
+-d 0e11b012 Netelligent 10 T/2 0
++d 0e11b011 Netelligent 10/100 TX Embedded UTP 0
++d 0e11b012 Netelligent 10 T/2 PCI UTP/Coax 0
+ d 0e11b01e NC3120 Fast Ethernet NIC 0
+ d 0e11b01f NC3122 Fast Ethernet NIC 0
+ d 0e11b02f NC1120 Ethernet NIC 0
+-d 0e11b030 Netelligent WS 5100 0
++d 0e11b030 Netelligent 10/100 TX UTP 0
+ d 0e11b04a 10/100 TX PCI Intel WOL UTP Controller 0
+ d 0e11b060 Smart Array 5300 Controller 0
+ d 0e11b0c6 NC3161 Fast Ethernet NIC 0
+@@ -74,59 +130,138 @@
+ d 0e11b163 NC3134 Fast Ethernet NIC 0
+ d 0e11b164 NC3165 Fast Ethernet Upgrade Module 0
+ d 0e11b178 Smart Array 5i/532 0
++s 0e11b1780e114080 Smart Array 5i 0
++s 0e11b1780e114082 Smart Array 532 0
++s 0e11b1780e114083 Smart Array 5312 0
+ d 0e11b1a4 NC7131 Gigabit Server Adapter 0
++d 0e11b200 Memory Hot-Plug Controller 0 HP Memory Hot-Plug Controller
++d 0e11b203 Integrated Lights Out Controller 0
++d 0e11b204 Integrated Lights Out Processor 0
+ d 0e11f130 NetFlex-3/P ThunderLAN 1.0 0
+ d 0e11f150 NetFlex-3/P ThunderLAN 2.3 0
+ v 0e55 HaSoTec GmbH 0
+ v 1000 LSI Logic / Symbios Logic 0 Formerly NCR
+ d 10000001 53c810 0
+-s 1000000110001000 8100S 0
++s 1000000110001000 LSI53C810AE PCI to SCSI I/O Processor 0
+ d 10000002 53c820 0
+ d 10000003 53c825 0
++s 1000000310001000 LSI53C825AE PCI to SCSI I/O Processor (Ultra Wide) 0
+ d 10000004 53c815 0
+ d 10000005 53c810AP 0
+ d 10000006 53c860 0
++s 1000000610001000 LSI53C860E PCI to Ultra SCSI I/O Processor 0
+ d 1000000a 53c1510 0
+-d 1000000b 53c896 0
++s 1000000a10001000 LSI53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Nonintelligent mode) 0
++d 1000000b 53C896/897 0
++s 1000000b0e116004 EOB003 Series SCSI host adapter 0
++s 1000000b10001000 LSI53C896/7 PCI to Dual Channel Ultra2 SCSI Multifunction Controller 0
++s 1000000b10001010 LSI22910 PCI to Dual Channel Ultra2 SCSI host adapter 0
++s 1000000b10001020 LSI21002 PCI to Dual Channel Ultra2 SCSI host adapter 0
++s 1000000b13e91000 6221L-4U 0 multifunction PCI card: Dual U2W SCSI, dual 10/100TX, graphics
+ d 1000000c 53c895 0
++s 1000000c10001010 LSI8951U PCI to Ultra2 SCSI host adapter 0
++s 1000000c10001020 LSI8952U PCI to Ultra2 SCSI host adapter 0
++s 1000000c1de13906 DC-390U2B SCSI adapter 0
+ s 1000000c1de13907 DC-390U2W 0
+ d 1000000d 53c885 0
+ d 1000000f 53c875 0
+ s 1000000f0e117004 Embedded Ultra Wide SCSI Controller 0
++s 1000000f10001000 LSI53C876/E PCI to Dual Channel SCSI Controller 0
++s 1000000f10001010 LSI22801 PCI to Dual Channel Ultra SCSI host adapter 0
++s 1000000f10001020 LSI22802 PCI to Dual Channel Ultra SCSI host adapter 0
+ s 1000000f10928760 FirePort 40 Dual SCSI Controller 0
+-s 1000000f1de13904 DC390F Ultra Wide SCSI Controller 0
+-d 10000010 53c895 0
++s 1000000f1de13904 DC390F/U Ultra Wide SCSI Adapter 0
++s 1000000f4c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
++s 1000000f4c531050 CT7 mainboard 0
++d 10000010 53C1510 0
+ s 100000100e114040 Integrated Array Controller 0
+-s 100000100e114048 Integrated Array Controller 0
++s 100000100e114048 RAID LC2 Controller 0
++s 1000001010001000 53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Intelligent mode) 0
+ d 10000012 53c895a 0
++s 1000001210001000 LSI53C895A PCI to Ultra2 SCSI Controller 0
+ d 10000013 53c875a 0
++s 1000001310001000 LSI53C875A PCI to Ultra SCSI Controller 0
+ d 10000020 53c1010 Ultra3 SCSI Adapter 0
++s 1000002010001000 LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller 0
+ s 100000201de11020 DC-390U3W 0
+ d 10000021 53c1010 66MHz Ultra3 SCSI Adapter 0
+-d 10000030 53c1030 0
++s 1000002110001000 LSI53C1000/1000R/1010R/1010-66 PCI to Ultra160 SCSI Controller 0
++s 1000002110001010 Asus TR-DLS onboard 53C1010-66 0
++s 10000021124b1070 PMC-USCSI3 0
++s 100000214c531080 CT8 mainboard 0
++s 100000214c531300 P017 mezzanine (32-bit PMC) 0
++s 100000214c531310 P017 mezzanine (64-bit PMC) 0
++d 10000030 53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI 0
++s 1000003010280123 PowerEdge 2600 0
++s 100000301028014a PowerEdge 1750 0
++s 100000301028016c PowerEdge 1850 MPT Fusion SCSI/RAID (Perc 4) 0
+ s 1000003010281010 LSI U320 SCSI Controller 0
+-d 10000040 53c1035 0
++d 10000031 53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI 0
++d 10000032 53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI 0
++s 1000003210001000 LSI53C1020/1030 PCI-X to Ultra320 SCSI Controller 0
++d 10000033 1030ZC_53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI 0
++d 10000040 53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI 0
++s 1000004010000033 MegaRAID SCSI 320-2XR 0
++s 1000004010000066 MegaRAID SCSI 320-2XRWS 0
++d 10000041 53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI 0
+ d 1000008f 53c875J 0
+ s 1000008f10928000 FirePort 40 SCSI Controller 0
+ s 1000008f10928760 FirePort 40 Dual SCSI Host Adapter 0
+-d 10000621 FC909 0
+-d 10000622 FC929 0
++d 10000407 MegaRAID 0
++s 1000040710000530 MegaRAID 530 SCSI 320-0X RAID Controller 0
++s 1000040710000531 MegaRAID 531 SCSI 320-4X RAID Controller 0
++s 1000040710000532 MegaRAID 532 SCSI 320-2X RAID Controller 0
++s 1000040710280531 PowerEdge Expandable RAID Controller 4/QC 0
++s 1000040710280533 PowerEdge Expandable RAID Controller 4/QC 0
++s 1000040780860530 MegaRAID Intel RAID Controller SRCZCRX 0
++s 1000040780860532 MegaRAID Intel RAID Controller SRCU42X 0
++d 10000408 MegaRAID 0
++s 1000040810000001 MegaRAID SCSI 320-1E RAID Controller 0
++s 1000040810000002 MegaRAID SCSI 320-2E RAID Controller 0
++s 100004081025004d MegaRAID ACER ROMB-2E RAID Controller 0
++s 1000040810280001 PowerEdge RAID Controller PERC4e/SC 0
++s 1000040810280002 PowerEdge RAID Controller PERC4e/DC 0
++s 1000040817341065 FSC MegaRAID PCI Express ROMB 0
++s 1000040880860002 MegaRAID Intel RAID Controller SRCU42E 0
++d 10000409 MegaRAID 0
++s 1000040910003004 MegaRAID SATA 300-4X RAID Controller 0
++s 1000040910003008 MegaRAID SATA 300-8X RAID Controller 0
++s 1000040980863008 MegaRAID RAID Controller SRCS28X 0
++s 1000040980863431 MegaRAID RAID Controller Alief SROMBU42E 0
++s 1000040980863499 MegaRAID RAID Controller Harwich SROMBU42E 0
++d 10000621 FC909 Fibre Channel Adapter 0
++d 10000622 FC929 Fibre Channel Adapter 0
++s 1000062210001020 44929 O Dual Fibre Channel card 0
+ d 10000623 FC929 LAN 0
+-d 10000624 FC919 0
++d 10000624 FC919 Fibre Channel Adapter 0
+ d 10000625 FC919 LAN 0
+-d 10000626 FC929X 0
++d 10000626 FC929X Fibre Channel Adapter 0
++s 1000062610001010 7202-XP-LC Dual Fibre Channel card 0
+ d 10000627 FC929X LAN 0
+-d 10000628 FC919X 0
++d 10000628 FC919X Fibre Channel Adapter 0
+ d 10000629 FC919X LAN 0
+ d 10000701 83C885 NT50 DigitalScape Fast Ethernet 0
+ d 10000702 Yellowfin G-NIC gigabit ethernet 0
+ s 1000070213180000 PEI100X 0
++d 10000804 SA2010 0
++d 10000805 SA2010ZC 0
++d 10000806 SA2020 0
++d 10000807 SA2020ZC 0
+ d 10000901 61C102 0
+ d 10001000 63C815 0
+-d 10001960 PowerEdge Expandable RAID Controller 4 0
+-s 1000196010280518 PowerEdge Expandable RAID Controller 4/DC 0
+-s 1000196010280520 PowerEdge Expandable RAID Controller 4/SC 0
++d 10001960 MegaRAID 0
++s 1000196010000518 MegaRAID 518 SCSI 320-2 Controller 0
++s 1000196010000520 MegaRAID 520 SCSI 320-1 Controller 0
++s 1000196010000522 MegaRAID 522 i4 133 RAID Controller 0
++s 1000196010000523 MegaRAID SATA 150-6 RAID Controller 0
++s 1000196010004523 MegaRAID SATA 150-4 RAID Controller 0
++s 100019601000a520 MegaRAID ZCR SCSI 320-0 Controller 0
++s 1000196010280518 MegaRAID 518 DELL PERC 4/DC RAID Controller 0
++s 1000196010280520 MegaRAID 520 DELL PERC 4/SC RAID Controller 0
+ s 1000196010280531 PowerEdge Expandable RAID Controller 4/QC 0
++s 1000196010280533 PowerEdge Expandable RAID Controller 4/QC 0
++s 1000196080860520 MegaRAIDRAID Controller SRCU41L 0
++s 1000196080860523 MegaRAID RAID Controller SRCS16 0
+ v 1001 Kolter Electronic 0
+ d 10010010 PCI 1616 Measurement card with 32 digital I/O lines 0
+ d 10010011 OPTO-PCI Opto-Isolated digital I/O board 0
+@@ -138,32 +273,76 @@
+ d 10010017 PROTO-3 PCI Prototyping board 0
+ d 10019100 INI-9100/9100W SCSI Host 0
+ v 1002 ATI Technologies Inc 0
+-d 10024136 Radeon RS100 [IGP320] 0
+-d 10024137 Radeon RS200 [IGP330/340/350] 0
+-d 10024144 Radeon RV300 [9500 AD] 0
+-d 10024145 Radeon RV300 [9500 AE] 0
+-d 10024146 Radeon RV300 [9600TX AF] 0
+-d 10024147 Radeon R300 [FireGL Z1/X1] 0
+-d 10024148 Radeon R350 [No name AH] 0
+-d 10024149 Radeon R350 [No name AI] 0
+-d 1002414A Radeon R350 [No name AJ] 0
+-d 1002414B Radeon R350 [FireGL AK] 0
+-d 10024150 Radeon RV350 [9600 AP] 0
+-d 10024151 Radeon RV350 [9600SE AQ] 0
+-d 10024152 Radeon RV360 [9600XT AR] 0
+-d 10024153 Radeon RV350 [9600 AS] 0
+-d 10024154 Radeon RV350 [FireGL T2 AT] 0
+-d 10024156 Radeon RV360 [FireGL AV] 0
++d 10023150 M24 1P [Radeon Mobility X600] 0
++d 10023154 M24 1T [FireGL M24 GL] 0
++d 10023e50 RV380 0x3e50 [Radeon X600] 0
++d 10023e54 RV380 0x3e54 [FireGL V3200] 0
++d 10023e70 RV380 [Radeon X600] Secondary 0
++d 10024136 Radeon IGP 320 M 0
++d 10024137 Radeon IGP330/340/350 0
++d 10024144 R300 AD [Radeon 9500 Pro] 0
++d 10024145 R300 AE [Radeon 9700 Pro] 0 New PCI ID provided by ATI developer relations (correction to above)
++d 10024146 R300 AF [Radeon 9700 Pro] 0 New PCI ID provided by ATI developer relations (oops, correction to above)
++d 10024147 R300 AG [FireGL Z1/X1] 0
++d 10024148 R350 AH [Radeon 9800] 0
++d 10024149 R350 AI [Radeon 9800] 0
++d 1002414a R350 AJ [Radeon 9800] 0
++d 1002414b R350 AK [Fire GL X2] 0
++d 10024150 RV350 AP [Radeon 9600] 0 New PCI ID provided by ATI developer relations
++s 1002415010020002 R9600 Pro primary (Asus OEM for HP) 0
++s 1002415010020003 R9600 Pro secondary (Asus OEM for HP) 0
++s 1002415014584024 Giga-Byte GV-R96128D Primary 0
++s 10024150148c2064 PowerColor R96A-C3N 0
++s 10024150148c2066 PowerColor R96A-C3N 0
++s 10024150174b7c19 Sapphire Atlantis Radeon 9600 Pro 0
++s 10024150174b7c29 GC-R9600PRO Primary [Sapphire] 0
++s 1002415017ee2002 Radeon 9600 256Mb Primary 0
++s 1002415018bc0101 GC-R9600PRO Primary 0
++d 10024151 RV350 AQ [Radeon 9600] 0 New PCI ID provided by ATI developer relations
++s 100241511043c004 A9600SE 0
++d 10024152 RV350 AR [Radeon 9600] 0 New PCI ID provided by ATI developer relations
++s 1002415210020002 Radeon 9600XT 0
++s 100241521043c002 Radeon 9600 XT TVD 0
++d 10024153 RV350 AS [Radeon 9600 AS] 0
++d 10024154 RV350 AT [Fire GL T2] 0
++d 10024155 RV350 AU [Fire GL T2] 0
++d 10024156 RV350 AV [Fire GL T2] 0
++d 10024157 RV350 AW [Fire GL T2] 0
+ d 10024158 68800AX [Mach32] 0
+-d 10024237 Radeon RS250 [7000 IGP (A4+)] 0
+-d 10024242 Radeon R200 BB [Radeon All in Wonder 8500DV] 0
++d 10024164 R300 AD [Radeon 9500 Pro] (Secondary) 0 The PCI ID is unrelated to any DVI output.
++d 10024165 R300 AE [Radeon 9700 Pro] (Secondary) 0 New PCI ID info provided by ATI developer relations
++d 10024166 R300 AF [Radeon 9700 Pro] (Secondary) 0 New PCI ID info provided by ATI developer relations
++d 10024168 Radeon R350 [Radeon 9800] (Secondary) 0 New PCI ID provided by ATI developer relations
++d 10024170 RV350 AP [Radeon 9600] (Secondary) 0 New PCI ID provided by ATI developer relations (correction to above)
++s 1002417014584025 Giga-Byte GV-R96128D Secondary 0
++s 10024170148c2067 PowerColor R96A-C3N (Secondary) 0
++s 10024170174b7c28 GC-R9600PRO Secondary [Sapphire] 0
++s 1002417017ee2003 Radeon 9600 256Mb Secondary 0
++s 1002417018bc0100 GC-R9600PRO Secondary 0
++d 10024171 RV350 AQ [Radeon 9600] (Secondary) 0 New PCI ID provided by ATI developer relations (correction to above)
++s 100241711043c005 A9600SE (Secondary) 0
++d 10024172 RV350 AR [Radeon 9600] (Secondary) 0 New PCI ID provided by ATI developer relations (correction to above)
++s 1002417210020003 Radeon 9600XT (Secondary) 0
++s 100241721043c003 A9600XT (Secondary) 0
++d 10024173 RV350 ?? [Radeon 9550] (Secondary) 0
++d 10024237 Radeon 7000 IGP 0
++d 10024242 R200 BB [Radeon All in Wonder 8500DV] 0
+ s 10024242100202aa Radeon 8500 AIW DV Edition 0
+-d 10024243 Radeon R200 BC [Radeon All in Wonder 8500DV] 0
+-d 10024336 Radeon RS100 Mobility [IGP320M (U1)] 0
+-d 10024337 Radeon RS200 Mobility [IGP330M/340M/350M (U2)] 0
++d 10024243 R200 BC [Radeon All in Wonder 8500] 0
++d 10024336 Radeon Mobility U1 0
++s 10024336103c0024 Pavilion ze4400 builtin Video 0
++d 10024337 Radeon IGP 330M/340M/350M 0
++s 100243371014053a ThinkPad R40e (2684-HVG) builtin VGA controller 0
++s 10024337103c0850 Radeon IGP 345M 0
++d 10024341 IXP150 AC'97 Audio Controller 0
++d 10024345 EHCI USB Controller 0
++d 10024347 OHCI USB Controller #1 0
++d 10024348 OHCI USB Controller #2 0
++d 1002434d IXP AC'97 Modem 0
++d 10024353 ATI SMBus 0 Radeon 9100 IGP integrated
+ d 10024354 215CT [Mach64 CT] 0
+ d 10024358 210888CX [Mach64 CX] 0
+-d 10024437 Radeon RS250 Mobility [7000 IGP] 0
++d 10024437 Radeon Mobility 7000 IGP 0
+ d 10024554 210888ET [Mach64 ET] 0
+ d 10024654 Mach64 VT 0
+ d 10024742 3D Rage Pro AGP 1X/2X 0
+@@ -211,7 +390,12 @@
+ d 10024752 Rage XL 0
+ s 1002475210020008 Rage XL 0
+ s 1002475210024752 Rage XL 0
+-s 10024752102800d1 PowerEdge 2550 1
++s 1002475210028008 Rage XL 0
++s 10024752102800ce PowerEdge 1400 0
++s 10024752102800d1 PowerEdge 2550 0
++s 10024752102800d9 PowerEdge 2500 0
++s 1002475280863411 SDS2 Mainboard 0
++s 1002475280863427 S875WP1-E mainboard 0
+ d 10024753 Rage XC 0
+ s 1002475310024753 Rage XC 0
+ d 10024754 3D Rage I/II 215GT [Mach64 GT] 0
+@@ -227,23 +411,33 @@
+ d 10024758 210888GX [Mach64 GX] 0
+ d 10024759 3D Rage IIC 0
+ d 1002475a 3D Rage IIC AGP 0
++s 1002475a10020084 Rage 3D Pro AGP 2x XPERT 98 0
+ s 1002475a10020087 Rage 3D IIC 0
+ s 1002475a1002475a Rage IIC AGP 0
+ d 10024964 Radeon RV250 Id [Radeon 9000] 0
+ d 10024965 Radeon RV250 Ie [Radeon 9000] 0
+ d 10024966 Radeon RV250 If [Radeon 9000] 0
++s 1002496610f10002 RV250 If [Tachyon G9000 PRO] 0
++s 10024966148c2039 RV250 If [Radeon 9000 Pro "Evil Commando"] 0
++s 1002496615099a00 RV250 If [Radeon 9000 "AT009"] 0
++s 1002496616810040 RV250 If [3D prophet 9000] 0 New subdevice - 3D Prophet 9000 PCI by Hercules. AGP version probably would have same ID, so not specified.
++s 10024966174b7176 RV250 If [Sapphire Radeon 9000 Pro] 0
++s 10024966174b7192 RV250 If [Radeon 9000 "Atlantis"] 0
++s 1002496617af2005 RV250 If [Excalibur Radeon 9000 Pro] 0
++s 1002496617af2006 RV250 If [Excalibur Radeon 9000] 0
+ d 10024967 Radeon RV250 Ig [Radeon 9000] 0
+-s 1002496610f10002 R250 If [Tachyon G9000 PRO] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10024966148c2039 R250 If [Radeon 9000 Pro "Evil Commando"] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 1002496615099a00 R250 If [Radeon 9000 "AT009"] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10024966174b7176 R250 If [Sapphire Radeon 9000 Pro] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10024966174b7192 Radeon R250 If [Radeon 9000 "Atlantis"] 1 New "Powered by ATI" card - Manufactured by: Sapphire (www.sapphiretech.com)
+-s 10024966174b7192 R250 If [Radeon 9000 "Atlantis"] 1 Update - tidied up entry above submitted by someone else
+-s 1002496617af2005 R250 If [Excalibur Radeon 9000 Pro] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 1002496617af2006 R250 If [Excalibur Radeon 9000] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-d 10024967 Radeon R250 Ig [Radeon 9000] 0
+-d 1002496e Radeon R250 [Radeon 9000] (Secondary) 1
++d 1002496e Radeon RV250 [Radeon 9000] (Secondary) 0
++d 10024a48 R420 JH [Radeon X800] 0
++d 10024a49 R420 JI [Radeon X800PRO] 0
++d 10024a4a R420 JJ [Radeon X800SE] 0
++d 10024a4b R420 JK [Radeon X800] 0
++d 10024a4c R420 JL [Radeon X800] 0
++d 10024a4d R420 JM [FireGL X3] 0
++d 10024a4e M18 JN [Radeon Mobility 9800] 0
++d 10024a50 R420 JP [Radeon X800XT] 0
++d 10024a70 R420 [X800XT-PE] (Secondary) 0
+ d 10024c42 3D Rage LT Pro AGP-133 0
++s 10024c420e11b0e7 Rage LT Pro (Compaq Presario 5240) 0
+ s 10024c420e11b0e8 Rage 3D LT Pro 0
+ s 10024c420e11b10e 3D Rage LT Pro (Compaq Armada 1750) 0
+ s 10024c4210020040 Rage LT Pro AGP 2X 0
+@@ -254,6 +448,7 @@
+ d 10024c44 3D Rage LT Pro AGP-66 0
+ d 10024c45 Rage Mobility M3 AGP 0
+ d 10024c46 Rage Mobility M3 AGP 2x 0
++s 10024c46102800b1 Latitude C600 0
+ d 10024c47 3D Rage LT-G 215LG 0
+ d 10024c49 3D Rage LT Pro 0
+ s 10024c4910020004 Rage LT Pro 0
+@@ -261,45 +456,65 @@
+ s 10024c4910020044 Rage LT Pro 0
+ s 10024c4910024c49 Rage LT Pro 0
+ d 10024c4d Rage Mobility P/M AGP 2x 0
++s 10024c4d0e11b111 Armada M700 0
++s 10024c4d0e11b160 Armada E500 0
+ s 10024c4d10020084 Xpert 98 AGP 2X (Mobility) 0
+-s 10024c4d10140154 ThinkPad A20m 1
++s 10024c4d10140154 ThinkPad A20m 0
++s 10024c4d102800aa Latitude CPt 0
+ d 10024c4e Rage Mobility L AGP 2x 0
+ d 10024c50 3D Rage LT Pro 0
+ s 10024c5010024c50 Rage LT Pro 0
+ d 10024c51 3D Rage LT Pro 0
+ d 10024c52 Rage Mobility P/M 0
++s 10024c5210338112 Versa Note VXi 0
+ d 10024c53 Rage Mobility L 0
+ d 10024c54 264LT [Mach64 LT] 0
+ d 10024c57 Radeon Mobility M7 LW [Radeon Mobility 7500] 0
+-s 10024c5710140517 ThinkPad T30 1
++s 10024c5710140517 ThinkPad T30 0
+ s 10024c57102800e6 Radeon Mobility M7 LW (Dell Inspiron 8100) 0
+-d 10024c58 Radeon Mobility M7 LX [Radeon Mobility FireGL 7800] 0
++s 10024c571028012a Latitude C640 0
++s 10024c57144dc006 Radeon Mobility M7 LW in vpr Matrix 170B4 0
++d 10024c58 Radeon RV200 LX [Mobility FireGL 7800 M7] 0
+ d 10024c59 Radeon Mobility M6 LY 0
+-s 10024c5910140235 ThinkPad A30p (2653-64G) 0
++s 10024c5910140235 ThinkPad A30/A30p (2652/2653) 0
+ s 10024c5910140239 ThinkPad X22/X23/X24 0
+ s 10024c59104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+ d 10024c5a Radeon Mobility M6 LZ 0
+-d 10024c64 Radeon RV250 Ld [Radeon Mobility 9000] 0
+-d 10024c65 Radeon RV250 Le [Radeon Mobility 9000] 0
+-d 10024c66 Radeon RV250 Lf [Radeon Mobility 9000] 0
+-d 10024c67 Radeon RV250 Lg [Radeon Mobility 9000] 0
++d 10024c64 Radeon R250 Ld [Radeon Mobility 9000 M9] 0
++d 10024c65 Radeon R250 Le [Radeon Mobility 9000 M9] 0
++d 10024c66 Radeon R250 Lf [FireGL 9000] 0
++d 10024c67 Radeon R250 Lg [Radeon Mobility 9000 M9] 0
++d 10024c6e Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary] 0 Secondary chip to the Lf
+ d 10024d46 Rage Mobility M4 AGP 0
+ d 10024d4c Rage Mobility M4 AGP 0
+-d 10024e44 Radeon R300 ND [Radeon 9700Pro] 0
+-d 10024e45 Radeon R300 NE [Radeon 9700] 0
+-d 10024e46 Radeon R300 NF [Radeon 9700] 0
++d 10024e44 Radeon R300 ND [Radeon 9700 Pro] 0
++d 10024e45 Radeon R300 NE [Radeon 9500 Pro] 0
++s 10024e4510020002 Radeon R300 NE [Radeon 9500 Pro] 0
++s 10024e4516810002 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] 0
++d 10024e46 RV350 NF [Radeon 9600] 0 New PCI ID provided by ATI developer relations (correction to above)
+ d 10024e47 Radeon R300 NG [FireGL X1] 0
+-d 10024e48 Radeon R350 NH [Radeon 9800Pro] 0
+-d 10024e49 Radeon R350 NI [Radeon 9800] 0
+-d 10024e4A Radeon R360 NJ [Radeon 9800XT] 0
+-d 10024e4B Radeon R350 NK [FireGL X2] 0
+-d 10024e50 Radeon RV350 NP [Mobility M10] 0
+-d 10024e51 Radeon RV350 NQ [Mobility M10] 0
+-d 10024e52 Radeon RV350 NR [Mobility M11] 0
+-d 10024e53 Radeon RV350 NS [Mobility M10] 0
+-d 10024e54 Radeon RV350 NT [FireGL T2 M10] 0
+-d 10024e56 Radeon RV350 NV [FireGL T2 M10] 0
+-d 10024e64 Radeon R300 [Radeon 9700] (Secondary) 1
++d 10024e48 Radeon R350 [Radeon 9800 Pro] 0 (added pro)
++d 10024e49 Radeon R350 [Radeon 9800] 0 New PCI ID provided by ATI developer relations
++d 10024e4a RV350 NJ [Radeon 9800 XT] 0
++d 10024e4b R350 NK [Fire GL X2] 0
++d 10024e50 RV350 [Mobility Radeon 9600 M10] 0 New PCI ID provided by ATI developer relations
++s 10024e501025005a TravelMate 290 0
++s 10024e50103c0890 NC6000 laptop 0
++s 10024e5017341055 Amilo M1420W 0
++d 10024e51 M10 NQ [Radeon Mobility 9600] 0
++d 10024e52 RV350 [Mobility Radeon 9600 M10] 0
++d 10024e53 M10 NS [Radeon Mobility 9600] 0
++d 10024e54 M10 NT [FireGL Mobility T2] 0
++d 10024e56 M11 NV [FireGL Mobility T2e] 0
++d 10024e64 Radeon R300 [Radeon 9700 Pro] (Secondary) 0
++d 10024e65 Radeon R300 [Radeon 9500 Pro] (Secondary) 0
++s 10024e6510020003 Radeon R300 NE [Radeon 9500 Pro] 0
++s 10024e6516810003 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] (Secondary) 0
++d 10024e66 RV350 NF [Radeon 9600] (Secondary) 0 New PCI ID provided by ATI developer relations (correction to above)
++d 10024e67 Radeon R300 [FireGL X1] (Secondary) 0
++d 10024e68 Radeon R350 [Radeon 9800 Pro] (Secondary) 0 (added pro)
++d 10024e69 Radeon R350 [Radeon 9800] (Secondary) 0 New PCI ID provided by ATI developer relations
++d 10024e6a RV350 NJ [Radeon 9800 XT] (Secondary) 0
+ d 10025041 Rage 128 PA/PRO 0
+ d 10025042 Rage 128 PB/PRO AGP 2x 0
+ d 10025043 Rage 128 PC/PRO AGP 4x 0
+@@ -336,7 +551,7 @@
+ d 10025056 Rage 128 PV/PRO TMDS 0
+ d 10025057 Rage 128 PW/PRO AGP 2x TMDS 0
+ d 10025058 Rage 128 PX/PRO AGP 4x TMDS 0
+-d 10025144 Radeon R100 QD [Radeon 64 DDR] 0
++d 10025144 Radeon R100 QD [Radeon 7200] 0
+ s 1002514410020008 Radeon 7000/Radeon VE 0
+ s 1002514410020009 Radeon 7000/Radeon 0
+ s 100251441002000a Radeon 7000/Radeon 0
+@@ -354,49 +569,55 @@
+ d 10025146 Radeon R100 QF 0
+ d 10025147 Radeon R100 QG 0
+ d 10025148 Radeon R200 QH [Radeon 8500] 0
+-s 1002514810020152 FireGL 8800 0
+-s 1002514810020172 FireGL 8700 0
++s 100251481002010a FireGL 8800 64Mb 0
++s 1002514810020152 FireGL 8800 128Mb 0
++s 1002514810020162 FireGL 8700 32Mb 0
++s 1002514810020172 FireGL 8700 64Mb 0
+ d 10025149 Radeon R200 QI 0
+ d 1002514a Radeon R200 QJ 0
+ d 1002514b Radeon R200 QK 0
+ d 1002514c Radeon R200 QL [Radeon 8500 LE] 0
+-d 1002514d Radeon R200 QM 0
+-d 1002514e Radeon R200 QN 0
+-d 1002514f Radeon R200 QO 0
+ s 1002514c1002003a Radeon R200 QL [Radeon 8500 LE] 0
+ s 1002514c1002013a Radeon 8500 0
+-s 1002514c148c2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 1
+-s 1002514c148c2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 1 Oops, missed comment above http://mirror.ati.com/support/identify/graphicschart.html
++s 1002514c148c2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 0
++s 1002514c16810010 Radeon 8500 [3D Prophet 8500 128Mb] 0
+ s 1002514c174b7149 Radeon R200 QL [Sapphire Radeon 8500 LE] 0
++d 1002514d Radeon R200 QM [Radeon 9100] 0
++d 1002514e Radeon R200 QN [Radeon 8500LE] 0
++d 1002514f Radeon R200 QO [Radeon 8500LE] 0
++d 10025154 R200 QT [Radeon 8500] 0
++d 10025155 R200 QU [Radeon 9100] 0
+ d 10025157 Radeon RV200 QW [Radeon 7500] 0
+ s 100251571002013a Radeon 7500 0
+-s 1002515714584000 RV200 QW [RADEON 7500 PRO MAYA AR] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025157148c2024 RV200 QW [Radeon 7500LE Dual Display] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025157148c2025 RV200 QW [Radeon 7500 Evil Master Multi Display Edition] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025157148c2036 RV200 QW [Radeon 7500 PCI Dual Display] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025157174b7147 RV200 QW [Sapphire Radeon 7500LE] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
++s 100251571002103a Dell Optiplex GX260 0
++s 1002515714584000 RV200 QW [RADEON 7500 PRO MAYA AR] 0
++s 10025157148c2024 RV200 QW [Radeon 7500LE Dual Display] 0
++s 10025157148c2025 RV200 QW [Radeon 7500 Evil Master Multi Display Edition] 0
++s 10025157148c2036 RV200 QW [Radeon 7500 PCI Dual Display] 0
++s 10025157174b7146 RV200 QW [Radeon 7500 LE] 0
++s 10025157174b7147 RV200 QW [Sapphire Radeon 7500LE] 0
+ s 10025157174b7161 Radeon RV200 QW [Radeon 7500 LE] 0
+-s 1002515717af0202 RV200 QW [Excalibur Radeon 7500LE] 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
++s 1002515717af0202 RV200 QW [Excalibur Radeon 7500LE] 0
+ d 10025158 Radeon RV200 QX [Radeon 7500] 0
+-d 10025159 Radeon VE QY 0
++d 10025159 Radeon RV100 QY [Radeon 7000/VE] 0
+ s 100251591002000a Radeon 7000/Radeon VE 0
+ s 100251591002000b Radeon 7000 0
+ s 1002515910020038 Radeon 7000/Radeon VE 0
+ s 100251591002003a Radeon 7000/Radeon VE 0
+ s 10025159100200ba Radeon 7000/Radeon VE 0
+ s 100251591002013a Radeon 7000/Radeon VE 0
+-s 1002515914584002 RV100 QY [RADEON 7000 PRO MAYA AV Series] 1 ATI clone board - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025159148c2003 RV100 QY [Radeon 7000 Multi-Display Edition] 1 ATI clone board - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025159148c2023 RV100 QY [Radeon 7000 Evil Master Multi-Display] 1 ATI clone board - http://mirror.ati.com/support/identify/graphicschart.html
+-s 10025159174b7112 Radeon 7000 64M TVO 0
+-s 10025159174b7112 RV100 QY [Sapphire Radeon VE 7000] 1 ATI clone board - http://mirror.ati.com/support/identify/graphicschart.html
+-s 1002515917870202 RV100 QY [Excalibur Radeon 7000] 1 ATI clone board - http://mirror.ati.com/support/identify/graphicschart.html
+-d 1002515a Radeon VE QZ 0
++s 1002515914584002 RV100 QY [RADEON 7000 PRO MAYA AV Series] 0
++s 10025159148c2003 RV100 QY [Radeon 7000 Multi-Display Edition] 0
++s 10025159148c2023 RV100 QY [Radeon 7000 Evil Master Multi-Display] 0
++s 10025159174b7112 RV100 QY [Sapphire Radeon VE 7000] 0
++s 10025159174b7c28 Sapphire Radeon VE 7000 DDR 0
++s 1002515917870202 RV100 QY [Excalibur Radeon 7000] 0
++d 1002515a Radeon RV100 QZ [Radeon 7000/VE] 0
+ d 10025168 Radeon R200 Qh 0
+ d 10025169 Radeon R200 Qi 0
+ d 1002516a Radeon R200 Qj 0
+ d 1002516b Radeon R200 Qk 0
+-d 1002516c Radeon R200 Ql 0
++d 1002516c Radeon R200 Ql 0 This one is not in ATI documentation, but is in XFree86 source code
+ d 10025245 Rage 128 RE/SG 0
+ s 1002524510020008 Xpert 128 0
+ s 1002524510020028 Rage 128 AIW 0
+@@ -416,6 +637,7 @@
+ s 1002524c10020088 Xpert 99 0
+ d 10025345 Rage 128 SE/4x 0
+ d 10025346 Rage 128 SF/4x AGP 2x 0
++s 1002534610020048 RAGE 128 16MB VGA TVOUT AMC PAL 0
+ d 10025347 Rage 128 SG/4x AGP 4x 0
+ d 10025348 Rage 128 SH 0
+ d 1002534b Rage 128 SK/4x 0
+@@ -442,23 +664,75 @@
+ d 10025453 Rage 128 Pro Ultra TS 0
+ d 10025454 Rage 128 Pro Ultra TT 0
+ d 10025455 Rage 128 Pro Ultra TU 0
++d 10025460 M22 [Radeon Mobility M300] 0
++d 10025464 M22 [FireGL GL] 0
++d 10025548 R423 UH [Radeon X800 (PCIE)] 0
++d 10025549 R423 UI [Radeon X800PRO (PCIE)] 0
++d 1002554a R423 UJ [Radeon X800LE (PCIE)] 0
++d 1002554b R423 UK [Radeon X800SE (PCIE)] 0
++d 10025551 R423 UQ [FireGL V7200 (PCIE)] 0
++d 10025552 R423 UR [FireGL V5100 (PCIE)] 0
++d 10025554 R423 UT [FireGL V7100 (PCIE)] 0
++d 1002556b Radeon R423 UK (PCIE) [X800 SE] (Secondary) 0
+ d 10025654 264VT [Mach64 VT] 0
+ s 1002565410025654 Mach64VT Reference 0
+ d 10025655 264VT3 [Mach64 VT3] 0
+ d 10025656 264VT4 [Mach64 VT4] 0
+-d 10025834 Radeon RS300 [9000 IGP A5] 0
+-d 10025835 Radeon RS300 [Mobility 9000 IGP U3] 0
+-d 10025836 Radeon RS300 5836 [9000] 0
+-d 10025837 Radeon RS300 5837 [9000] 0
+-d 10025960 Radeon RV280 [9200 5960] 0
+-d 10025961 Radeon RV280 [9200 5961] 0
+-d 10025962 Radeon RV280 [9200 5962] 0
+-d 10025963 Radeon RV280 [9200 5963] 0
+-d 10025968 Radeon RV280 [M9+ 5968] 0
+-d 10025969 Radeon RV280 [M9+ 5969] 0
+-d 1002596A Radeon RV280 [M9+ 596A] 0
+-d 1002596B Radeon RV280 [M9+ 596B] 0
+-d 1002700f U1/A3 AGP Bridge [IGP 320M] 0
++d 10025830 RS300 Host Bridge 0
++d 10025831 RS300 Host Bridge 0
++d 10025832 RS300 Host Bridge 0
++d 10025833 Radeon 9100 IGP Host Bridge 0
++d 10025834 Radeon 9100 IGP 0
++d 10025835 RS300M AGP [Radeon Mobility 9100IGP] 0
++d 10025838 Radeon 9100 IGP AGP Bridge 0
++d 10025941 RV280 [Radeon 9200] (Secondary) 0
++s 10025941174b7c12 Sapphire Radeon 9200 0
++s 1002594117af200d Excalibur Radeon 9200 0 http://www.hightech.com.hk/html/9200.htm
++s 1002594118bc0050 GeXcube GC-R9200-C3 (Secondary) 0
++d 10025944 RV280 [Radeon 9200 SE (PCI)] 0
++d 10025960 RV280 [Radeon 9200 PRO] 0
++d 10025961 RV280 [Radeon 9200] 0
++s 1002596110022f72 All-in-Wonder 9200 Series 0
++s 1002596112ab5961 YUAN SMARTVGA Radeon 9200 0
++s 1002596114584018 Gigabyte Radeon 9200 0
++s 10025961174b7c13 Sapphire Radeon 9200 0
++s 1002596117af200c Excalibur Radeon 9200 0 http://www.hightech.com.hk/html/9200.htm
++s 1002596118bc0050 Radeon 9200 Game Buster 0
++s 1002596118bc0051 GeXcube GC-R9200-C3 0
++s 1002596118bc0053 Radeon 9200 Game Buster VIVO 0
++d 10025962 RV280 [Radeon 9200] 0
++d 10025964 RV280 [Radeon 9200 SE] 0
++s 100259641043c006 ASUS Radeon 9200 SE / TD / 128M 0
++s 1002596414584018 Radeon 9200 SE 0
++s 10025964148c2073 CN-AG92E 0
++s 10025964174b7c13 Sapphire Radeon 9200 SE 0
++s 1002596417875964 Excalibur 9200SE VIVO 128M 0
++s 1002596417af2012 Radeon 9200 SE Excalibur 0
++s 1002596418bc0170 Sapphire Radeon 9200 SE 128MB Game Buster 0
++s 1002596418bc0173 GC-R9200L(SE)-C3H [Radeon 9200 Game Buster] 0 128MB DDR, DVI/VGA/TV out
++d 10025b60 RV370 5B60 [Radeon X300 (PCIE)] 0
++s 10025b601043002a EAX300SE 0
++d 10025b62 RV370 5B62 [Radeon X600 (PCIE)] 0
++d 10025b64 RV370 5B64 [FireGL V3100 (PCIE)] 0
++d 10025b65 RV370 5B65 [FireGL D1100 (PCIE)] 0
++d 10025c61 M9+ 5C61 [Radeon Mobility 9200 (AGP)] 0
++d 10025c63 M9+ 5C63 [Radeon Mobility 9200 (AGP)] 0
++d 10025d44 RV280 [Radeon 9200 SE] (Secondary) 0
++s 10025d4414584019 Radeon 9200 SE (Secondary) 0
++s 10025d44174b7c12 Sapphire Radeon 9200 SE (Secondary) 0
++s 10025d4417875965 Excalibur 9200SE VIVO 128M (Secondary) 0
++s 10025d4417af2013 Radeon 9200 SE Excalibur (Secondary) 0
++s 10025d4418bc0171 Radeon 9200 SE 128MB Game Buster (Secondary) 0
++s 10025d4418bc0172 GC-R9200L(SE)-C3H [Radeon 9200 Game Buster] 0
++d 10025d57 R423 5F57 [Radeon X800XT (PCIE)] 0
++d 1002700f PCI Bridge [IGP 320M] 0
++d 10027010 PCI Bridge [IGP 340M] 0
++d 10027834 Radeon 9100 PRO IGP 0
++d 10027835 Radeon Mobility 9200 IGP 0
++d 10027c37 RV350 AQ [Radeon 9600 SE] 0
++d 1002cab0 AGP Bridge [IGP 320M] 0
++d 1002cab2 RS200/RS200M AGP Bridge [IGP 340M] 0
++d 1002cbb2 RS200/RS200M AGP Bridge [IGP 340M] 0
+ v 1003 ULSI Systems 0
+ d 10030201 US201 0
+ v 1004 VLSI Technology Inc 0
+@@ -488,10 +762,10 @@
+ s 1004030610040306 QSound ThunderBird PCI Audio Support Registers 0
+ s 10040306122d1208 DSP368 Audio Support Registers 0
+ s 1004030614835022 XWave Thunder 3D Audio Support Registers 0
+-d 10040307 Thunderbird 1 http://pcsound.philips.com/_acoustic706.html
+-d 10040308 Thunderbird 1 http://pcsound.philips.com/_acoustic706.html
++d 10040307 Thunderbird 0
++d 10040308 Thunderbird 0
+ d 10040702 VAS96011 [Golden Gate II] 0
+-d 10040703 Tollgate 1 PCI/ISA bridge
++d 10040703 Tollgate 0
+ v 1005 Avance Logic Inc. [ALI] 0
+ d 10052064 ALG2032/2064 0
+ d 10052128 ALG2364A 0
+@@ -512,13 +786,25 @@
+ d 100b0011 NS87560 National PCI System I/O 0
+ d 100b0012 USB Controller 0
+ d 100b0020 DP83815 (MacPhyter) Ethernet Controller 0
++s 100b0020103c0024 Pavilion ze4400 builtin Network 0
++s 100b00201385f311 FA311 / FA312 (FA311 with WoL HW) 0
+ d 100b0022 DP83820 10/100/1000 Ethernet Controller 0
++d 100b0028 CS5535 Host bridge 0
++d 100b002b CS5535 ISA bridge 0
++d 100b002d CS5535 IDE 0
++d 100b002e CS5535 Audio 0
++d 100b002f CS5535 USB 0
++d 100b0030 CS5535 Video 0
++d 100b0035 DP83065 [Saturn] 10/100/1000 Ethernet Controller 0
+ d 100b0500 SCx200 Bridge 0
+ d 100b0501 SCx200 SMI 0
+ d 100b0502 SCx200 IDE 0
+ d 100b0503 SCx200 Audio 0
+ d 100b0504 SCx200 Video 0
+ d 100b0505 SCx200 XBus 0
++d 100b0510 SC1100 Bridge 0
++d 100b0511 SC1100 SMI 0
++d 100b0515 SC1100 XBus 0
+ d 100bd001 87410 IDE 0
+ v 100c Tseng Labs Inc 0
+ d 100c3202 ET4000/W32p rev A 0
+@@ -564,13 +850,14 @@
+ d 10110014 DECchip 21041 [Tulip Pass 3] 0
+ s 1011001411860100 DE-530+ 0
+ d 10110016 DGLPB [OPPO] 0
++d 10110017 PV-PCI Graphics Controller (ZLXp-L) 0
+ d 10110019 DECchip 21142/43 0
+ s 101100191011500a DE500A Fast Ethernet 0
+ s 101100191011500b DE500B Fast Ethernet 0
+ s 1011001910140001 10/100 EtherJet Cardbus 0
+ s 1011001910250315 ALN315 Fast Ethernet 0
+-s 101100191033800c PC-9821-CS01 0
+-s 101100191033800d PC-9821NR-B06 0
++s 101100191033800c PC-9821-CS01 100BASE-TX Interface Card 0
++s 101100191033800d PC-9821NR-B06 100BASE-TX Interface Card 0
+ s 10110019108d0016 Rapidfire 2327 10/100 Ethernet 0
+ s 10110019108d0017 GoCard 2250 Ethernet 10/100 Cardbus 0
+ s 1011001910b82005 SMC8032DT Extreme Ethernet 10/100 0
+@@ -587,6 +874,7 @@
+ s 1011001911861100 DFE-500TX Fast Ethernet 0
+ s 1011001911861101 DFE-500TX Fast Ethernet 0
+ s 1011001911861102 DFE-500TX Fast Ethernet 0
++s 1011001911861112 DFE-570TX Quad Fast Ethernet 0
+ s 1011001912592800 AT-2800Tx Fast Ethernet 0
+ s 1011001912660004 Eagle Fast EtherMAX 0
+ s 1011001912af0019 NetFlyer Cardbus Fast Ethernet 0
+@@ -594,10 +882,12 @@
+ s 1011001913740002 Cardbus Ethernet Card 10/100 0
+ s 1011001913740007 Cardbus Ethernet Card 10/100 0
+ s 1011001913740008 Cardbus Ethernet Card 10/100 0
++s 1011001913852100 FA510 0
+ s 1011001913950001 10/100 Ethernet CardBus PC Card 0
+ s 1011001913d1ab01 EtherFast 10/100 Cardbus (PCMPC200) 0
++s 1011001914cb0100 LNDL-100N 100Base-TX Ethernet PC Card 0
+ s 1011001980860001 EtherExpress PRO/100 Mobile CardBus 32 0
+-d 1011001a Farallon PN9000SX 0
++d 1011001a Farallon PN9000SX Gigabit Ethernet 0
+ d 10110021 DECchip 21052 0
+ d 10110022 DECchip 21150 0
+ d 10110023 DECchip 21150 0
+@@ -612,8 +902,11 @@
+ s 101100460e114051 Integrated Smart Array 0
+ s 101100460e114058 Integrated Smart Array 0
+ s 10110046103c10c2 Hewlett-Packard NetRAID-4M 0
+-s 1011004612d9000a VoIP PCI Gateway 0
+-s 1011004690050365 Adaptec 5400S 0
++s 1011004612d9000a IP Telephony card 0
++s 101100464c531050 CT7 mainboard 0
++s 101100464c531051 CE7 mainboard 0
++s 1011004690050364 5400S (Mustang) 0
++s 1011004690050365 5400S (Mustang) 0
+ s 1011004690051364 Dell PowerEdge RAID Controller 2 0
+ s 1011004690051365 Dell PowerEdge RAID Controller 2 0
+ s 10110046e4bf1000 CC8-1-BLUES 0
+@@ -653,7 +946,8 @@
+ s 1013600110141010 CS4610 SoundFusion Audio Accelerator 0
+ d 10136003 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] 0
+ s 1013600310134280 Crystal SoundFusion PCI Audio Accelerator 0
+-s 1013600316810050 Hercules Game Theater XP 0
++s 1013600316810050 Game Theater XP 0
++s 101360031681a011 Fortissimo III 7.1 0
+ d 10136004 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] 0
+ d 10136005 Crystal CS4281 PCI Audio 0
+ s 1013600510134281 Crystal CS4281 PCI Audio 0
+@@ -676,14 +970,18 @@
+ d 1014001b GXT-150P 0
+ d 1014001c Carrera 0
+ d 1014001d 82G2675 0
+-d 10140020 MCA 0
++d 10140020 GXT1000 Graphics Adapter 0
+ d 10140022 IBM27-82351 0
+ d 1014002d Python 0
+-d 1014002e ServeRAID Controller 0
++d 1014002e SCSI RAID Adapter [ServeRAID] 0 [official name in AIX 5]
+ s 1014002e1014002e ServeRAID-3x 0
+ s 1014002e1014022e ServeRAID-4H 0
++d 10140031 2 Port Serial Adapter 0
++s 1014003110140031 2721 WAN IOA - 2 Port Sync Serial Adapter 0 AS400 iSeries PCI sync serial card
+ d 10140036 Miami 0
++d 10140037 82660 CPU to PCI Bridge 0
+ d 1014003a CPU to PCI Bridge 0
++d 1014003c GXT250P/GXT255P Graphics Adapter 0
+ d 1014003e 16/4 Token ring UTP/STP controller 0
+ s 1014003e1014003e Token-Ring Adapter 0
+ s 1014003e101400cd Token-Ring Adapter + Wake-On-LAN 0
+@@ -701,32 +999,48 @@
+ d 1014004f ATM Controller (14104f00) 0
+ d 10140050 ATM Controller (14105000) 0
+ d 10140053 25 MBit ATM Controller 0
++d 10140054 GXT500P/GXT550P Graphics Adapter 0
+ d 10140057 MPEG PCI Bridge 0
+ d 1014005c i82557B 10/100 0
++d 1014005e GXT800P Graphics Adapter 0
+ d 1014007c ATM Controller (14107c00) 0
+ d 1014007d 3780IDSP [MWave] 0
++d 1014008b EADS PCI to PCI Bridge 0
++d 1014008e GXT3000P Graphics Adapter 0
+ d 10140090 GXT 3000P 0
+ s 101400901014008e GXT-3000P 0
++d 10140091 SSA Adapter 0
+ d 10140095 20H2999 PCI Docking Bridge 0
+ d 10140096 Chukar chipset SCSI controller 0
+ s 1014009610140097 iSeries 2778 DASD IOA 0
+ s 1014009610140098 iSeries 2763 DASD IOA 0
+ s 1014009610140099 iSeries 2748 DASD IOA 0
++d 1014009f PCI 4758 Cryptographic Accelerator 0
+ d 101400a5 ATM Controller (1410a500) 0
+ d 101400a6 ATM 155MBPS MM Controller (1410a600) 0
+ d 101400b7 256-bit Graphics Rasterizer [Fire GL1] 0
+-s 101400b7190200b8 Fire GL1 0
++s 101400b7109200b8 FireGL1 AGP 32Mb 0
++d 101400b8 GXT2000P Graphics Adapter 0
+ d 101400be ATM 622MBPS Controller (1410be00) 0
+-d 101400dc Remote Supervisor Adapter (RSA) 1 IBM's remote management adapter
+-d 101400dc Advanced Systems Management Adapter (ASMA) 1 sorry, the previous entry I posted was a mistake, this ID is the ASMA not the RSA.
++d 101400dc Advanced Systems Management Adapter (ASMA) 0
+ d 101400fc CPC710 Dual Bridge and Memory Controller (PCI-64) 0
++d 10140104 Gigabit Ethernet-SX Adapter 0
+ d 10140105 CPC710 Dual Bridge and Memory Controller (PCI-32) 0
+-d 1014010f Remote Supervisor Adapter (RSA) 1 this is actually the RSA
++d 1014010f Remote Supervisor Adapter (RSA) 0
+ d 10140142 Yotta Video Compositor Input 0
+ s 1014014210140143 Yotta Input Controller (ytin) 0
+ d 10140144 Yotta Video Compositor Output 0
+ s 1014014410140145 Yotta Output Controller (ytout) 0
+ d 10140156 405GP PLB to PCI Bridge 0
++d 1014015e 622Mbps ATM PCI Adapter 0
++d 10140160 64bit/66MHz PCI ATM 155 MMF 0
++d 1014016e GXT4000P Graphics Adapter 0
++d 10140170 GXT6000P Graphics Adapter 0
++d 1014017d GXT300P Graphics Adapter 0
++d 10140180 Snipe chipset SCSI controller 0
++s 1014018010140241 iSeries 2757 DASD IOA 0
++s 1014018010140264 Quad Channel PCI-X U320 SCSI RAID Adapter (2780) 0
++d 10140188 EADS-X PCI-X to PCI-X Bridge 0
+ d 101401a7 PCI-X to PCI-X Bridge 0
+ d 101401bd ServeRAID Controller 0
+ s 101401bd101401be ServeRAID-4M 0
+@@ -736,7 +1050,21 @@
+ s 101401bd1014022e ServeRAID-4H 0
+ s 101401bd10140258 ServeRAID-5i 0
+ s 101401bd10140259 ServeRAID-5i 0
+-d 10140302 XA-32 chipset [Summit] 1 the IBM Summit X-Architecuture chipset
++d 101401c1 64bit/66MHz PCI ATM 155 UTP 0
++d 101401e6 Cryptographic Accelerator 0
++d 101401ff 10/100 Mbps Ethernet 0
++d 10140219 Multiport Serial Adapter 0
++s 101402191014021a Dual RVX 0
++s 1014021910140251 Internal Modem/RVX 0
++s 1014021910140252 Quad Internal Modem 0
++d 1014021b GXT6500P Graphics Adapter 0
++d 1014021c GXT4500P Graphics Adapter 0
++d 10140233 GXT135P Graphics Adapter 0
++d 10140266 PCI-X Dual Channel SCSI 0
++d 10140268 Gigabit Ethernet-SX Adapter (PCI-X) 0
++d 10140269 10/100/1000 Base-TX Ethernet Adapter (PCI-X) 0
++d 10140302 Winnipeg PCI-X Host Bridge 0
++d 10140314 ZISC 036 Neural accelerator card 0
+ d 1014ffff MPIC-2 interrupt controller 0
+ v 1015 LSI Logic Corp of Canada 0
+ v 1016 ICL Personal Systems 0
+@@ -762,8 +1090,13 @@
+ v 101e American Megatrends Inc. 0
+ d 101e1960 MegaRAID 0
+ s 101e1960101e0471 MegaRAID 471 Enterprise 1600 RAID Controller 0
+-s 101e1960101e0475 MegaRAID 475 Express 500 RAID Controller 0
++s 101e1960101e0475 MegaRAID 475 Express 500/500LC RAID Controller 0
++s 101e1960101e0477 MegaRAID 477 Elite 3100 RAID Controller 0
+ s 101e1960101e0493 MegaRAID 493 Elite 1600 RAID Controller 0
++s 101e1960101e0494 MegaRAID 494 Elite 1650 RAID Controller 0
++s 101e1960101e0503 MegaRAID 503 Enterprise 1650 RAID Controller 0
++s 101e1960101e0511 MegaRAID 511 i4 IDE RAID Controller 0
++s 101e1960101e0522 MegaRAID 522 i4133 RAID Controller 0
+ s 101e196010280471 PowerEdge RAID Controller 3/QC 0
+ s 101e196010280475 PowerEdge RAID Controller 3/SC 0
+ s 101e196010280493 PowerEdge RAID Controller 3/DC 0
+@@ -781,12 +1114,13 @@
+ v 1020 Hitachi Computer Products 0
+ v 1021 OKI Electric Industry Co. Ltd. 0
+ v 1022 Advanced Micro Devices [AMD] 0
+-d 10221100 K8 NorthBridge 0
+-d 10221101 K8 NorthBridge 0
+-d 10221102 K8 NorthBridge 0
+-d 10221103 K8 NorthBridge 0
++d 10221100 K8 [Athlon64/Opteron] HyperTransport Technology Configuration 0
++d 10221101 K8 [Athlon64/Opteron] Address Map 0
++d 10221102 K8 [Athlon64/Opteron] DRAM Controller 0
++d 10221103 K8 [Athlon64/Opteron] Miscellaneous Control 0
+ d 10222000 79c970 [PCnet32 LANCE] 0
+ s 1022200010142000 NetFinity 10/100 Fast Ethernet 0
++s 1022200010222000 PCnet - Fast 79C971 0
+ s 10222000103c104c Ethernet with LAN remote power Adapter 0
+ s 10222000103c1064 Ethernet with LAN remote power Adapter 0
+ s 10222000103c1065 Ethernet with LAN remote power Adapter 0
+@@ -798,14 +1132,23 @@
+ s 1022200012592454 AT-2450v4 10Mb Ethernet Adapter 0
+ s 1022200012592700 AT-2700TX 10/100 Fast Ethernet 0
+ s 1022200012592701 AT-2700FX 100Mb Ethernet 0
++s 102220004c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
++s 102220004c531010 CP5/CR6 mainboard 0
++s 102220004c531020 VR6 mainboard 0
++s 102220004c531030 PC5 mainboard 0
++s 102220004c531040 CL7 mainboard 0
++s 102220004c531060 PC7 mainboard 0
+ d 10222001 79c978 [HomePNA] 0
+ s 1022200110920a78 Multimedia Home Network Adapter 0
+ s 1022200116680299 ActionLink Home Network Adapter 0
++d 10222003 Am 1771 MBW [Alchemy] 0
+ d 10222020 53c974 [PCscsi] 0
+ d 10222040 79c974 0
+ d 10223000 ELanSC520 Microcontroller 0
+ d 10227006 AMD-751 [Irongate] System Controller 0
+ d 10227007 AMD-751 [Irongate] AGP Bridge 0
++d 1022700a AMD-IGR4 AGP Host to PCI Bridge 0
++d 1022700b AMD-IGR4 PCI to PCI Bridge 0
+ d 1022700c AMD-760 MP [IGD4-2P] System Controller 0
+ d 1022700d AMD-760 MP [IGD4-2P] AGP Bridge 0
+ d 1022700e AMD-760 [IGD4-1P] System Controller 0
+@@ -836,19 +1179,28 @@
+ d 10227454 AMD-8151 System Controller 0
+ d 10227455 AMD-8151 AGP Bridge 0
+ d 10227460 AMD-8111 PCI 0
++s 10227460161f3017 HDAMB 0
+ d 10227461 AMD-8111 USB 0
+ d 10227462 AMD-8111 Ethernet 0
+ d 10227464 AMD-8111 USB 0
++s 10227464161f3017 HDAMB 0
+ d 10227468 AMD-8111 LPC 0
++s 10227468161f3017 HDAMB 0
+ d 10227469 AMD-8111 IDE 0
++s 10227469161f3017 HDAMB 0
+ d 1022746a AMD-8111 SMBus 2.0 0
+ d 1022746b AMD-8111 ACPI 0
++s 1022746b161f3017 HDAMB 0
+ d 1022746d AMD-8111 AC97 Audio 0
++s 1022746d161f3017 HDAMB 0
+ d 1022746e AMD-8111 MC97 Modem 0
++d 1022756b AMD-8111 ACPI 0
+ v 1023 Trident Microsystems 0
+ d 10230194 82C194 0
+ d 10232000 4DWave DX 0
+ d 10232001 4DWave NX 0
++s 10232001122d1400 Trident PCI288-Q3DII (NX) 0
++d 10232100 CyberBlade XP4m32 0
+ d 10238400 CyberBlade/i7 0
+ s 1023840010238400 CyberBlade i7 AGP 0
+ d 10238420 CyberBlade/i7d 0
+@@ -857,8 +1209,8 @@
+ d 10238520 CyberBlade i1 0
+ s 102385200e11b16e CyberBlade i1 AGP 0
+ s 1023852010238520 CyberBlade i1 AGP 0
+-d 10238620 CyberBlade/i1 1
+-s 1023862010140502 ThinkPad T30 1
++d 10238620 CyberBlade/i1 0
++s 1023862010140502 ThinkPad R30/T30 0
+ d 10238820 CyberBlade XPAi1 0
+ d 10239320 TGUI 9320 0
+ d 10239350 GUI Accelerator 0
+@@ -925,6 +1277,8 @@
+ d 10251631 M1631 Northbridge+3D Graphics [Aladdin TNT2] 0
+ d 10251641 M1641 Northbridge [Aladdin-Pro IV] 0
+ d 10251647 M1647 [MaGiK1] PCI North Bridge 0
++d 10251671 M1671 Northbridge [ALADDiN-P4] 0
++d 10251672 Northbridge [CyberALADDiN-P4] 0
+ d 10253141 M3141 0
+ d 10253143 M3143 0
+ d 10253145 M3145 0
+@@ -954,37 +1308,52 @@
+ d 10255453 M5453 PCI AC-Link Controller Modem Device 0
+ d 10257101 M7101 PCI PMU Power Management Controller 0
+ s 1025710110b97101 M7101 PCI PMU Power Management Controller 0
+-v 1028 Dell Computer Corporation 0
++v 1028 Dell 0
+ d 10280001 PowerEdge Expandable RAID Controller 2/Si 0
+-s 1028000110280001 PowerEdge Expandable RAID Controller 2/Si 0
+-d 10280002 PowerEdge Expandable RAID Controller 3 0
+-s 1028000210280002 PowerEdge Expandable RAID Controller 3/Di 0
+-s 10280002102800d1 PowerEdge Expandable RAID Controller 3/Di 0
+-s 10280002102800d9 PowerEdge Expandable RAID Controller 3/Di 0
++s 1028000110280001 PowerEdge 2400 0
++d 10280002 PowerEdge Expandable RAID Controller 3/Di 0
++s 1028000210280002 PowerEdge 4400 0
+ d 10280003 PowerEdge Expandable RAID Controller 3/Si 0
+-s 1028000310280003 PowerEdge Expandable RAID Controller 3/Si 0
+-d 10280004 PowerEdge Expandable RAID Controller 3/Si 0
+-s 10280004102800d0 PowerEdge Expandable RAID Controller 3/Si 0
+-d 10280005 PowerEdge Expandable RAID Controller 3/Di 0
++s 1028000310280003 PowerEdge 2450 0
+ d 10280006 PowerEdge Expandable RAID Controller 3/Di 0
+-d 10280007 Remote Assistant Card 3 0
+-d 10280008 PowerEdge Expandable RAID Controller 3/Di 0
+-d 1028000a PowerEdge Expandable RAID Controller 3 0
+-s 1028000a10270121 PowerEdge Expandable RAID Controller 3/Di 0
+-s 1028000a10280106 PowerEdge Expandable RAID Controller 3/Di 0
+-s 1028000a1028011b PowerEdge Expandable RAID Controller 3/Di 0
+-d 1028000c Embedded Systems Management Device 4 0
+-d 1028000e PowerEdge Expandable RAID Controller 0
+-d 1028000f PowerEdge Expandable RAID Controller 4/Di 0
++d 10280007 Remote Access Card III 0
++d 10280008 Remote Access Card III 0
++d 10280009 Remote Access Card III: BMC/SMIC device not present 0
++d 1028000a PowerEdge Expandable RAID Controller 3/Di 0
++d 1028000c Embedded Remote Access or ERA/O 0
++d 1028000d Embedded Remote Access: BMC/SMIC device 0
++d 1028000e PowerEdge Expandable RAID controller 4/Di 0
++d 1028000f PowerEdge Expandable RAID controller 4/Di 0
++d 10280010 Remote Access Card 4 0
++d 10280011 Remote Access Card 4 Daughter Card 0
++d 10280012 Remote Access Card 4 Daughter Card Virtual UART 0
++d 10280013 PowerEdge Expandable RAID controller 4 0
++s 102800131028016c PowerEdge Expandable RAID Controller 4e/Si 0
++s 102800131028016d PowerEdge Expandable RAID Controller 4e/Di 0
++s 102800131028016e PowerEdge Expandable RAID Controller 4e/Di 0
++s 102800131028016f PowerEdge Expandable RAID Controller 4e/Di 0
++s 1028001310280170 PowerEdge Expandable RAID Controller 4e/Di 0
++d 10280014 Remote Access Card 4 Daughter Card SMIC interface 0
+ v 1029 Siemens Nixdorf IS 0
+ v 102a LSI Logic 0
+ d 102a0000 HYDRA 0
+ d 102a0010 ASPEN 0
++d 102a001f AHA-2940U2/U2W /7890/7891 SCSI Controllers 0
++s 102a001f9005000f 2940U2W SCSI Controller 0
++s 102a001f90050106 2940U2W SCSI Controller 0
++s 102a001f9005a180 2940U2W SCSI Controller 0
++d 102a00c5 AIC-7899 U160/m SCSI Controller 0
++s 102a00c5102800c5 PowerEdge 2550/2650/4600 0
++d 102a00cf AIC-7899P U160/m 0
++s 102a00cf10280106 PowerEdge 4600 0
++s 102a00cf10280121 PowerEdge 2650 0
+ v 102b Matrox Graphics, Inc. 0
+ d 102b0010 MGA-I [Impression?] 0 DJ: I've a suspicion that 0010 is a duplicate of 0d10.
++d 102b0100 MGA 1064SG [Mystique] 0
+ d 102b0518 MGA-II [Athena] 0
+ d 102b0519 MGA 2064W [Millennium] 0
+ d 102b051a MGA 1064SG [Mystique] 0
++s 102b051a102b0100 MGA-1064SG Mystique 0
+ s 102b051a102b1100 MGA-1084SG Mystique 0
+ s 102b051a102b1200 MGA-1084SG Mystique 0
+ s 102b051a1100102b MGA-1084SG Mystique 0
+@@ -1053,6 +1422,7 @@
+ s 102b0525102b07c1 Millennium G450 SDR Dual Head LE 0
+ s 102b0525102b0d41 Millennium G450 Dual Head PCI 0
+ s 102b0525102b0d42 Millennium G450 Dual Head LX PCI 0
++s 102b0525102b0d43 Millennium G450 32Mb Dual Head PCI 0
+ s 102b0525102b0e00 Marvel G450 eTV 0
+ s 102b0525102b0e01 Marvel G450 eTV 0
+ s 102b0525102b0e02 Marvel G450 eTV 0
+@@ -1079,11 +1449,10 @@
+ s 102b0525102b5f52 4Sight II 0
+ s 102b0525102b9010 Millennium G400 Dual Head 0
+ s 102b052514580400 GA-G400 0
+-s 102b052517050001 Digital First Millennium G450 32MB SGRAM 0
+-s 102b052517050002 Digital First Millennium G450 16MB SGRAM 0
+-s 102b052517050003 Digital First Millennium G450 32MB 0
+-s 102b052517050004 Digital First Millennium G450 16MB 0
+-s 102b0525b16f0e11 MGA-G400 AGP 0
++s 102b052517050001 Millennium G450 32MB SGRAM 0
++s 102b052517050002 Millennium G450 16MB SGRAM 0
++s 102b052517050003 Millennium G450 32MB 0
++s 102b052517050004 Millennium G450 16MB 0
+ d 102b0527 MGA Parhelia AGP 0
+ s 102b0527102b0840 Parhelia 128Mb 0
+ d 102b0d10 MGA Ultima/Impression 0
+@@ -1103,12 +1472,19 @@
+ s 102b2527102b0f83 Millennium G550 0
+ s 102b2527102b0f84 Millennium G550 Dual Head DDR 32Mb 0
+ s 102b2527102b1e41 Millennium G550 0
++d 102b2537 MGA G650 AGP 0
+ d 102b4536 VIA Framegrabber 0
+ d 102b6573 Shark 10/100 Multiport SwitchNIC 0
+ v 102c Chips and Technologies 0
+ d 102c00b8 F64310 0
+ d 102c00c0 F69000 HiQVideo 0
+ s 102c00c0102c00c0 F69000 HiQVideo 0
++s 102c00c04c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
++s 102c00c04c531010 CP5/CR6 mainboard 0
++s 102c00c04c531020 VR6 mainboard 0
++s 102c00c04c531030 PC5 mainboard 0
++s 102c00c04c531050 CT7 mainboard 0
++s 102c00c04c531051 CE7 mainboard 0
+ d 102c00d0 F65545 0
+ d 102c00d8 F65545 0
+ d 102c00dc F65548 0
+@@ -1120,13 +1496,27 @@
+ d 102c00f4 F68554 HiQVision 0
+ d 102c00f5 F68555 0
+ d 102c0c30 F69030 0
++s 102c0c304c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
++s 102c0c304c531050 CT7 mainboard 0
++s 102c0c304c531051 CE7 mainboard 0
++s 102c0c304c531080 CT8 mainboard 0 C5C project cancelled
+ v 102d Wyse Technology Inc. 0
+ d 102d50dc 3328 Audio 0
+ v 102e Olivetti Advanced Technology 0
+ v 102f Toshiba America 0
+ d 102f0009 r4x00 0
++d 102f000a TX3927 MIPS RISC PCI Controller 0
+ d 102f0020 ATM Meteor 155 0
+ s 102f0020102f00f8 ATM Meteor 155 0
++d 102f0030 TC35815CF PCI 10/100 Mbit Ethernet Controller 0
++d 102f0031 TC35815CF PCI 10/100 Mbit Ethernet Controller with WOL 0
++d 102f0105 TC86C001 [goku-s] IDE 0
++d 102f0106 TC86C001 [goku-s] USB 1.1 Host 0
++d 102f0107 TC86C001 [goku-s] USB Device Controller 0
++d 102f0108 TC86C001 [goku-s] I2C/SIO/GPIO Controller 0
++d 102f0180 TX4927/38 MIPS RISC PCI Controller 0
++d 102f0181 TX4925 MIPS RISC PCI Controller 0
++d 102f0182 TX4937 MIPS RISC PCI Controller 0
+ v 1030 TMC Research 0
+ v 1031 Miro Computer Products AG 0
+ d 10315601 DC20 ASIC 0
+@@ -1135,23 +1525,29 @@
+ d 10316057 MiroVideo DC10/DC30+ 0
+ v 1032 Compaq 0
+ v 1033 NEC Corporation 0
++d 10330000 Vr4181A USB Host or Function Control Unit 0
+ d 10330001 PCI to 486-like bus Bridge 0
+ d 10330002 PCI to VL98 Bridge 0
+ d 10330003 ATM Controller 0
+ d 10330004 R4000 PCI Bridge 0
+ d 10330005 PCI to 486-like bus Bridge 0
+-d 10330006 GUI Accelerator 0
++d 10330006 PC-9800 Graphic Accelerator 0
+ d 10330007 PCI to UX-Bus Bridge 0
+-d 10330008 GUI Accelerator 0
+-d 10330009 GUI Accelerator for W98 0
++d 10330008 PC-9800 Graphic Accelerator 0
++d 10330009 PCI to PC9800 Core-Graph Bridge 0
++d 10330016 PCI to VL Bridge 0
+ d 1033001a [Nile II] 0
+ d 10330021 Vrc4373 [Nile I] 0
+ d 10330029 PowerVR PCX1 0
+ d 1033002a PowerVR 3D 0
++d 1033002c Star Alpha 2 0
++d 1033002d PCI to C-bus Bridge 0
+ d 10330035 USB 0
+ s 1033003511790001 USB 0
+ s 1033003512ee7000 Root Hub 0
+ s 1033003517990001 Root Hub 0
++s 10330035807d0035 PCI-USB2 (OHCI subsystem) 0
++d 1033003b PCI to C-bus Bridge 0
+ d 1033003e NAPCCARD Cardbus Controller 0
+ d 10330046 PowerVR PCX2 [midas] 0
+ d 1033005a Vrc5074 [Nile 4] 0
+@@ -1168,12 +1564,21 @@
+ d 10330074 56k Voice Modem 0
+ s 1033007410338014 RCV56ACF 56k Voice Modem 0
+ d 1033009b Vrc5476 0
++d 103300a5 VRC4173 0
+ d 103300a6 VRC5477 AC97 0
+ d 103300cd IEEE 1394 [OrangeLink] Host Controller 0
+ s 103300cd12ee8011 Root hub 0
++d 103300ce IEEE 1394 Host Controller 0
++d 103300df Vr4131 0
+ d 103300e0 USB 2.0 0
++s 103300e00ee43383 Sitecom IEEE 1394 / USB2.0 Combo Card 0
+ s 103300e012ee7001 Root hub 0
+ s 103300e017990002 Root Hub 0
++s 103300e0807d1043 PCI-USB2 (EHCI subsystem) 0
++d 103300e7 IEEE 1394 Host Controller 0
++d 103300f2 uPD72874 IEEE1394 OHCI 1.1 3-port PHY-Link Ctrlr 0
++d 103300f3 uPD6113x Multimedia Decoder/Processor [EMMA2] 0
++d 1033010c VR7701 0
+ v 1034 Framatome Connectors USA Inc. 0
+ v 1035 Comp. & Comm. Research Lab 0
+ v 1036 Future Domain Corp. 0
+@@ -1181,22 +1586,30 @@
+ v 1037 Hitachi Micro Systems 0
+ v 1038 AMP, Inc 0
+ v 1039 Silicon Integrated Systems [SiS] 0
+-d 10390001 5591/5592 AGP 0
++d 10390001 Virtual PCI-to-PCI bridge (AGP) 0
+ d 10390002 SG86C202 0
+ d 10390006 85C501/2/3 0
+-d 10390008 85C503/5513 0
++d 10390008 SiS85C503/5513 (LPC Bridge) 0
+ d 10390009 ACPI 0
++d 10390016 SiS961/2 SMBus Controller 0 source: http://members.datafast.net.au/dft0802/downloads/pcidevs.txt
+ d 10390018 SiS85C503/5513 (LPC Bridge) 0
++d 10390180 RAID bus controller 180 SATA/PATA [SiS] 0 Controller for 2 PATA and 2 SATA channels
++d 10390181 SiS SATA 0
+ d 10390200 5597/5598/6326 VGA 0
+ s 1039020010390000 SiS5597 SVGA (Shared RAM) 0
+ d 10390204 82C204 0
+ d 10390205 SG86C205 0
+-d 10390300 300/200 0
++d 10390300 300/305 PCI/AGP VGA Display Adapter 0
+ s 10390300107d2720 Leadtek WinFast VR300 0
++d 10390310 315H PCI/AGP VGA Display Adapter 0
++d 10390315 315 PCI/AGP VGA Display Adapter 0
++d 10390325 315PRO PCI/AGP VGA Display Adapter 0
++d 10390330 330 [Xabre] PCI/AGP VGA Display Adapter 0
+ d 10390406 85C501/2 0
+ d 10390496 85C496 0
+ d 10390530 530 Host 0
+ d 10390540 540 Host 0
++d 10390550 550 Host 0
+ d 10390597 5513C 0
+ d 10390601 85C601 0
+ d 10390620 620 Host 0
+@@ -1205,24 +1618,40 @@
+ d 10390635 635 Host 0
+ d 10390645 SiS645 Host & Memory & AGP Controller 0
+ d 10390646 SiS645DX Host & Memory & AGP Controller 0
+-d 10390650 650 Host 0
+-d 10390651 SiS651 Host 0
++d 10390648 SiS 645xx 0
++d 10390650 650/M650 Host 0
++d 10390651 651 Host 0
++d 10390655 655 Host 0
++d 10390660 660 Host 0
++d 10390661 661FX/M661FX/M661MX Host 0
+ d 10390730 730 Host 0
+ d 10390733 733 Host 0
+ d 10390735 735 Host 0
+ d 10390740 740 Host 0
++d 10390741 741/741GX/M741 Host 0
+ d 10390745 745 Host 0
+-d 10390900 SiS900 10/100 Ethernet 0
++d 10390746 746 Host 0
++d 10390755 755 Host 0
++d 10390760 760/M760 Host 0
++d 10390900 SiS900 PCI Fast Ethernet 0
++s 1039090010190a14 K7S5A motherboard 0
+ s 1039090010390900 SiS900 10/100 Ethernet Adapter 0
++s 1039090010438035 CUSI-FX motherboard 0
+ d 10390961 SiS961 [MuTIOL Media IO] 0
+ d 10390962 SiS962 [MuTIOL Media IO] 0
++d 10390963 SiS963 [MuTIOL Media IO] 0
++d 10390964 SiS964 [MuTIOL Media IO] 0
++d 10390965 SiS965 [MuTIOL Media IO] 0
+ d 10393602 83C602 0
+ d 10395107 5107 0
+ d 10395300 SiS540 PCI Display Adapter 0
++d 10395315 550 PCI/AGP VGA Display Adapter 0
+ d 10395401 486 PCI Chipset 0
+ d 10395511 5511/5512 0
+ d 10395513 5513 [IDE] 0
++s 1039551310190970 P6STP-FL motherboard 0
+ s 1039551310395513 SiS5513 EIDE Controller (A,B step) 0
++s 1039551310438035 CUSI-FX motherboard 0
+ d 10395517 5517 0
+ d 10395571 5571 0
+ d 10395581 5581 Pentium Chipset 0
+@@ -1234,9 +1663,12 @@
+ d 10396204 Video decoder & MPEG interface 0
+ d 10396205 VGA Controller 0
+ d 10396236 6236 3D-AGP 0
+-d 10396300 SiS630 GUI Accelerator+3D 0
+-d 10396306 SiS530 3D PCI/AGP 0
++d 10396300 630/730 PCI/AGP VGA Display Adapter 0
++s 1039630010190970 P6STP-FL motherboard 0
++s 1039630010438035 CUSI-FX motherboard 0
++d 10396306 530/620 PCI/AGP VGA Display Adapter 0
+ s 1039630610396306 SiS530,620 GUI Accelerator+3D 0
++d 10396325 65x/M650/740 PCI/AGP VGA Display Adapter 0
+ d 10396326 86C326 5598/6326 0
+ s 1039632610396326 SiS6326 GUI Accelerator 0
+ s 1039632610920a50 SpeedStar A50 0
+@@ -1244,12 +1676,17 @@
+ s 1039632610924910 SpeedStar A70 0
+ s 1039632610924920 SpeedStar A70 0
+ s 1039632615696326 SiS6326 GUI Accelerator 0
+-d 10397001 7001 0
++d 10396330 661/741/760 PCI/AGP VGA Display Adapter 0
++s 1039633010396330 [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter 0
++d 10397001 USB 1.0 Controller 0
++s 1039700110190a14 K7S5A motherboard 0
+ s 1039700110397000 Onboard USB Controller 0
++d 10397002 USB 2.0 Controller 0
++s 1039700215097002 Onboard USB Controller 0
+ d 10397007 FireWire Controller 0
+-d 10397012 SiS7012 PCI Audio Accelerator 0
+-d 10397013 56k Winmodem (Smart Link HAMR5600 compatible) 0
+-d 10397016 SiS7016 10/100 Ethernet Adapter 0
++d 10397012 Sound Controller 0
++d 10397013 AC'97 Modem Controller 0 There are may be different modem codecs here (Intel537 compatible and incompatible)
++d 10397016 SiS7016 PCI Fast Ethernet Adapter 0
+ s 1039701610397016 SiS7016 10/100 Ethernet Adapter 0
+ d 10397018 SiS PCI Audio Accelerator 0
+ s 10397018101401b6 SiS PCI Audio Accelerator 0
+@@ -1274,6 +1711,7 @@
+ s 1039701815c50111 SiS PCI Audio Accelerator 0
+ s 10397018270fa171 SiS PCI Audio Accelerator 0
+ s 10397018a0a00022 SiS PCI Audio Accelerator 0
++d 10397019 SiS7019 Audio Accelerator 0
+ v 103a Seiko Epson Corporation 0
+ v 103b Tatung Co. of America 0
+ v 103c Hewlett-Packard Company 0
+@@ -1302,10 +1740,11 @@
+ s 103c1048103c1049 Tosca Console 0
+ s 103c1048103c104a Tosca Secondary 0
+ s 103c1048103c104b Maestro SP2 0
+-s 103c1048103c1223 Halfdome Console 0
++s 103c1048103c1223 Superdome Console 0
+ s 103c1048103c1226 Keystone SP2 0
+ s 103c1048103c1227 Powerbar SP2 0
+ s 103c1048103c1282 Everest SP2 0
++d 103c1054 PCI Local Bus Adapter 0
+ d 103c1064 79C970 PCnet Ethernet Controller 0
+ d 103c108b Visualize FXe 0
+ d 103c10c1 NetServer Smart IRQ Router 0
+@@ -1318,6 +1757,7 @@
+ d 103c1229 zx1 System Bus Adapter 0
+ d 103c122a zx1 I/O Controller 0
+ d 103c122e zx1 Local Bus Adapter 0
++d 103c127c sx1000 I/O Controller 0
+ d 103c1290 Auxiliary Diva Serial Port 0
+ d 103c2910 E2910A PCIBus Exerciser 0
+ d 103c2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer 0
+@@ -1326,14 +1766,20 @@
+ v 1040 Accelgraphics Inc. 0
+ v 1041 Computrend 0
+ v 1042 Micron 0
+-d 10421000 FDC 37C665 0
+-d 10421001 37C922 0
++d 10421000 PC Tech RZ1000 0
++d 10421001 PC Tech RZ1001 0
+ d 10423000 Samurai_0 0
+ d 10423010 Samurai_1 0
+ d 10423020 Samurai_IDE 0
+-v 1043 Asustek Computer, Inc. 0
++v 1043 ASUSTeK Computer Inc. 0
+ d 10430675 ISDNLink P-IN100-ST-D 0
+-v 1044 Distributed Processing Technology 0
++d 10434015 v7100 SDRAM [GeForce2 MX] 0
++d 10434021 v7100 Combo Deluxe [GeForce2 MX + TV tuner] 0
++d 10434057 v8200 GeForce 3 0
++d 10438043 v8240 PAL 128M [P4T] Motherboard 0
++d 1043807b v9280/TD [Geforce4 TI4200 8X With TV-Out and DVI] 0
++d 104380bb v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out] 0
++v 1044 Adaptec (formerly DPT) 0
+ d 10441012 Domino RAID Engine 0
+ d 1044a400 SmartCache/Raid I-IV Controller 0
+ d 1044a500 PCI Bridge 0
+@@ -1374,6 +1820,7 @@
+ s 1044a5011044c065 3010S Ultra3 Four Channel 0
+ s 1044a5011044c066 3010S Fibre Channel 0
+ d 1044a511 SmartRAID V Controller 0
++s 1044a5111044c032 ASR-2005S I2O Zero Channel 0
+ v 1045 OPTi Inc. 0
+ d 1045a0f8 82C750 [Vendetta] USB Controller 0
+ d 1045c101 92C264 0
+@@ -1394,24 +1841,34 @@
+ d 1045c832 82C832 0
+ d 1045c861 82C861 0
+ d 1045c895 82C895 0
+-d 1045c935 EV1935 ECTIVA MachOne PCI Audio 0
++d 1045c935 EV1935 ECTIVA MachOne PCIAudio 0
+ d 1045d568 82C825 [Firebridge 2] 0
+ d 1045d721 IDE [FireStar] 0
+ v 1046 IPC Corporation, Ltd. 0
+ v 1047 Genoa Systems Corp 0
+ v 1048 Elsa AG 0
++d 10480c60 Gladiac MX 0
+ d 10480d22 Quadro4 900XGL [ELSA GLoria4 900XGL] 0
+ d 10481000 QuickStep 1000 0
+ d 10483000 QuickStep 3000 0
++d 10488901 Gloria XL 0
+ v 1049 Fountain Technologies, Inc. 0
+-v 104a SGS Thomson Microelectronics 0
++v 104a STMicroelectronics 0 # nee SGS Thomson Microelectronics
+ d 104a0008 STG 2000X 0
+ d 104a0009 STG 1764X 0
+-d 104a0010 STG4000 [3D Prophet Kyro Series] 1
+-d 104a0981 DEC-Tulip compatible 10/100 Ethernet 0
++d 104a0010 STG4000 [3D Prophet Kyro Series] 0
++d 104a0209 STPC Consumer/Industrial North- and Southbridge 0
++d 104a020a STPC Atlas/ConsumerS/Consumer IIA Northbridge 0
++d 104a0210 STPC Atlas ISA Bridge 0 From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors>
++d 104a021a STPC Consumer S Southbridge 0
++d 104a021b STPC Consumer IIA Southbridge 0
++d 104a0500 ST70137 [Unicorn] ADSL DMT Transceiver 0
++d 104a0564 STPC Client Northbridge 0
++d 104a0981 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ d 104a1746 STG 1764X 0
+-d 104a2774 DEC-Tulip compatible 10/100 Ethernet 0
++d 104a2774 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ d 104a3520 MPEG-II decoder card 0
++d 104a55cc STPC Client Southbridge 0
+ v 104b BusLogic 0
+ d 104b0140 BT-946C (old) [multimaster 01] 0
+ d 104b1040 BT-946C (BA80C30) [MultiMaster 10] 0
+@@ -1420,6 +1877,7 @@
+ d 104c0500 100 MBit LAN Controller 0
+ d 104c0508 TMS380C2X Compressor Interface 0
+ d 104c1000 Eagle i/f AS 0
++d 104c104c PCI1510 PC card Cardbus Controller 0
+ d 104c3d04 TVP4010 [Permedia] 0
+ d 104c3d07 TVP4020 [Permedia 2] 0
+ s 104c3d0710114d10 Comet 0
+@@ -1460,26 +1918,46 @@
+ d 104c8022 TSB43AB22 IEEE-1394a-2000 Controller (PHY/Link) 0
+ d 104c8023 TSB43AB22/A IEEE-1394a-2000 Controller (PHY/Link) 0
+ d 104c8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link) 0
++d 104c8025 TSB82AA2 IEEE-1394b Link Layer Controller 0
++s 104c802555aa55aa FireWire 800 PCI Card 0
+ d 104c8026 TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link) 0
+ d 104c8027 PCI4451 IEEE-1394 Controller 0
+ s 104c8027102800e6 PCI4451 IEEE-1394 Controller (Dell Inspiron 8100) 0
+-d 104c8400 USR2210 22Mbps Wireless PC Card 0
++d 104c8029 PCI4510 IEEE-1394 Controller 0
++s 104c802910280163 Latitude D505 0
++s 104c802910718160 MIM2900 0
++d 104c802e PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller 0
++d 104c8201 PCI1620 Firmware Loading Function 0
++d 104c8400 ACX 100 22Mbps Wireless Interface 0
++s 104c840000fc16ec U.S. Robotics 22 Mbps Wireless PC Card (model 2210) 0
++s 104c840000fd16ec U.S. Robotics 22Mbps Wireless PCI Adapter (model 2216) 0
++s 104c840011863b00 DWL-650+ PC Card cardbus 22Mbs Wireless Adapter [AirPlus] 0
++s 104c840011863b01 DWL-520+ 22Mbps PCI Wireless Adapter 0
++d 104c8401 ACX 100 22Mbps Wireless Interface 0
++d 104c9000 Wireless Interface (of unknown type) 0 OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter (whi
++d 104c9066 ACX 111 54Mbps Wireless Interface 0
+ d 104ca001 TDC1570 0
+ d 104ca100 TDC1561 0
+ d 104ca102 TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f 0
+-d 104ca106 TMS320C6205 0
++d 104ca106 TMS320C6205 Fixed Point DSP 0
++s 104ca106175c5000 ASI50xx Audio Adapter 0
++s 104ca106175c8700 ASI87xx Radio Tuner card 0
+ d 104cac10 PCI1050 0
+ d 104cac11 PCI1053 0
+ d 104cac12 PCI1130 0
+ d 104cac13 PCI1031 0
+ d 104cac15 PCI1131 0
+ d 104cac16 PCI1250 0
++s 104cac1610140092 ThinkPad 600 0
+ d 104cac17 PCI1220 0
+ d 104cac18 PCI1260 0
+ d 104cac19 PCI1221 0
+ d 104cac1a PCI1210 0
+ d 104cac1b PCI1450 0
++s 104cac1b0e11b113 Armada M700 0
+ d 104cac1c PCI1225 0
++s 104cac1c0e11b121 Armada E500 0
++s 104cac1c10280088 Dell Computer Corporation Latitude CPi A400XT 0
+ d 104cac1d PCI1251A 0
+ d 104cac1e PCI1211 0
+ d 104cac1f PCI1251B 0
+@@ -1493,17 +1971,32 @@
+ d 104cac41 PCI4410 PC card Cardbus Controller 0
+ d 104cac42 PCI4451 PC card Cardbus Controller 0
+ s 104cac42102800e6 PCI4451 PC card CardBus Controller (Dell Inspiron 8100) 0
++d 104cac44 PCI4510 PC card Cardbus Controller 0
++s 104cac4410280163 Latitude D505 0
++s 104cac4410718160 MIM2000 0
++d 104cac46 PCI4520 PC card Cardbus Controller 0
+ d 104cac50 PCI1410 PC card Cardbus Controller 0
+ d 104cac51 PCI1420 0
+ s 104cac511014023b ThinkPad T23 (2647-4MG) 0
++s 104cac51102800b1 Latitude C600 0
++s 104cac511028012a Latitude C640 0
++s 104cac51103380cd Versa Note VXi 0
+ s 104cac5110cf1095 Lifebook C6155 0
+ s 104cac51e4bf1000 CP2-2-HIPHOP 0
+ d 104cac52 PCI1451 PC card Cardbus Controller 0
+ d 104cac53 PCI1421 PC card Cardbus Controller 0
+-d 104cac55 PCI1250 PC card Cardbus Controller 0
+-s 104cac5510140512 ThinkPad T30 1
+-s 104cac55104cac55 PCI-1520 CardBus Controller 1 Windoze XP on my ThinkPad T30 claims that it is 1520, not 1250.
++d 104cac54 PCI1620 PC Card Controller 0
++d 104cac55 PCI1520 PC card Cardbus Controller 0
++s 104cac5510140512 ThinkPad T30/T40 0
++d 104cac56 PCI1510 PC card Cardbus Controller 0
++s 104cac5610140528 ThinkPad R40e (2684-HVG) Cardbus Controller 0
+ d 104cac60 PCI2040 PCI to DSP Bridge Controller 0
++s 104cac60175c5100 ASI51xx Audio Adapter 0
++s 104cac60175c6100 ASI61xx Audio Adapter 0
++s 104cac60175c6200 ASI62xx Audio Adapter 0
++d 104cac8d PCI 7620 0
++d 104cac8e PCI7420 CardBus Controller 0
++d 104cac8f PCI7420/PCI7620 Dual Socket CardBus and Smart Card Cont. w/ 1394a-2000 OHCI Two-Port PHY/Link-Layer Cont. and SD/MS-Pro Sockets 0
+ d 104cfe00 FireWire Host Controller 0
+ d 104cfe03 12C01A FireWire Host Controller 0
+ v 104d Sony Corporation 0
+@@ -1528,7 +2021,9 @@
+ s 1050084010500840 W89C840 Ethernet Adapter 0
+ d 10500940 W89C940 0
+ d 10505a5a W89C940F 0
+-d 10506692 W6692 1 ISDN Card
++d 10506692 W6692 0
++d 10509921 W99200F MPEG-1 Video Encoder 0
++d 10509922 W99200F/W9922PF MPEG-1/2 Video Encoder 0
+ d 10509970 W9970CF 0
+ v 1051 Anigma, Inc. 0
+ v 1052 ?Young Micro Systems 0
+@@ -1546,11 +2041,27 @@
+ d 10570003 MPC8240 [Kahlua] 0
+ d 10570004 MPC107 0
+ d 10570006 MPC8245 [Unity] 0
++d 10570008 MPC8540 0
++d 10570009 MPC8560 0
+ d 10570100 MC145575 [HFC-PCI] 0
+ d 10570431 KTI829c 100VG 0
+-d 10571801 Audio I/O Controller (MIDI) 0
++d 10571801 DSP56301 Digital Signal Processor 0
++s 1057180114fb0101 Transas Radar Imitator Board [RIM] 0
++s 1057180114fb0102 Transas Radar Imitator Board [RIM-2] 0
++s 1057180114fb0202 Transas Radar Integrator Board [RIB-2] 0
++s 1057180114fb0611 1 channel CAN bus Controller [CanPci-1] 0
++s 1057180114fb0612 2 channels CAN bus Controller [CanPci-2] 0
++s 1057180114fb0613 3 channels CAN bus Controller [CanPci-3] 0
++s 1057180114fb0614 4 channels CAN bus Controller [CanPci-4] 0
++s 1057180114fb0621 1 channel CAN bus Controller [CanPci2-1] 0
++s 1057180114fb0622 2 channels CAN bus Controller [CanPci2-2] 0
++s 1057180114fb0810 Transas VTS Radar Integrator Board [RIB-4] 0
++s 10571801175c4200 ASI4215 Audio Adapter 0
++s 10571801175c4300 ASI43xx Audio Adapter 0
++s 10571801175c4400 ASI4401 Audio Adapter 0
+ s 10571801ecc00030 Layla 0
+ d 105718c0 MPC8265A/MPC8266 0
++d 105718c1 MPC8271/MPC8272 0
+ d 10574801 Raven 0
+ d 10574802 Falcon 0
+ d 10574803 Hawk 0
+@@ -1574,36 +2085,56 @@
+ s 1057560014c80302 SM56 PCI Fax Modem 0
+ s 1057560016680300 SM56 PCI Speakerphone Modem 0
+ s 1057560016680302 SM56 PCI Fax Modem 0
++d 10575803 MPC5200 0
+ d 10576400 MPC190 Security Processor (S1 family, encryption) 0
++d 10576405 MPC184 Security Processor (S1 family) 0
+ v 1058 Electronics & Telecommunications RSH 0
+ v 1059 Teknor Industrial Computers Inc 0
+ v 105a Promise Technology, Inc. 0
+-d 105a0d30 20265 0
++d 105a0d30 PDC20265 (FastTrak100 Lite/Ultra100) 0 more correct description from promise linux sources
+ s 105a0d30105a4d33 Ultra100 0
+ d 105a0d38 20263 0
+ s 105a0d38105a4d39 Fasttrak66 0
+ d 105a1275 20275 0
+-d 105a4d30 20267 0
++d 105a3318 PDC20318 (SATA150 TX4) 0
++d 105a3319 PDC20319 (FastTrak S150 TX4) 0
++s 105a331980863427 S875WP1-E mainboard 0
++d 105a3371 PDC20371 (FastTrak S150 TX2plus) 0
++d 105a3373 PDC20378 (FastTrak 378/SATA 378) 0
++s 105a3373104380f5 PC-DL Deluxe motherboard 0
++s 105a33731462702e K8T NEO FIS2R motherboard 0
++d 105a3375 PDC20375 (SATA150 TX2plus) 0
++d 105a3376 PDC20376 (FastTrak 376) 0
++s 105a33761043809e A7V8X motherboard 0
++d 105a3574 PDC20579 SATAII 150 IDE Controller 0
++d 105a3d18 PDC20518 SATAII 150 IDE Controller 0
++d 105a4d30 PDC20267 (FastTrak100/Ultra100) 0
+ s 105a4d30105a4d33 Ultra100 0
+-s 105a4d30105a4d39 Fasttrak100 0
++s 105a4d30105a4d39 FastTrak100 0
+ d 105a4d33 20246 0
+ s 105a4d33105a4d33 20246 IDE Controller 0
+-d 105a4d38 20262 0
++d 105a4d38 PDC20262 (FastTrak66/Ultra66) 0
+ s 105a4d38105a4d30 Ultra Device on SuperTrak 0
+ s 105a4d38105a4d33 Ultra66 0
+-s 105a4d38105a4d39 Fasttrak66 0
+-d 105a4d68 20268 0
++s 105a4d38105a4d39 FastTrak66 0
++d 105a4d68 PDC20268 (Ultra100 TX2) 0
+ s 105a4d68105a4d68 Ultra100TX2 0
+ d 105a4d69 20269 0
+-d 105a5275 PDC20276 IDE 0
+-d 105a5275 PDC20276 (MBFastTrack 133) 1 I can't obtain the sub device ID's. The correction is for the "secondary" name (the one between parentheses). Have great day !
++s 105a4d69105a4d68 Ultra133TX2 0
++d 105a5275 PDC20276 (MBFastTrak133 Lite) 0
+ s 105a5275105a0275 SuperTrak SX6000 IDE 0
++s 105a5275105a1275 MBFastTrak133 Lite (tm) Controller (RAID mode) 0
++s 105a52751458b001 MBUltra 133 0
+ d 105a5300 DC5300 0
+-d 105a6268 20268R 0
+-d 105a6269 PDC20271 0
+-s 105a6269105a6269 Fasttrack tx2 0
+-s 105a6269105a6269 FastTrak TX2/TX2000 1 Old entry has spelling mistake; besides, another product (TX2000) uses same chips, hence the same ID
+-d 105a7275 PDC20277 0
++d 105a6268 PDC20270 (FastTrak100 LP/TX2/TX4) 0
++s 105a6268105a4d68 FastTrak100 TX2 0
++d 105a6269 PDC20271 (FastTrak TX2000) 0
++s 105a6269105a6269 FastTrak TX2/TX2000 0
++d 105a6621 PDC20621 (FastTrak S150 SX4/FastTrak SX4000 lite) 0
++d 105a6622 PDC20621 [SATA150 SX4] 4 Channel IDE RAID Controller 0
++d 105a6626 PDC20618 (Ultra 618) 0
++d 105a6629 PDC20619 (FastTrak TX4000) 0
++d 105a7275 PDC20277 (SBFastTrak133 Lite) 0
+ v 105b Foxconn International, Inc. 0
+ v 105c Wipro Infotech Limited 0
+ v 105d Number 9 Computer Company 0
+@@ -1640,6 +2171,7 @@
+ s 105d493d13cc0009 Barco Metheus 5 Megapixel, Dual Head 0
+ s 105d493d13cc000a Barco Metheus 5 Megapixel, Dual Head 0
+ d 105d5348 Revolution 4 0
++s 105d5348105d0037 Revolution IV-FP AGP (For SGI 1600SW) 0
+ v 105e Vtech Computers Ltd 0
+ v 105f Infotronic America Inc 0
+ v 1060 United Microelectronics [UMC] 0
+@@ -1681,13 +2213,21 @@
+ d 10660005 National PC87550 System Controller 0
+ d 10668002 PT86C523 [Vesuvius v3] PCI-ISA Bridge Slave 0
+ v 1067 Mitsubishi Electric 0
++d 10670301 AccelGraphics AccelECLIPSE 0
++d 10670304 AccelGALAXY A2100 [OEM Evans & Sutherland] 0
++d 10670308 Tornado 3000 [OEM Evans & Sutherland] 0
+ d 10671002 VG500 [VolumePro Volume Rendering Accelerator] 0
+ v 1068 Diversified Technology 0
+ v 1069 Mylex Corporation 0
+ d 10690001 DAC960P 0
+ d 10690002 DAC960PD 0
+-d 10690010 DAC960PX 0
++d 10690010 DAC960PG 0
++d 10690020 DAC960LA 0
+ d 10690050 AcceleRAID 352/170/160 support Device 0
++d 1069b166 Gemstone chipset SCSI controller 0
++s 1069b16610140242 iSeries 2872 DASD IOA 0
++s 1069b16610140266 Dual Channel PCI-X U320 SCSI Adapter 0
++s 1069b16610140278 Dual Channel PCI-X U320 SCSI RAID Adapter 0
+ d 1069ba55 eXtremeRAID 1100 support Device 0
+ d 1069ba56 eXtremeRAID 2000/3000 support Device 0
+ v 106a Aten Research Inc 0
+@@ -1721,8 +2261,32 @@
+ d 106b0032 UniNorth 2 GMAC (Sun GEM) 0
+ d 106b0033 UniNorth 2 ATA/100 0
+ d 106b0034 UniNorth 2 AGP 0
++d 106b0035 UniNorth 2 PCI 0
++d 106b0036 UniNorth 2 Internal PCI 0
++d 106b003b UniNorth/Intrepid ATA/100 0
++d 106b003e KeyLargo/Intrepid Mac I/O 0
++d 106b003f KeyLargo/Intrepid USB 0
++d 106b0040 K2 KeyLargo USB 0
++d 106b0041 K2 KeyLargo Mac/IO 0
++d 106b0042 K2 FireWire 0
++d 106b0043 K2 ATA/100 0
++d 106b0045 K2 HT-PCI Bridge 0
++d 106b0046 K2 HT-PCI Bridge 0
++d 106b0047 K2 HT-PCI Bridge 0
++d 106b0048 K2 HT-PCI Bridge 0
++d 106b0049 K2 HT-PCI Bridge 0
++d 106b004b U3 AGP 0
++d 106b004c K2 GMAC (Sun GEM) 0
++d 106b004f Shasta Mac I/O 0
++d 106b0050 Shasta IDE 0
++d 106b0051 Shasta (Sun GEM) 0
++d 106b0052 Shasta Firewire 0
++d 106b0053 Shasta PCI Bridge 0
++d 106b0054 Shasta PCI Bridge 0
++d 106b0055 Shasta PCI Bridge 0
++d 106b0058 U3L AGP Bridge 0
+ d 106b1645 Tigon3 Gigabit Ethernet NIC (BCM5701) 0
+-v 106c Hyundai Electronics America 0
++v 106c Hynix Semiconductor 0
+ d 106c8801 Dual Pentium ISA/PCI Motherboard 0
+ d 106c8802 PowerPC ISA/PCI Motherboard 0
+ d 106c8803 Dual Window Graphics Accelerator 0
+@@ -1733,6 +2297,7 @@
+ v 106f City Gate Development Ltd 0
+ v 1070 Daewoo Telecom Ltd 0
+ v 1071 Mitac 0
++d 10718160 Mitac 8060B Mobile Platform 0
+ v 1072 GIT Co Ltd 0
+ v 1073 Yamaha Corporation 0
+ d 10730001 3D GUI Accelerator 0
+@@ -1773,12 +2338,13 @@
+ s 10771216101e8471 QLA12160 on AMI MegaRAID 0
+ s 10771216101e8493 QLA12160 on AMI MegaRAID 0
+ d 10771240 ISP1240 SCSI Host Adapter 0
+-d 10771280 ISP1280 0
++d 10771280 ISP1280 SCSI Host Adapter 0
+ d 10772020 ISP2020A Fast!SCSI Basic Adapter 0
+ d 10772100 QLA2100 64-bit Fibre Channel Adapter 0
+ s 1077210010770001 QLA2100 64-bit Fibre Channel Adapter 0
+-d 10772200 QLA2200 0
+-d 10772300 QLA2300 64-bit FC-AL Adapter 0
++d 10772200 QLA2200 64-bit Fibre Channel Adapter 0
++s 1077220010770002 QLA2200 0
++d 10772300 QLA2300 64-bit Fibre Channel Adapter 0
+ d 10772312 QLA2312 Fibre Channel Adapter 0
+ v 1078 Cyrix Corporation 0
+ d 10780000 5510 [Grappa] 0
+@@ -1799,6 +2365,8 @@
+ v 107c LG Electronics [Lucky Goldstar Co. Ltd] 0
+ v 107d LeadTek Research Inc. 0
+ d 107d0000 P86C850 0
++d 107d2134 WinFast 3D S320 II 0
++d 107d2971 [GeForce FX 5900] WinFast A350 TDH MyViVo 0
+ v 107e Interphase Corporation 0
+ d 107e0001 5515 ATM Adapter [Flipper] 0
+ d 107e0002 100 VG AnyLan Controller 0
+@@ -1874,6 +2442,8 @@
+ d 108e8001 Schizo PCI Bus Module 0
+ d 108ea000 Ultra IIi 0
+ d 108ea001 Ultra IIe 0
++d 108ea801 Tomatillo PCI Bus Module 0
++d 108eabba Cassini 10/100/1000 0
+ v 108f Systemsoft 0
+ v 1090 Encore Computer Corporation 0
+ v 1091 Intergraph Corporation 0
+@@ -1884,6 +2454,8 @@
+ d 10910060 Proprietary bus bridge 0
+ d 109100e4 Powerstorm 4D50T 0
+ d 10910720 Motion JPEG codec 0
++d 109107a0 Sun Expert3D-Lite Graphics Accelerator 0
++d 10911091 Sun Expert3D Graphics Accelerator 0
+ v 1092 Diamond Multimedia Systems 0
+ d 109200a0 Speedstar Pro SE 0
+ d 109200a8 Speedstar 64 0
+@@ -1913,7 +2485,19 @@
+ d 10931190 PCI-MIO-16E-4 0
+ d 10931330 PCI-6031E 0
+ d 10931350 PCI-6071E 0
++d 109314e0 PCI-6110 0
++d 109314f0 PCI-6111 0
++d 109317d0 PCI-6503 0
++d 10931870 PCI-6713 0
++d 10931880 PCI-6711 0
++d 109318b0 PCI-6052E 0
++d 10932410 PCI-6733 0
++d 10932890 PCI-6036E 0
+ d 10932a60 PCI-6023E 0
++d 10932a70 PCI-6024E 0
++d 10932a80 PCI-6025E 0
++d 10932c80 PCI-6035E 0
++d 10932ca0 PCI-6034E 0
+ d 1093b001 IMAQ-PCI-1408 0
+ d 1093b011 IMAQ-PXI-1408 0
+ d 1093b021 IMAQ-PCI-1424 0
+@@ -1927,13 +2511,14 @@
+ d 1093c801 PCI-GPIB 0
+ d 1093c831 PCI-GPIB bridge 0
+ v 1094 First International Computers [FIC] 0
+-v 1095 CMD Technology Inc 0
++v 1095 Silicon Image, Inc. (formerly CMD Technology Inc) 0
++d 10950240 Adaptec AAR-1210SA SATA HostRAID Controller 0
+ d 10950640 PCI0640 0
+ d 10950643 PCI0643 0
+ d 10950646 PCI0646 0
+ d 10950647 PCI0647 0
+ d 10950648 PCI0648 0
+-d 10950649 PCI0649 0
++d 10950649 SiI 0649 Ultra ATA/100 PCI to ATA Host Controller 0
+ s 109506490e11005d Integrated Ultra ATA-100 Dual Channel Controller 0
+ s 109506490e11007e Integrated Ultra ATA-100 IDE RAID Controller 0
+ s 10950649101e0649 AMI MegaRAID IDE 100 Controller 0
+@@ -1941,7 +2526,19 @@
+ d 10950670 USB0670 0
+ s 1095067010950670 USB0670 0
+ d 10950673 USB0673 0
+-d 10950680 PCI0680 0
++d 10950680 PCI0680 Ultra ATA-133 Host Controller 0
++s 1095068010953680 Winic W-680 (Silicon Image 680 based) 0
++d 10953112 SiI 3112 [SATALink/SATARaid] Serial ATA Controller 0
++s 1095311210953112 SiI 3112 SATALink Controller 0
++s 1095311210956112 SiI 3112 SATARaid Controller 0
++d 10953114 SiI 3114 [SATALink/SATARaid] Serial ATA Controller 0
++s 1095311410953114 SiI 3114 SATALink Controller 0
++s 1095311410956114 SiI 3114 SATARaid Controller 0
++d 10953124 SiI 3124 PCI-X Serial ATA Controller 0
++s 1095312410953124 SiI 3124 PCI-X Serial ATA Controller 0
++d 10953512 SiI 3512 [SATALink/SATARaid] Serial ATA Controller 0
++s 1095351210953512 SiI 3512 SATALink Controller 0
++s 1095351210956512 SiI 3512 SATARaid Controller 0
+ v 1096 Alacron 0
+ v 1097 Appian Technology 0
+ v 1098 Quantum Designs (H.K.) Ltd 0
+@@ -1961,23 +2558,30 @@
+ d 109e036c Bt879(?) Video Capture 0
+ s 109e036c13e90070 Win/TV (Video Section) 0
+ d 109e036e Bt878 Video Capture 0
+-s 109e036e007013eb WinTV/GO 0
++s 109e036e007013eb WinTV Series 0
+ s 109e036e0070ff01 Viewcast Osprey 200 0
++s 109e036e00710101 DigiTV PCI 0
++s 109e036e107d6606 WinFast TV 2000 0
++s 109e036e11bd0012 PCTV pro (TV + FM stereo receiver) 0
+ s 109e036e11bd001c PCTV Sat (DBC receiver) 0
+ s 109e036e127a0001 Bt878 Mediastream Controller NTSC 0
+ s 109e036e127a0002 Bt878 Mediastream Controller PAL BG 0
+ s 109e036e127a0003 Bt878a Mediastream Controller PAL BG 0
+ s 109e036e127a0048 Bt878/832 Mediastream Controller 0
+ s 109e036e144f3000 MagicTView CPH060 - Video 0
++s 109e036e14610002 TV98 Series (TV/No FM/Remote) 0
+ s 109e036e14610004 AVerTV WDM Video Capture 0
++s 109e036e14610761 AverTV DVB-T 0
+ s 109e036e14f10001 Bt878 Mediastream Controller NTSC 0
+ s 109e036e14f10002 Bt878 Mediastream Controller PAL BG 0
+ s 109e036e14f10003 Bt878a Mediastream Controller PAL BG 0
+ s 109e036e14f10048 Bt878/832 Mediastream Controller 0
++s 109e036e18220001 VisionPlus DVB card 0
+ s 109e036e18511850 FlyVideo'98 - Video 0
+ s 109e036e18511851 FlyVideo II 0
+ s 109e036e18521852 FlyVideo'98 - Video (with FM Tuner) 0
+-s 109e036ebd111200 PCTV pro (TV + FM stereo receiver) 1
++s 109e036e270ffc00 Digitop DTT-1000 0
++s 109e036ebd111200 PCTV pro (TV + FM stereo receiver) 0
+ d 109e036f Bt879 Video Capture 0
+ s 109e036f127a0044 Bt879 Video Capture NTSC 0
+ s 109e036f127a0122 Bt879 Video Capture PAL I 0
+@@ -2013,10 +2617,12 @@
+ s 109e037018511851 FlyVideo'98 EZ - video 0
+ s 109e037018521852 FlyVideo'98 (with FM Tuner) 0
+ d 109e0878 Bt878 Audio Capture 0
+-s 109e0878007013eb WinTV/GO 0
++s 109e0878007013eb WinTV Series 0
+ s 109e08780070ff01 Viewcast Osprey 200 0
++s 109e087800710101 DigiTV PCI 0
+ s 109e087810020001 TV-Wonder 0
+ s 109e087810020003 TV-Wonder/VE 0
++s 109e087811bd0012 PCTV pro (TV + FM stereo receiver, audio section) 0
+ s 109e087811bd001c PCTV Sat (DBC receiver) 0
+ s 109e0878127a0001 Bt878 Video Capture (Audio Section) 0
+ s 109e0878127a0002 Bt878 Video Capture (Audio Section) 0
+@@ -2025,12 +2631,14 @@
+ s 109e087813e90070 Win/TV (Audio Section) 0
+ s 109e0878144f3000 MagicTView CPH060 - Audio 0
+ s 109e087814610004 AVerTV WDM Audio Capture 0
++s 109e087814610761 AVerTV DVB-T 0
+ s 109e087814f10001 Bt878 Video Capture (Audio Section) 0
+ s 109e087814f10002 Bt878 Video Capture (Audio Section) 0
+ s 109e087814f10003 Bt878 Video Capture (Audio Section) 0
+ s 109e087814f10048 Bt878 Video Capture (Audio Section) 0
+-s 109e0878bd111200 PCTV pro (TV + FM stereo receiver) 1
+-s 109e0878bd111200 PCTV pro (TV + FM stereo receiver, audio section) 1
++s 109e087818220001 VisionPlus DVB Card 0
++s 109e0878270ffc00 Digitop DTT-1000 0
++s 109e0878bd111200 PCTV pro (TV + FM stereo receiver, audio section) 0
+ d 109e0879 Bt879 Audio Capture 0
+ s 109e0879127a0044 Bt879 Video Capture (Audio Section) 0
+ s 109e0879127a0122 Bt879 Video Capture (Audio Section) 0
+@@ -2072,7 +2680,9 @@
+ v 10a2 Quantum Corporation 0
+ v 10a3 Everex Systems Inc 0
+ v 10a4 Globe Manufacturing Sales 0
+-v 10a5 Racal Interlan 0
++v 10a5 Smart Link Ltd. 0
++d 10a53052 SmartPCI562 56K Modem 0
++d 10a55449 SmartPCI561 modem 0
+ v 10a6 Informtech Industrial Ltd. 0
+ v 10a7 Benchmarq Microelectronics 0
+ v 10a8 Sierra Semiconductor 0
+@@ -2086,7 +2696,8 @@
+ d 10a90006 HPCEX 0
+ d 10a90007 RPCEX 0
+ d 10a90008 DiVO VIP 0
+-d 10a90009 Alteon Gigabit Ethernet 0
++d 10a90009 AceNIC Gigabit Ethernet 0
++s 10a9000910a98002 AceNIC Gigabit Ethernet 0
+ d 10a90010 AMP Video I/O 0
+ d 10a90011 GRIP 0
+ d 10a90012 SGH PSHAC GSN 0
+@@ -2098,6 +2709,7 @@
+ d 10a91006 Dual JPEG 4 0
+ d 10a91007 Dual JPEG 5 0
+ d 10a91008 Cesium 0
++d 10a9100a IOC4 I/O controller 0
+ d 10a92001 Fibre Channel 0
+ d 10a92002 ASDE 0
+ d 10a98001 O2 1394 0
+@@ -2133,13 +2745,23 @@
+ d 10b51146 VScom 010 1 port parallel adaptor 0
+ d 10b51147 VScom 020 2 port parallel adaptor 0
+ d 10b52724 Thales PCSM Security Card 0
+-d 10b58845 RCIM Realtime Clock and Interrupts Module 1
+ d 10b59030 PCI <-> IOBus Bridge Hot Swap 0
++s 10b5903010b52862 Alpermann+Velte PCL PCI LV (3V/5V): Timecode Reader Board 0
++s 10b5903010b52906 Alpermann+Velte PCI TS (3V/5V): Time Synchronisation Board 0
++s 10b5903010b52940 Alpermann+Velte PCL PCI D (3V/5V): Timecode Reader Board 0
+ s 10b5903015ed1002 MCCS 8-port Serial Hot Swap 0
+ s 10b5903015ed1003 MCCS 16-port Serial Hot Swap 0
+ d 10b59036 9036 0
+ d 10b59050 PCI <-> IOBus Bridge 0
++s 10b5905010b51067 IXXAT CAN i165 0
++s 10b5905010b51172 IK220 (Heidenhain) 0
++s 10b5905010b52036 SatPak GPS 0
++s 10b5905010b52221 Alpermann+Velte PCL PCI LV: Timecode Reader Board 0
+ s 10b5905010b52273 SH-ARC SoHard ARCnet card 0
++s 10b5905010b52431 Alpermann+Velte PCL PCI D: Timecode Reader Board 0
++s 10b5905010b52905 Alpermann+Velte PCI TS: Time Synchronisation Board 0
++s 10b5905010b59050 MP9050 0
++s 10b5905014980362 TPMC866 8 Channel Serial Card 0
+ s 10b5905015220001 RockForce 4 Port V.90 Data/Fax/Voice Modem 0
+ s 10b5905015220002 RockForce 2 Port V.90 Data/Fax/Voice Modem 0
+ s 10b5905015220003 RockForce 6 Port V.90 Data/Fax/Voice Modem 0
+@@ -2150,6 +2772,9 @@
+ s 10b5905015ed1001 Macrolink MCCS 16-port Serial 0
+ s 10b5905015ed1002 Macrolink MCCS 8-port Serial Hot Swap 0
+ s 10b5905015ed1003 Macrolink MCCS 16-port Serial Hot Swap 0
++s 10b5905056542036 OpenSwitch 6 Telephony card 0 Sorry, there was a typo
++s 10b5905056543132 OpenSwitch 12 Telephony card 0 Sorry, there was a typo
++s 10b5905056545634 OpenLine4 Telephony Card 0
+ s 10b59050d531c002 PCIntelliCAN 2xSJA1000 CAN bus 0
+ s 10b59050d84d4006 EX-4006 1P 0
+ s 10b59050d84d4008 EX-4008 1P EPP/ECP 0
+@@ -2170,13 +2795,30 @@
+ s 10b59050d84d4078 EX-4078 2S(16C552) RS-232+1P 0
+ d 10b59054 PCI <-> IOBus Bridge 0
+ s 10b5905410b52455 Wessex Techology PHIL-PCI 0
++s 10b5905410b52696 Innes Corp AM Radcap card 0
++s 10b5905410b52717 Innes Corp Auricon card 0
++s 10b5905410b52844 Innes Corp TVS Encoder card 0
++s 10b5905412d90002 PCI Prosody Card rev 1.5 0
++s 10b5905416df0011 PIKA PrimeNet MM PCI 0
++s 10b5905416df0012 PIKA PrimeNet MM cPCI 8 0
++s 10b5905416df0013 PIKA PrimeNet MM cPCI 8 (without CAS Signaling Option) 0
++s 10b5905416df0014 PIKA PrimeNet MM cPCI 4 0
++s 10b5905416df0015 PIKA Daytona MM 0
++s 10b5905416df0016 PIKA InLine MM 0
++d 10b59056 Francois 0
++s 10b5905610b52979 CellinkBlade 11 - CPCI board VoATM AAL1 0
+ d 10b59060 9060 0
+ d 10b5906d 9060SD 0
+ s 10b5906d125c0640 Aries 16000P 0
+ d 10b5906e 9060ES 0
+ d 10b59080 9080 0
++s 10b59080103c10eb (Agilent) E2777B 83K Series PCI based Optical Communication Interface 0
++s 10b59080103c10ec (Agilent) E6978-66442 PCI CIC 0
+ s 10b5908010b59080 9080 [real subsystem ID not set] 0
+ s 10b59080129d0002 Aculab PCI Prosidy card 0
++s 10b5908012d90002 PCI Prosody Card 0
++s 10b5908012df4422 4422PCI ["Do-All" Telemetry Data Aquisition System] 0
++d 10b5bb04 B&B 3PCIOSD1A Isolated PCI Serial 0
+ v 10b6 Madge Networks 0
+ d 10b60001 Smart 16/4 PCI Ringnode 0
+ d 10b60002 Smart 16/4 PCI Ringnode Mk2 0
+@@ -2204,19 +2846,29 @@
+ d 10b61001 Collage 155 ATM Server Adapter 0
+ v 10b7 3Com Corporation 0
+ d 10b70001 3c985 1000BaseSX (SX/TX) 0
++d 10b70013 AR5212 802.11abg NIC (3CRDAG675) 0
++s 10b7001310b72031 3CRDAG675 11a/b/g Wireless PCI Adapter 0
++d 10b70910 3C910-A01 0
+ d 10b71006 MINI PCI type 3B Data Fax Modem 0
+ d 10b71007 Mini PCI 56k Winmodem 0
+ s 10b7100710b7615c Mini PCI 56K Modem 0
++d 10b71201 3c982-TXM 10/100baseTX Dual Port A [Hydra] 0
++d 10b71202 3c982-TXM 10/100baseTX Dual Port B [Hydra] 0
++d 10b71700 3c940 10/100/1000Base-T [Marvell] 0
++s 10b71700104380eb P4P800 Mainboard 0
++s 10b7170010b70010 3C940 Gigabit LOM Ethernet Adapter 0
++s 10b7170010b70020 3C941 Gigabit LOM Ethernet Adapter 0
++s 10b71700147b1407 KV8-MAX3 motherboard 0
+ d 10b73390 3c339 TokenLink Velocity 0
+ d 10b73590 3c359 TokenLink Velocity XL 0
+ s 10b7359010b73590 TokenLink Velocity XL Adapter (3C359/359B) 0
+-d 10b74500 3c450 Cyclone/unknown 0
++d 10b74500 3c450 HomePNA [Tornado] 0
+ d 10b75055 3c555 Laptop Hurricane 0
+-d 10b75057 3c575 [Megahertz] 10/100 LAN CardBus 0
++d 10b75057 3c575 Megahertz 10/100 LAN CardBus [Boomerang] 0
+ s 10b7505710b75a57 3C575 Megahertz 10/100 LAN Cardbus PC Card 0
+-d 10b75157 3c575 [Megahertz] 10/100 LAN CardBus 0
++d 10b75157 3cCFE575BT Megahertz 10/100 LAN CardBus [Cyclone] 0
+ s 10b7515710b75b57 3C575 Megahertz 10/100 LAN Cardbus PC Card 0
+-d 10b75257 3CCFE575CT Cyclone CardBus 0
++d 10b75257 3cCFE575CT CardBus [Cyclone] 0
+ s 10b7525710b75c57 FE575C-3Com 10/100 LAN CardBus-Fast Ethernet 0
+ d 10b75900 3c590 10BaseT [Vortex] 0
+ d 10b75920 3c592 EISA 10mbps Demon/Vortex 0
+@@ -2224,33 +2876,37 @@
+ d 10b75951 3c595 100BaseT4 [Vortex] 0
+ d 10b75952 3c595 100Base-MII [Vortex] 0
+ d 10b75970 3c597 EISA Fast Demon/Vortex 0
+-d 10b75b57 3c595 [Megahertz] 10/100 LAN CardBus 0
++d 10b75b57 3c595 Megahertz 10/100 LAN CardBus [Boomerang] 0
+ s 10b75b5710b75b57 3C575 Megahertz 10/100 LAN Cardbus PC Card 0
+-d 10b76055 3c556 Hurricane CardBus 0
+-d 10b76056 3c556B Hurricane CardBus 0
++d 10b76000 3CRSHPW796 [OfficeConnect Wireless CardBus] 0
++d 10b76001 3com 3CRWE154G72 [Office Connect Wireless LAN Adapter] 0
++d 10b76055 3c556 Hurricane CardBus [Cyclone] 0
++d 10b76056 3c556B CardBus [Tornado] 0
+ s 10b7605610b76556 10/100 Mini PCI Ethernet Adapter 0
+-d 10b76560 3CCFE656 Cyclone CardBus 0
++d 10b76560 3cCFE656 CardBus [Cyclone] 0
+ s 10b7656010b7656a 3CCFEM656 10/100 LAN+56K Modem CardBus 0
+-d 10b76561 3CCFEM656 10/100 LAN+56K Modem CardBus 0
++d 10b76561 3cCFEM656 10/100 LAN+56K Modem CardBus 0
+ s 10b7656110b7656b 3CCFEM656 10/100 LAN+56K Modem CardBus 0
+-d 10b76562 3CCFEM656 [id 6562] Cyclone CardBus 0
++d 10b76562 3cCFEM656B 10/100 LAN+Winmodem CardBus [Cyclone] 0
+ s 10b7656210b7656b 3CCFEM656B 10/100 LAN+56K Modem CardBus 0
+-d 10b76563 3CCFEM656B 10/100 LAN+56K Modem CardBus 0
++d 10b76563 3cCFEM656B 10/100 LAN+56K Modem CardBus 0
+ s 10b7656310b7656b 3CCFEM656 10/100 LAN+56K Modem CardBus 0
+-d 10b76564 3CCFEM656 [id 6564] Cyclone CardBus 0
++d 10b76564 3cXFEM656C 10/100 LAN+Winmodem CardBus [Tornado] 0
+ d 10b77646 3cSOHO100-TX Hurricane 0
++d 10b77770 3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect] 0
+ d 10b77940 3c803 FDDILink UTP Controller 0
+ d 10b77980 3c804 FDDILink SAS Controller 0
+ d 10b77990 3c805 FDDILink DAS Controller 0
++d 10b780eb 3c940B 10/100/1000Base-T 0
+ d 10b78811 Token ring 0
+ d 10b79000 3c900 10BaseT [Boomerang] 0
+-d 10b79001 3c900 Combo [Boomerang] 0
+-d 10b79004 3c900B-TPO [Etherlink XL TPO] 0
++d 10b79001 3c900 10Mbps Combo [Boomerang] 0
++d 10b79004 3c900B-TPO Etherlink XL [Cyclone] 0
+ s 10b7900410b79004 3C900B-TPO Etherlink XL TPO 10Mb 0
+-d 10b79005 3c900B-Combo [Etherlink XL Combo] 0
++d 10b79005 3c900B-Combo Etherlink XL [Cyclone] 0
+ s 10b7900510b79005 3C900B-Combo Etherlink XL Combo 0
+-d 10b79006 3c900B-TPC [Etherlink XL TPC] 0
+-d 10b7900a 3c900B-FL [Etherlink XL FL] 0
++d 10b79006 3c900B-TPC Etherlink XL [Cyclone] 0
++d 10b7900a 3c900B-FL 10base-FL [Cyclone] 0
+ d 10b79050 3c905 100BaseTX [Boomerang] 0
+ d 10b79051 3c905 100BaseT4 [Boomerang] 0
+ d 10b79055 3c905B 100BaseTX [Cyclone] 0
+@@ -2275,20 +2931,29 @@
+ s 10b7905510280098 3C905B Fast Etherlink XL 10/100 0
+ s 10b7905510280099 3C905B Fast Etherlink XL 10/100 0
+ s 10b7905510b79055 3C905B Fast Etherlink XL 10/100 0
+-d 10b79056 3c905B-T4 [Fast EtherLink XL 10/100] 0
+-d 10b79058 3c905B-Combo [Deluxe Etherlink XL 10/100] 0
+-d 10b7905a 3c905B-FX [Fast Etherlink XL FX 10/100] 0
++d 10b79056 3c905B-T4 Fast EtherLink XL [Cyclone] 0
++d 10b79058 3c905B Deluxe Etherlink 10/100/BNC [Cyclone] 0
++d 10b7905a 3c905B-FX Fast Etherlink XL FX 100baseFx [Cyclone] 0
+ d 10b79200 3c905C-TX/TX-M [Tornado] 0
+-s 10b7920010280095 Integrated 3C905C-TX Fast Etherlink for PC Management NIC 0
++s 10b7920010280095 3C920 Integrated Fast Ethernet Controller 0
++s 10b7920010280097 3C920 Integrated Fast Ethernet Controller 0
++s 10b79200102800fe Optiplex GX240 0
++s 10b792001028012a 3C920 Integrated Fast Ethernet Controller [Latitude C640] 0
+ s 10b7920010b71000 3C905C-TX Fast Etherlink for PC Management NIC 0
+ s 10b7920010b77000 10/100 Mini PCI Ethernet Adapter 0
+-d 10b79300 3CSOHO100B-TX [910-A01] 1 Designed for Windows-based networks. Is there driver for linux?
+-d 10b79800 3c980-TX [Fast Etherlink XL Server Adapter] 0
++s 10b7920010f12466 Tiger MPX S2466 (3C920 Integrated Fast Ethernet Controller) 0
++d 10b79201 3C920B-EMB Integrated Fast Ethernet Controller [Tornado] 0
++s 10b79201104380ab A7N8X Deluxe onboard 3C920B-EMB Integrated Fast Ethernet Controller 0
++d 10b79202 3Com 3C920B-EMB-WNM Integrated Fast Ethernet Controller 0
++d 10b79210 3C920B-EMB-WNM Integrated Fast Ethernet Controller 0
++d 10b79300 3CSOHO100B-TX 910-A01 [tulip] 0
++d 10b79800 3c980-TX Fast Etherlink XL Server Adapter [Cyclone] 0
+ s 10b7980010b79800 3c980-TX Fast Etherlink XL Server Adapter 0
+-d 10b79805 3c980-TX 10/100baseTX NIC [Python-T] 0
+-s 10b7980510b71201 3c982-TXM 10/100baseTX Dual Port A [Hydra] 0
+-s 10b7980510b71202 3c982-TXM 10/100baseTX Dual Port B [Hydra] 0
++d 10b79805 3c980-C 10/100baseTX NIC [Python-T] 0
++s 10b7980510b71201 EtherLink Server 10/100 Dual Port A 0
++s 10b7980510b71202 EtherLink Server 10/100 Dual Port B 0
+ s 10b7980510b79805 3c980 10/100baseTX NIC [Python-T] 0
++s 10b7980510f12462 Thunder K7 S2462 0
+ d 10b79900 3C990-TX [Typhoon] 0
+ d 10b79902 3CR990-TX-95 [Typhoon 56-bit] 0
+ d 10b79903 3CR990-TX-97 [Typhoon 168-bit] 0
+@@ -2302,9 +2967,10 @@
+ s 10b7990510b72102 3CR990-FX-97 Server [Typhoon Fiber 168-bit] 0
+ d 10b79908 3CR990SVR95 [Typhoon Server 56-bit] 0
+ d 10b79909 3CR990SVR97 [Typhoon Server 168-bit] 0
++d 10b7990a 3C990SVR [Typhoon Server] 0
+ d 10b7990b 3C990SVR [Typhoon Server] 0
+ v 10b8 Standard Microsystems Corp [SMC] 0
+-d 10b80005 83C170QF 0
++d 10b80005 83c170 EPIC/100 Fast Ethernet Adapter 0
+ s 10b800051055e000 LANEPIC 10/100 [EVB171Q-PCI] 0
+ s 10b800051055e002 LANEPIC 10/100 [EVB171G-PCI] 0
+ s 10b8000510b8a011 EtherPower II 10/100 0
+@@ -2312,7 +2978,7 @@
+ s 10b8000510b8a015 EtherPower II 10/100 0
+ s 10b8000510b8a016 EtherPower II 10/100 0
+ s 10b8000510b8a017 EtherPower II 10/100 0
+-d 10b80006 LANEPIC 0
++d 10b80006 83c175 EPIC/100 Fast Ethernet Adapter 0
+ s 10b800061055e100 LANEPIC Cardbus Fast Ethernet Adapter 0
+ s 10b800061055e102 LANEPIC Cardbus Fast Ethernet Adapter 0
+ s 10b800061055e300 LANEPIC Cardbus Fast Ethernet Adapter 0
+@@ -2322,12 +2988,15 @@
+ s 10b8000613a28006 LANEPIC Cardbus Fast Ethernet Adapter 0
+ d 10b81000 FDC 37c665 0
+ d 10b81001 FDC 37C922 0
++d 10b82802 SMC2802W [EZ Connect g] 0 802.11g card
+ d 10b8a011 83C170QF 0
+ d 10b8b106 SMC34C90 0
+-v 10b9 Acer Laboratories Inc. [ALi] 0
+-v 10b9 ALi Corporation. [ALi] 1
++v 10b9 ALi Corporation 0
++d 10b90101 CMI8338/C3DX PCI Audio Device 0
+ d 10b90111 C-Media CMI8738/C3DX Audio Device (OEM) 0
+ s 10b9011110b90111 C-Media CMI8738/C3DX Audio Device (OEM) 0
++d 10b90780 Multi-IO Card 0
++d 10b90782 Multi-IO Card 0
+ d 10b91435 M1435 0
+ d 10b91445 M1445 0
+ d 10b91449 M1449 0
+@@ -2343,11 +3012,12 @@
+ s 10b9152310b91523 ALI M1523 ISA Bridge 0
+ d 10b91531 M1531 [Aladdin IV] 0
+ d 10b91533 M1533 PCI to ISA Bridge [Aladdin IV] 0
++s 10b915331014053b ThinkPad R40e (2684-HVG) PCI to ISA Bridge 0
+ s 10b9153310b91533 ALI M1533 Aladdin IV ISA Bridge 0
+ d 10b91541 M1541 0
+ s 10b9154110b91541 ALI M1541 Aladdin V/V+ AGP System Controller 0
+ d 10b91543 M1543 0
+-d 10b91563 M1563 South Bridge supporting HyperTransport(TM) Technology 1
++d 10b91563 M1563 HyperTransport South Bridge 0
+ d 10b91621 M1621 0
+ d 10b91631 ALI M1631 PCI North Bridge Aladdin Pro III 0
+ d 10b91632 M1632M Northbridge+Trident 0
+@@ -2356,10 +3026,11 @@
+ d 10b91646 M1646 Northbridge+Trident 0
+ d 10b91647 M1647 Northbridge [MAGiK 1 / MobileMAGiK 1] 0
+ d 10b91651 M1651/M1651T Northbridge [Aladdin-Pro 5/5M,Aladdin-Pro 5T/5TM] 0
+-d 10b91671 M1671 Northbridge [Aladdin-P4] 0
+-d 10b91671 M1671 Super P4 Northbridge [AGP4X,PCI and SDR/DDR] 1
+-d 10b91681 M1681 P4 Northbridge [AGP8X,HyperTransport(TM) and SDR/DDR] 1
+-d 10b91687 M1687 K8 Northbridge [AGP8X and HyperTransport(TM)] 1
++d 10b91671 M1671 Super P4 Northbridge [AGP4X,PCI and SDR/DDR] 0
++d 10b91672 M1672 Northbridge [CyberALADDiN-P4] 0
++d 10b91681 M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR] 0
++d 10b91687 M1687 K8 Northbridge [AGP8X and HyperTransport] 0
++d 10b91689 M1689 K8 Northbridge [Super K8 Single Chip] 0
+ d 10b93141 M3141 0
+ d 10b93143 M3143 0
+ d 10b93145 M3145 0
+@@ -2368,34 +3039,55 @@
+ d 10b93151 M3151 0
+ d 10b93307 M3307 0
+ d 10b93309 M3309 0
++d 10b93323 M3325 Video/Audio Decoder 0
+ d 10b95212 M4803 0
+ d 10b95215 MS4803 0
+ d 10b95217 M5217H 0
+ d 10b95219 M5219 0
+ d 10b95225 M5225 0
+ d 10b95229 M5229 IDE 0
++s 10b952291014050f ThinkPad R30 0
++s 10b952291014053d ThinkPad R40e (2684-HVG) builtin IDE 0
++s 10b95229103c0024 Pavilion ze4400 builtin IDE 0
+ s 10b9522910438053 A7A266 Motherboard IDE 0
+ d 10b95235 M5225 0
+ d 10b95237 USB 1.1 Controller 0
++s 10b9523710140540 ThinkPad R40e (2684-HVG) builtin USB 0
++s 10b95237103c0024 Pavilion ze4400 builtin USB 0
+ d 10b95239 USB 2.0 Controller 0
+ d 10b95243 M1541 PCI to AGP Controller 0
++d 10b95246 AGP8X Controller 0
+ d 10b95247 PCI to AGP Controller 0
+-d 10b95249 HTT to PCI Bridge 1
++d 10b95249 M5249 HTT to PCI Bridge 0
+ d 10b95251 M5251 P1394 OHCI 1.0 Controller 0
+ d 10b95253 M5253 P1394 OHCI 1.1 Controller 0
+ d 10b95261 M5261 Ethernet Controller 0
++d 10b95263 M5263 Ethernet Controller 0
++d 10b95281 ALi M5281 Serial ATA / RAID Host Controller 0
++d 10b95450 Lucent Technologies Soft Modem AMR 0
+ d 10b95451 M5451 PCI AC-Link Controller Audio Device 0
+-s 10b9545110140506 ThinkPad R30 1
++s 10b9545110140506 ThinkPad R30 0
++s 10b954511014053e ThinkPad R40e (2684-HVG) builtin Audio 0
++s 10b95451103c0024 Pavilion ze4400 builtin Audio 0
++s 10b9545110b95451 HP Compaq nc4010 (DY885AA#ABN) 0
+ d 10b95453 M5453 PCI AC-Link Controller Modem Device 0
+ d 10b95455 M5455 PCI AC-Link Controller Audio Device 0
+-d 10b95457 M5457 AC-Link Modem Interface Controller 0
+-d 10b95459 SmartPCI561 56K Modem 0
++d 10b95457 M5457 AC'97 Modem Controller 0
++s 10b9545710140535 ThinkPad R40e (2684-HVG) builtin modem 0
++s 10b95457103c0024 Pavilion ze4400 builtin Modem Device 0
++d 10b95459 SmartLink SmartPCI561 56K Modem 0 Same but more usefull for driver's lookup
++d 10b9545a SmartLink SmartPCI563 56K Modem 0 SmartLink PCI SoftModem
+ d 10b95471 M5471 Memory Stick Controller 0
+ d 10b95473 M5473 SD-MMC Controller 0
+-d 10b97101 M7101 PMU 0
+-s 10b9710110b97101 ALI M7101 Power Management Controller 0
++d 10b97101 M7101 Power Management Controller [PMU] 0
++s 10b9710110140510 ThinkPad R30 0
++s 10b971011014053c ThinkPad R40e (2684-HVG) Power Management Controller 0
++s 10b97101103c0024 Pavilion ze4400 0
+ v 10ba Mitsubishi Electric Corp. 0
+ d 10ba0301 AccelGraphics AccelECLIPSE 0
++d 10ba0304 AccelGALAXY A2100 [OEM Evans & Sutherland] 0
++d 10ba0308 Tornado 3000 [OEM Evans & Sutherland] 0
++d 10ba1002 VG500 [VolumePro Volume Rendering Accelerator] 0
+ v 10bb Dapha Electronics Corporation 0
+ v 10bc Advanced Logic Research 0
+ v 10bd Surecom Technology 0
+@@ -2412,8 +3104,7 @@
+ v 10c6 Rambus Inc. 0
+ v 10c7 Media Vision 0
+ v 10c8 Neomagic Corporation 0
+-d 10c80001 NM2070 [MagicGraph NM2070] 0
+-d 10c80001 NM2070 [MagicGraph 128] 1 Update - cleaning up the neomagic entries using XFree86 sources
++d 10c80001 NM2070 [MagicGraph 128] 0
+ d 10c80002 NM2090 [MagicGraph 128V] 0
+ d 10c80003 NM2093 [MagicGraph 128ZV] 0
+ d 10c80004 NM2160 [MagicGraph 128XD] 0
+@@ -2435,22 +3126,20 @@
+ s 10c8000410f7830b MagicGraph 128XD 0
+ s 10c8000410f7830d MagicGraph 128XD 0
+ s 10c8000410f78312 MagicGraph 128XD 0
+-d 10c80005 [MagicMedia 256AV] 0
+-d 10c80005 NM2200 [MagicGraph 256AV] 1 Update - cleaning up the neomagic entries using XFree86 sources
+-s 10c80005101400dd ThinkPad 570 1
++d 10c80005 NM2200 [MagicGraph 256AV] 0
++s 10c80005101400dd ThinkPad 570 0
++s 10c8000510280088 Latitude CPi A 0
+ d 10c80006 NM2360 [MagicMedia 256ZX] 0
+ d 10c80016 NM2380 [MagicMedia 256XL+] 0
+ s 10c8001610c80016 MagicMedia 256XL+ 0
+-d 10c80025 [MagicMedia 256AV+] 0
+-d 10c80025 NM2230 [MagicGraph 256AV+] 1 Update - cleaning up the neomagic entries using XFree86 sources
+-d 10c80083 [MagicGraph 128ZV Plus] 0
+-d 10c80083 NM2093 [MagicGraph 128ZV+] 1 Update - cleaning up the neomagic entries using XFree86 sources
+-d 10c88005 [MagicMedia 256AV Audio] 0
+-d 10c88005 NM2200 [MagicMedia 256AV Audio] 1 Update - cleaning up the neomagic entries using XFree86 sources
++d 10c80025 NM2230 [MagicGraph 256AV+] 0
++d 10c80083 NM2093 [MagicGraph 128ZV+] 0
++d 10c88005 NM2200 [MagicMedia 256AV Audio] 0
+ s 10c880050e11b0d1 MagicMedia 256AV Audio Device on Discovery 0
+ s 10c880050e11b126 MagicMedia 256AV Audio Device on Durango 0
+ s 10c88005101400dd MagicMedia 256AV Audio Device on BlackTip Thinkpad 0
+ s 10c8800510251003 MagicMedia 256AV Audio Device on TravelMate 720 0
++s 10c8800510280088 Latitude CPi A 0
+ s 10c880051028008f MagicMedia 256AV Audio Device on Colorado Inspiron 0
+ s 10c88005103c0007 MagicMedia 256AV Audio Device on Voyager II 0
+ s 10c88005103c0008 MagicMedia 256AV Audio Device on Voyager III 0
+@@ -2459,12 +3148,13 @@
+ s 10c88005110a8005 MagicMedia 256AV Audio Device 0
+ s 10c8800514c00004 MagicMedia 256AV Audio Device 0
+ d 10c88006 NM2360 [MagicMedia 256ZX Audio] 0
+-d 10c88016 NM2360 [MagicMedia 256ZX Audio] 0
+-d 10c88016 NM2380 [MagicMedia 256XL+ Audio] 1 Update - cleaning up the neomagic entries extrapolating from XFree86 sources
++d 10c88016 NM2380 [MagicMedia 256XL+ Audio] 0
+ v 10c9 Dataexpert Corporation 0
+ v 10ca Fujitsu Microelectr., Inc. 0
+ v 10cb Omron Corporation 0
+-v 10cc Mentor ARC Inc 0
++v 10cc Mai Logic Incorporated 0 nee Mentor ARC Inc
++d 10cc0660 Articia S Host Bridge 0
++d 10cc0661 Articia S PCI Bridge 0
+ v 10cd Advanced System Products, Inc 0
+ d 10cd1100 ASC1100 0
+ d 10cd1200 ASC1200 [(abp940) Fast SCSI-II] 0
+@@ -2473,9 +3163,8 @@
+ d 10cd2300 ABP940-UW 0
+ d 10cd2500 ABP940-U2W 0
+ v 10ce Radius 0
+-v 10cf Citicorp TTI 0
++v 10cf Fujitsu Limited. 0 nee Citicorp TTI
+ d 10cf2001 mb86605 0
+-v 10d0 Fujitsu Limited 0
+ v 10d1 FuturePlus Systems Corp. 0
+ v 10d2 Molex Incorporated 0
+ v 10d3 Jabil Circuit Inc 0
+@@ -2505,7 +3194,7 @@
+ d 10de0008 NV1 [EDGE 3D] 0
+ d 10de0009 NV1 [EDGE 3D] 0
+ d 10de0010 NV2 [Mutara V08] 0
+-d 10de0020 NV4 [Riva TnT] 0
++d 10de0020 NV4 [RIVA TNT] 0
+ s 10de002010430200 V3400 TNT 0
+ s 10de002010480c18 Erazor II SGRAM 0
+ s 10de002010480c1b Erazor II 0
+@@ -2527,11 +3216,14 @@
+ s 10de002010de0020 Riva TNT 0
+ s 10de002011021015 Graphics Blaster CT6710 0
+ s 10de002011021016 Graphics Blaster RIVA TNT 0
+-d 10de0028 NV5 [Riva TnT2] 0
++d 10de0028 NV5 [RIVA TNT2/TNT2 Pro] 0
+ s 10de002810430200 AGP-V3800 SGRAM 0
+ s 10de002810430201 AGP-V3800 SDRAM 0
+ s 10de002810430205 PCI-V3800 0
+ s 10de002810434000 AGP-V3800PRO 0
++s 10de002810480c21 Synergy II 0
++s 10de002810480c31 Erazor III 0
++s 10de0028107d2134 WinFast 3D S320 II + TV-Out 0
+ s 10de002810924804 Viper V770 0
+ s 10de002810924a00 Viper V770 0
+ s 10de002810924a02 Viper V770 Ultra 0
+@@ -2543,7 +3235,7 @@
+ s 10de002811021020 3D Blaster RIVA TNT2 0
+ s 10de002811021026 3D Blaster RIVA TNT2 Digital 0
+ s 10de002814af5810 Maxi Gamer Xentor 0
+-d 10de0029 NV5 [Riva TnT2 Ultra] 0
++d 10de0029 NV5 [RIVA TNT2 Ultra] 0
+ s 10de002910430200 AGP-V3800 Deluxe 0
+ s 10de002910430201 AGP-V3800 Ultra SDRAM 0
+ s 10de002910430205 PCI-V3800 Ultra 0
+@@ -2553,25 +3245,120 @@
+ s 10de002914af5820 Maxi Gamer Xentor 32 0
+ d 10de002a NV5 [Riva TnT2] 0
+ d 10de002b NV5 [Riva TnT2] 0
+-d 10de002c NV6 [Vanta] 0
++d 10de002c NV6 [Vanta/Vanta LT] 0
+ s 10de002c10430200 AGP-V3800 Combat SDRAM 0
+ s 10de002c10430201 AGP-V3800 Combat 0
+ s 10de002c10926820 Viper V730 0
+ s 10de002c11021031 CT6938 VANTA 8MB 0
+ s 10de002c11021034 CT6894 VANTA 16MB 0
+ s 10de002c14af5008 Maxi Gamer Phoenix 2 0
+-d 10de002d RIVA TNT2 Model 64 0
++d 10de002d NV5M64 [RIVA TNT2 Model 64/Model 64 Pro] 0
+ s 10de002d10430200 AGP-V3800M 0
+ s 10de002d10430201 AGP-V3800M 0
++s 10de002d10480c3a Erazor III LT 0
++s 10de002d10de001e M64 AGP4x 0
+ s 10de002d11021023 CT6892 RIVA TNT2 Value 0
+ s 10de002d11021024 CT6932 RIVA TNT2 Value 32Mb 0
+ s 10de002d1102102c CT6931 RIVA TNT2 Value [Jumper] 0
+ s 10de002d14628808 MSI-8808 0
+-s 10de002d15541041 PixelView RIVA TNT2 M64 32MB 0
++s 10de002d15541041 Pixelview RIVA TNT2 M64 0
+ d 10de002e NV6 [Vanta] 0
+ d 10de002f NV6 [Vanta] 0
+-d 10de00a0 NV5 [Riva TNT2] 0
++d 10de0034 MCP04 SMBus 0
++d 10de0035 MCP04 IDE 0
++d 10de0036 MCP04 Serial ATA Controller 0
++d 10de0037 MCP04 Ethernet Controller 0
++d 10de0038 MCP04 Ethernet Controller 0
++d 10de003a MCP04 AC'97 Audio Controller 0
++d 10de003b MCP04 USB Controller 0
++d 10de003c MCP04 USB Controller 0
++d 10de003d MCP04 PCI Bridge 0
++d 10de003e MCP04 Serial ATA Controller 0
++d 10de0040 nv40 [GeForce 6800 Ultra] 0
++d 10de0041 NV40 [GeForce 6800] 0
++d 10de0042 NV40.2 0
++d 10de0043 NV40.3 0
++d 10de0045 NV40 [GeForce 6800 GT] 0
++d 10de0049 NV40GL 0
++d 10de004e NV40GL [Quadro FX 4000] 0
++d 10de0052 CK804 SMBus 0
++d 10de0053 CK804 IDE 0
++d 10de0054 CK804 Serial ATA Controller 0
++d 10de0055 CK804 Serial ATA Controller 0
++d 10de0056 CK804 Ethernet Controller 0
++d 10de0057 CK804 Ethernet Controller 0
++d 10de0059 CK804 AC'97 Audio Controller 0
++d 10de005a CK804 USB Controller 0
++d 10de005b CK804 USB Controller 0
++d 10de005c CK804 PCI Bridge 0
++d 10de005d CK804 PCIE Bridge 0
++d 10de005e CK804 Memory Controller 0
++d 10de0060 nForce2 ISA Bridge 0
++s 10de0060104380ad A7N8X Mainboard 0
++d 10de0064 nForce2 SMBus (MCP) 0
++d 10de0065 nForce2 IDE 0
++d 10de0066 nForce2 Ethernet Controller 0
++s 10de0066104380a7 A7N8X Mainboard onboard nForce2 Ethernet 0
++d 10de0067 nForce2 USB Controller 0
++s 10de006710430c11 A7N8X Mainboard 0
++d 10de0068 nForce2 USB Controller 0
++s 10de006810430c11 A7N8X Mainboard 0
++d 10de006a nForce2 AC97 Audio Controler (MCP) 0
++d 10de006b nForce MultiMedia audio [Via VT82C686B] 0
++s 10de006b10de006b nForce2 MCP Audio Processing Unit 0
++d 10de006c nForce2 External PCI Bridge 0
++d 10de006d nForce2 PCI Bridge 0
++d 10de006e nForce2 FireWire (IEEE 1394) Controller 0
++d 10de0084 MCP2A SMBus 0
++d 10de0085 MCP2A IDE 0
++d 10de0086 MCP2A Ethernet Controller 0
++d 10de0087 MCP2A USB Controller 0
++d 10de0088 MCP2A USB Controller 0
++d 10de008a MCP2S AC'97 Audio Controller 0
++d 10de008b MCP2A PCI Bridge 0
++d 10de008c MCP2A Ethernet Controller 0
++d 10de008e nForce2 Serial ATA Controller 0
++d 10de00a0 NV5 [Aladdin TNT2] 0
+ s 10de00a014af5810 Maxi Gamer Xentor 0
++d 10de00c0 NV41.0 0
++d 10de00c1 NV41.1 0
++d 10de00c2 NV41.2 0
++d 10de00c8 NV41.8 0
++d 10de00ce NV41GL 0
++d 10de00d0 nForce3 LPC Bridge 0
++d 10de00d1 nForce3 Host Bridge 0
++d 10de00d2 nForce3 AGP Bridge 0
++d 10de00d3 CK804 Memory Controller 0
++d 10de00d4 nForce3 SMBus 0
++d 10de00d5 nForce3 IDE 0
++d 10de00d6 nForce3 Ethernet 0
++d 10de00d7 nForce3 USB 1.1 0
++d 10de00d8 nForce3 USB 2.0 0
++d 10de00da nForce3 Audio 0
++d 10de00dd nForce3 PCI Bridge 0
++d 10de00df CK8S Ethernet Controller 0
++d 10de00e1 nForce3 250Gb Host Bridge 0
++d 10de00e2 nForce3 250Gb AGP Host to PCI Bridge 0
++d 10de00e3 CK8S Serial ATA Controller (v2.5) 0
++d 10de00e4 nForce 250Gb PCI System Management 0
++d 10de00e5 CK8S Parallel ATA Controller (v2.5) 0
++d 10de00e6 CK8S Ethernet Controller 0
++d 10de00e7 CK8S USB Controller 0
++d 10de00e8 CK8S USB Controller 0
++d 10de00ea nForce3 250Gb AC'97 Audio Controller 0
++d 10de00ed nForce3 250Gb PCI-to-PCI Bridge 0
++d 10de00ee CK8S Serial ATA Controller (v2.5) 0
++d 10de00f0 NV40 [GeForce 6800/GeForce 6800 Ultra] 0
++d 10de00f1 NV43 [GeForce 6600/GeForce 6600 GT] 0
++d 10de00f2 NV43 [GeForce 6600 GT] 0
++d 10de00f8 NV45GL [Quadro FX 3400] 0
++d 10de00f9 NV40 [GeForce 6800 Ultra] 0
++d 10de00fa NV36 [GeForce PCX 5750] 0
++d 10de00fb NV35 [GeForce PCX 5900] 0
++d 10de00fc NV37GL [Quadro FX 330/GeForce PCX 5300] 0
++d 10de00fd NV37GL [Quadro FX 330] 0
++d 10de00fe NV38GL [Quadro FX 1300] 0
++d 10de00ff NV18 [GeForce PCX 4300] 0
+ d 10de0100 NV10 [GeForce 256 SDR] 0
+ s 10de010010430200 AGP-V6600 SGRAM 0
+ s 10de010010430201 AGP-V6600 SDRAM 0
+@@ -2579,80 +3366,198 @@
+ s 10de010010434009 AGP-V6600 SDRAM 0
+ s 10de01001102102d CT6941 GeForce 256 0
+ s 10de010014af5022 3D Prophet SE 0
+-d 10de0101 NV10 [GeForce 256 DDR] 0
++d 10de0101 NV10DDR [GeForce 256 DDR] 0
+ s 10de010110430202 AGP-V6800 DDR 0
+ s 10de01011043400a AGP-V6800 DDR SGRAM 0
+ s 10de01011043400b AGP-V6800 DDR SDRAM 0
++s 10de0101107d2822 WinFast GeForce 256 0
+ s 10de01011102102e CT6971 GeForce 256 DDR 0
+ s 10de010114af5021 3D Prophet DDR-DVI 0
+-d 10de0103 NV10 [Quadro] 0
+-d 10de0110 NV11 [GeForce2 MX] 0
++d 10de0103 NV10GL [Quadro] 0
++d 10de0110 NV11 [GeForce2 MX/MX 400] 0
+ s 10de011010434015 AGP-V7100 Pro 0
+ s 10de011010434031 V7100 Pro with TV output 0
++s 10de011010de0091 Dell OEM GeForce 2 MX 400 0
++s 10de011014628817 MSI GeForce2 MX400 Pro32S [MS-8817] 0
+ s 10de011014af7102 3D Prophet II MX 0
+ s 10de011014af7103 3D Prophet II MX Dual-Display 0
+-d 10de0111 NV11 [GeForce2 MX DDR] 0
++d 10de0111 NV11DDR [GeForce2 MX 100 DDR/200 DDR] 0
+ d 10de0112 NV11 [GeForce2 Go] 0
+-d 10de0113 NV11 [GeForce2 MXR] 0
+-d 10de0150 NV15 [GeForce2 GTS] 0
++d 10de0113 NV11GL [Quadro2 MXR/EX] 0
++d 10de0150 NV15 [GeForce2 GTS/Pro] 0
+ s 10de015010434016 V7700 AGP Video Card 0
+ s 10de0150107d2840 WinFast GeForce2 GTS with TV output 0
++s 10de0150107d2842 WinFast GeForce 2 Pro 0
+ s 10de015014628831 Creative GeForce2 Pro 0
+-d 10de0151 NV15 [GeForce2 Ti] 0
++d 10de0151 NV15DDR [GeForce2 Ti] 0
+ s 10de01511043405f V7700Ti 0
+-d 10de0152 NV15 [GeForce2 Ultra, Bladerunner] 0
++s 10de015114625506 Creative 3D Blaster Geforce2 Titanium 0
++d 10de0152 NV15BR [GeForce2 Ultra, Bladerunner] 0
+ s 10de015210480c56 GLADIAC Ultra 0
+-d 10de0153 NV15 [Quadro2 Pro] 0
+-d 10de0170 NV17 [GeForce4 MX460] 0
+-d 10de0171 NV17 [GeForce4 MX440] 0
++d 10de0153 NV15GL [Quadro2 Pro] 0
++d 10de0170 NV17 [GeForce4 MX 460] 0
++d 10de0171 NV17 [GeForce4 MX 440] 0
++s 10de017110b00002 Gainward Pro/600 TV 0
+ s 10de017114628661 G4MX440-VTP 0
+-d 10de0172 NV17 [GeForce4 MX420] 0
+-d 10de0173 NV1x 0
++s 10de017114628730 MX440SES-T (MS-8873) 0
++s 10de0171147b8f00 Abit Siluro GeForce4MX440 0
++d 10de0172 NV17 [GeForce4 MX 420] 0
++d 10de0173 NV17 [GeForce4 MX 440-SE] 0
+ d 10de0174 NV17 [GeForce4 440 Go] 0
+ d 10de0175 NV17 [GeForce4 420 Go] 0
+ d 10de0176 NV17 [GeForce4 420 Go 32M] 0
+-d 10de0178 Quadro4 500XGL 0
++s 10de01764c531090 Cx9 / Vx9 mainboard 0
++d 10de0177 NV17 [GeForce4 460 Go] 0
++d 10de0178 NV17GL [Quadro4 550 XGL] 0
+ d 10de0179 NV17 [GeForce4 440 Go 64M] 0
+-d 10de017a Quadro4 200/400NVS 0
+-d 10de017b Quadro4 550XGL 0
+-d 10de017c Quadro4 550 GoGL 0
+-d 10de0181 NV18 [GeForce4 MX440 AGP 8x] 1
+-d 10de01a0 NV15 [GeForce2 - nForce GPU] 0
++s 10de017910de0179 GeForce4 MX (Mac) 0
++d 10de017a NV17GL [Quadro4 200/400 NVS] 0
++d 10de017b NV17GL [Quadro4 550 XGL] 0
++d 10de017c NV17GL [Quadro4 550 GoGL] 0
++d 10de017d NV17 [GeForce4 410 Go 16M] 0
++d 10de0181 NV18 [GeForce4 MX 440 AGP 8x] 0
++s 10de01811043806f V9180 Magic 0
++s 10de018114628880 MS-StarForce GeForce4 MX 440 with AGP8X 0
++s 10de018114628900 MS-8890 GeForce 4 MX440 AGP8X 0
++s 10de018114629350 MSI Geforce4 MX T8X with AGP8X 0
++s 10de0181147b8f0d Siluro GF4 MX-8X 0
++d 10de0182 NV18 [GeForce4 MX 440SE AGP 8x] 0
++d 10de0183 NV18 [GeForce4 MX 420 AGP 8x] 0
++d 10de0185 NV18 [GeForce4 MX 4000 AGP 8x] 0
++d 10de0186 NV18M [GeForce4 448 Go] 0
++d 10de0187 NV18M [GeForce4 488 Go] 0
++d 10de0188 NV18GL [Quadro4 580 XGL] 0
++d 10de018a NV18GL [Quadro4 NVS AGP 8x] 0
++d 10de018b NV18GL [Quadro4 380 XGL] 0
++d 10de018d NV18M [GeForce4 448 Go] 0
++d 10de01a0 NVCrush11 [GeForce2 MX Integrated Graphics] 0
+ d 10de01a4 nForce CPU bridge 0
+ d 10de01ab nForce 420 Memory Controller (DDR) 0
+ d 10de01ac nForce 220/420 Memory Controller 0
+ d 10de01ad nForce 220/420 Memory Controller 0
++d 10de01b0 nForce Audio 0
+ d 10de01b1 nForce Audio 0
+ d 10de01b2 nForce ISA Bridge 0
+ d 10de01b4 nForce PCI System Management 0
+ d 10de01b7 nForce AGP to PCI Bridge 0
+ d 10de01b8 nForce PCI-to-PCI bridge 0
+ d 10de01bc nForce IDE 0
+-d 10de01c1 nForce MC97 Modem (Smart Link HAMR5600 compatible) 0
++d 10de01c1 nForce AC'97 Modem Controller 0
++d 10de01c2 nForce USB Controller 0
++d 10de01c3 nForce Ethernet Controller 0
++d 10de01e0 nForce2 AGP (different version?) 0
++d 10de01e8 nForce2 AGP 0
++d 10de01ea nForce2 Memory Controller 0 0
++d 10de01eb nForce2 Memory Controller 1 0
++d 10de01ec nForce2 Memory Controller 2 0
++d 10de01ed nForce2 Memory Controller 3 0
++d 10de01ee nForce2 Memory Controller 4 0
++d 10de01ef nForce2 Memory Controller 5 0
++d 10de01f0 NV18 [GeForce4 MX - nForce GPU] 0
+ d 10de0200 NV20 [GeForce3] 0
+ s 10de02001043402f AGP-V8200 DDR 0
+-d 10de0201 NV20 [GeForce3 Ti200] 0
+-d 10de0202 NV20 [GeForce3 Ti500] 0
++d 10de0201 NV20 [GeForce3 Ti 200] 0
++d 10de0202 NV20 [GeForce3 Ti 500] 0
+ s 10de02021043405b V8200 T5 0
+ s 10de02021545002f Xtasy 6964 0
+-d 10de0203 NV20 [Quadro DCC] 0
+-d 10de0250 NV25 [GeForce4 Ti4600] 0
+-d 10de0251 NV25 [GeForce4 Ti4400] 0
+-d 10de0253 NV25 [GeForce4 Ti4200] 0
+-s 10de0253107d2896 WinFast A250 LE TD (Dual VGA/TV-out/DVI) 1
+-s 10de0253147b8f09 Abit Siluro (Dual VGA/TV-out/DVI) 1
+-d 10de0258 Quadro4 900XGL 0
+-d 10de0259 Quadro4 750XGL 0
+-d 10de025b Quadro4 700XGL 0
++d 10de0203 NV20DCC [Quadro DCC] 0
++d 10de0250 NV25 [GeForce4 Ti 4600] 0
++d 10de0251 NV25 [GeForce4 Ti 4400] 0
++s 10de025110438023 v8440 GeForce 4 Ti4400 0
++d 10de0252 NV25 [GeForce4 Ti] 0
++d 10de0253 NV25 [GeForce4 Ti 4200] 0
++s 10de0253107d2896 WinFast A250 LE TD (Dual VGA/TV-out/DVI) 0
++s 10de0253147b8f09 Siluro (Dual VGA/TV-out/DVI) 0
++d 10de0258 NV25GL [Quadro4 900 XGL] 0
++d 10de0259 NV25GL [Quadro4 750 XGL] 0
++d 10de025b NV25GL [Quadro4 700 XGL] 0
++d 10de0280 NV28 [GeForce4 Ti 4800] 0
++d 10de0281 NV28 [GeForce4 Ti 4200 AGP 8x] 0
++d 10de0282 NV28 [GeForce4 Ti 4800 SE] 0
++d 10de0286 NV28 [GeForce4 Ti 4200 Go AGP 8x] 0
++d 10de0288 NV28GL [Quadro4 980 XGL] 0
++d 10de0289 NV28GL [Quadro4 780 XGL] 0
++d 10de028c NV28GLM [Quadro4 700 GoGL] 0
++d 10de0300 NV30 [GeForce FX] 0
++d 10de0301 NV30 [GeForce FX 5800 Ultra] 0
++d 10de0302 NV30 [GeForce FX 5800] 0
++d 10de0308 NV30GL [Quadro FX 2000] 0
++d 10de0309 NV30GL [Quadro FX 1000] 0
++d 10de0311 NV31 [GeForce FX 5600 Ultra] 0
++d 10de0312 NV31 [GeForce FX 5600] 0
++d 10de0313 NV31 0
++d 10de0314 NV31 [GeForce FX 5600XT] 0
++s 10de03141043814a V9560XT/TD 0
++d 10de0316 NV31 0
++d 10de0317 NV31 0
++d 10de031a NV31M [GeForce FX Go 5600] 0
++d 10de031b NV31M [GeForce FX Go5650] 0
++d 10de031c NVIDIA Quadro FX 700 Go 0
++d 10de031d NV31 0
++d 10de031e NV31 0
++d 10de031f NV31 0
++d 10de0320 NV34 [GeForce FX 5200] 0
++d 10de0321 NV34 [GeForce FX 5200 Ultra] 0
++d 10de0322 NV34 [GeForce FX 5200] 0
++s 10de032214629171 MS-8917 (FX5200-T128) 0
++d 10de0323 NV34 [GeForce FX 5200LE] 0
++d 10de0324 NV34M [GeForce FX Go 5200] 0
++s 10de032410718160 MIM2000 0
++d 10de0325 NV34M [GeForce FX Go5250] 0
++d 10de0326 NV34 [GeForce FX 5500] 0
++d 10de0327 NV34 [GeForce FX 5100] 0
++d 10de0328 NV34M [GeForce FX Go 5200] 0
++d 10de0329 NV34M [GeForce FX Go5200] 0
++d 10de032a NV34GL [Quadro NVS 280 PCI] 0
++d 10de032b NV34GL [Quadro FX 500/600 PCI] 0
++d 10de032c NV34GLM [GeForce FX Go 5300] 0
++d 10de032d NV34 [GeForce FX Go5100] 0
++d 10de032f NV34 0
++d 10de0330 NV35 [GeForce FX 5900 Ultra] 0
++d 10de0331 NV35 [GeForce FX 5900] 0
++s 10de033110438145 V9950GE 0
++d 10de0332 NV35 [GeForce FX 5900XT] 0
++d 10de0333 NV38 [GeForce FX 5950 Ultra] 0
++d 10de0334 NV35 [GeForce FX 5900ZT] 0
++d 10de0338 NV35GL [Quadro FX 3000] 0
++d 10de033f NV35GL [Quadro FX 700] 0
++d 10de0341 NV36.1 [GeForce FX 5700 Ultra] 0
++d 10de0342 NV36.2 [GeForce FX 5700] 0
++d 10de0343 NV36 [GeForce FX 5700LE] 0
++d 10de0344 NV36.4 [GeForce FX 5700VE] 0
++d 10de0345 NV36.5 0
++d 10de0347 NV36 [GeForce FX Go5700] 0
++d 10de0348 NV36 [GeForce FX Go5700] 0
++d 10de0349 NV36 0
++d 10de034b NV36 0
++d 10de034c NV36 [Quadro FX Go1000] 0
++d 10de034e NV36GL [Quadro FX 1100] 0
++d 10de034f NV36GL 0
+ v 10df Emulex Corporation 0
+ d 10df1ae5 LP6000 Fibre Channel Host Adapter 0
++d 10df1ae6 LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2) 0
++d 10df1ae7 LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:2-3) 0
++d 10dff015 LP1150e 0
+ d 10dff085 LP850 Fibre Channel Adapter 0
+ d 10dff095 LP952 Fibre Channel Adapter 0
+ d 10dff098 LP982 Fibre Channel Adapter 0
++d 10dff0a1 LightPulse Fibre Channel Adapter 0
++d 10dff0a5 LP1050 0
++d 10dff0d5 LP1150 0
++d 10dff100 LP11000e 0
+ d 10dff700 LP7000 Fibre Channel Host Adapter 0
++d 10dff701 LP 7000EFibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2) 0
+ d 10dff800 LP8000 Fibre Channel Host Adapter 0
++d 10dff801 LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2) 0
+ d 10dff900 LP9000 Fibre Channel Host Adapter 0
++d 10dff901 LP 9000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2) 0
+ d 10dff980 LP9802 Fibre Channel Adapter 0
++d 10dff981 LP 9802 Fibre Channel Host Adapter Alternate ID 0
++d 10dff982 LP 9802 Fibre Channel Host Adapter Alternate ID 0
++d 10dffa00 LP10000 Fibre Channel Host Adapter 0
++d 10dffa01 LP101 0
++d 10dffb00 LightPulse Fibre Channel Adapter 0
++d 10dffd00 LP11000 0
+ v 10e0 Integrated Micro Solutions Inc. 0
+ d 10e05026 IMS5026/27/28 0
+ d 10e05027 IMS5027 0
+@@ -2669,11 +3574,15 @@
+ v 10e3 Tundra Semiconductor Corp. 0
+ d 10e30000 CA91C042 [Universe] 0
+ d 10e30860 CA91C860 [QSpan] 0
++d 10e30862 CA91C862A [QSpan-II] 0
++d 10e38260 CA91L8200B [Dual PCI PowerSpan II] 0
++d 10e38261 CA91L8260B [Single PCI PowerSpan II] 0
+ v 10e4 Tandem Computers 0
+ v 10e5 Micro Industries Corporation 0
+ v 10e6 Gainbery Computer Products Inc. 0
+ v 10e7 Vadem 0
+ v 10e8 Applied Micro Circuits Corp. 0
++d 10e81072 INES GPIB-PCI (AMCC5920 based) 0
+ d 10e82011 Q-Motion Video Capture/Edit board 0
+ d 10e84750 S5930 [Matchmaker] 0
+ d 10e85920 S5920 0
+@@ -2687,8 +3596,18 @@
+ d 10e880d9 PCI-9118 0
+ d 10e880da PCI-9812 0
+ d 10e8811a PCI-IEEE1355-DS-DE Interface 0
++d 10e8814c Fastcom ESCC-PCI (Commtech, Inc.) 0
+ d 10e88170 S5933 [Matchmaker] (Chipset Development Tool) 0
++d 10e881e6 Multimedia video controller 0 sold with Roper Scientifc(Photometrics) CoolSnap HQ camera
++d 10e88291 Fastcom 232/8-PCI (Commtech, Inc.) 0
++d 10e882c4 Fastcom 422/4-PCI (Commtech, Inc.) 0
++d 10e882c5 Fastcom 422/2-PCI (Commtech, Inc.) 0
++d 10e882c6 Fastcom IG422/1-PCI (Commtech, Inc.) 0
++d 10e882c7 Fastcom IG232/2-PCI (Commtech, Inc.) 0
++d 10e882ca Fastcom 232/4-PCI (Commtech, Inc.) 0
+ d 10e882db AJA HDNTV HD SDI Framestore 0
++d 10e882e2 Fastcom DIO24H-PCI (Commtech, Inc.) 0
++d 10e88851 S5933 on Innes Corp FM Radio Capture card 0
+ v 10e9 Alps Electric Co., Ltd. 0
+ v 10ea Intergraphics Systems 0
+ d 10ea1680 IGA-1680 0
+@@ -2698,6 +3617,8 @@
+ d 10ea2010 CyberPro 2000A 0
+ d 10ea5000 CyberPro 5000 0
+ d 10ea5050 CyberPro 5050 0
++d 10ea5202 CyberPro 5202 0
++d 10ea5252 CyberPro5252 0 CyberPro5202 Audio Function
+ v 10eb Artists Graphics 0
+ d 10eb0101 3GA 0
+ d 10eb8111 Twist3 Frame Grabber 0
+@@ -2713,41 +3634,53 @@
+ d 10ec8138 RT8139 (B/C) Cardbus Fast Ethernet Adapter 0
+ s 10ec813810ec8138 RT8139 (B/C) Fast Ethernet Adapter 0
+ d 10ec8139 RTL-8139/8139C/8139C+ 0
++s 10ec81390357000a TTP-Monitoring Card V2.0 0
++s 10ec81391025005a TravelMate 290 0
+ s 10ec813910258920 ALN-325 0
+ s 10ec813910258921 ALN-325 0
++s 10ec813910718160 MIM2000 0
+ s 10ec813910bd0320 EP-320X-R 0
+ s 10ec813910ec8139 RT8139 0
++s 10ec81391113ec01 FNC-0107TX 0
+ s 10ec813911861300 DFE-538TX 0
+ s 10ec813911861320 SN5200 0
+ s 10ec813911868139 DRN-32TX 0
++s 10ec813911f68139 FN22-3(A) LinxPRO Ethernet Adapter 0
+ s 10ec813912592500 AT-2500TX 0
+ s 10ec813912592503 AT-2500TX/ACPI 0
+ s 10ec81391429d010 ND010 0
+ s 10ec813914329130 EN-9130TX 0
+ s 10ec813914368139 RT8139 0
++s 10ec81391458e000 GA-7VM400M/7VT600 Motherboard 0
+ s 10ec8139146c1439 FE-1439TX 0
+ s 10ec813914896001 GF100TXRII 0
+ s 10ec813914896002 GF100TXRA 0
+ s 10ec8139149c139a LFE-8139ATX 0
+ s 10ec8139149c8139 LFE-8139TX 0
++s 10ec813914cb0200 LNR-100 Family 10/100 Base-TX Ethernet 0
++s 10ec813917995000 F5D5000 PCI Card/Desktop Network PCI Card 0
+ s 10ec813926460001 EtheRx 0
+ s 10ec81398e2e7000 KF-230TX 0
+ s 10ec81398e2e7100 KF-230TX/2 0
+ s 10ec8139a0a00007 ALN-325C 0
+-d 10ec8169 RTL-8169 0
++d 10ec8169 RTL-8169 Gigabit Ethernet 0
++s 10ec81691259c107 CG-LAPCIGT 0
++s 10ec81691371434e ProG-2000L 0
++s 10ec81691458e000 GA-K8VT800 Pro Motherboard 0
++s 10ec81691462702c K8T NEO 2 motherboard 0
++d 10ec8180 RTL8180L 802.11b MAC 0
+ d 10ec8197 SmartLAN56 56K Modem 0
+ v 10ed Ascii Corporation 0
+ d 10ed7310 V7310 0
+-v 10ee Xilinx, Inc. 0
+-v 10ee Xilinx Corporation 1 This Vendor-Id and several it's Device-Ids appear in a larger database at http://www.yourvote.com/pci/ which you may want to ref
+-v 10ee Xilinx Corporation 1 This Vendor-Id and several it's Device-Ids appear in a larger database at http://www.yourvote.com/pci/ which you may want to ref
+-v 10ee Xilinx Corporation 1 This Vendor-Id and several it's Device-Ids appear in a larger database at http://www.yourvote.com/pci/ which you may want to ref
++v 10ee Xilinx Corporation 0
+ d 10ee3fc0 RME Digi96 0
+ d 10ee3fc1 RME Digi96/8 0
+ d 10ee3fc2 RME Digi96/8 Pro 0
+ d 10ee3fc3 RME Digi96/8 Pad 0
+ d 10ee3fc4 RME Digi9652 (Hammerfall) 0
+ d 10ee3fc5 RME Hammerfall DSP 0
++d 10ee3fc6 RME Hammerfall DSP MADI 0
++d 10ee8381 Ellips Santos Frame Grabber 0
+ v 10ef Racore Computer Products, Inc. 0
+ d 10ef8154 M815x Token Ring Adapter 0
+ v 10f0 Peritek Corporation 0
+@@ -2764,8 +3697,10 @@
+ v 10fa Truevision 0
+ d 10fa000c TARGA 1000 0
+ v 10fb Thesys Gesellschaft fr Mikroelektronik mbH 0
++d 10fb186f TH 6255 0
+ v 10fc I-O Data Device, Inc. 0
+ d 10fc0003 Cardbus IDE Controller 0 What's in the cardbus end of a Sony ACR-A01 card, comes with newer Vaio CD-RW drives
++d 10fc0005 Cardbus SCSI CBSC II 0
+ v 10fd Soyo Computer, Inc 0
+ v 10fe Fast Multimedia AG 0
+ v 10ff NCube 0
+@@ -2776,6 +3711,7 @@
+ d 11019400 INI-940 0
+ d 11019401 INI-950 0
+ d 11019500 360P 0
++d 11019502 Initio INI-9100UW Ultra Wide SCSI Controller INIC-950P chip 0
+ v 1102 Creative Labs 0
+ d 11020002 SB Live! EMU10k1 0
+ s 1102000211020020 CT4850 SBLive! Value 0
+@@ -2793,49 +3729,84 @@
+ s 1102000211028040 CT4760 SBLive! 0
+ s 1102000211028051 CT4850 SBLive! Value 0
+ s 1102000211028061 SBLive! Player 5.1 0
++s 1102000211028064 SB Live! 5.1 Model SB0100 0
++s 1102000211028065 SBLive! 5.1 Digital Model SB0220 0
++s 1102000211028067 SBLive! 5.1 eMicro 28028 0
+ d 11020004 SB Audigy 0
+ s 1102000411020051 SB0090 Audigy Player 0
+-s 1102000411020053 SB0090 Audigy Player/OEM 1
+-d 11020006 [SB Live! Value] EMU10K1X audio controller 1 OEM card in new Dell system
++s 1102000411020053 SB0090 Audigy Player/OEM 0
++s 1102000411020058 SB0090 Audigy Player/OEM 0
++s 1102000411022002 SB Audigy 2 ZS (SB0350) 0
++d 11020006 [SB Live! Value] EMU10k1X 0
++d 11020007 SB Audigy LS 0
++s 1102000711021001 SB0310 Audigy LS 0
++s 1102000711021002 SB0312 Audigy LS 0
++d 11020008 SB0400 Audigy2 Value 0
+ d 11024001 SB Audigy FireWire Port 0
+-s 1102400111020010 SB Audigy FireWire Port 1
++s 1102400111020010 SB Audigy FireWire Port 0
+ d 11027002 SB Live! MIDI/Game Port 0
+ s 1102700211020020 Gameport Joystick 0
+ d 11027003 SB Audigy MIDI/Game port 0
+-d 11027003 SB Audigy MIDI/Game Port 1
+-s 1102700311020040 SB Audigy MIDI/Gameport 0
+-s 1102700311020040 SB Audigy MIDI/Game Port 1
+-d 11027004 [SB Live! Value] Input device controller 1 OEM card in new Dell system
+-d 11028938 ES1371 0
++s 1102700311020040 SB Audigy MIDI/Game Port 0
++d 11027004 [SB Live! Value] Input device controller 0
++d 11027005 SB Audigy LS MIDI/Game port 0
++s 1102700511021001 SB0310 Audigy LS MIDI/Game port 0
++s 1102700511021002 SB0312 Audigy LS MIDI/Game port 0
++d 11028064 SB0100 [SBLive! 5.1 OEM] 0
++d 11028938 Ectiva EV1938 0
+ v 1103 Triones Technologies, Inc. 0
+ d 11030003 HPT343 0
+ d 11030004 HPT366/368/370/370A/372 0 Revisions: 01=HPT366, 03=HPT370, 04=HPT370A, 05=HPT372
+ s 1103000411030001 HPT370A 0
++s 1103000411030003 HPT343 / HPT345 / HPT363 UDMA33 0
++s 1103000411030004 HPT366 UDMA66 (r1) / HPT368 UDMA66 (r2) / HPT370 UDMA100 (r3) / HPT370 UDMA100 RAID (r4) 0
+ s 1103000411030005 HPT370 UDMA100 0
++s 1103000411030006 HPT302 0
++s 1103000411030007 HPT371 UDMA133 0
++s 1103000411030008 HPT374 UDMA/ATA133 RAID Controller 0
+ d 11030005 HPT372A 0
+ d 11030006 HPT302 0
+ d 11030007 HPT371 0
+ d 11030008 HPT374 0
++d 11030009 HPT372N 0
+ v 1104 RasterOps Corp. 0
+ v 1105 Sigma Designs, Inc. 0
+ d 11051105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder 0
+ d 11058300 REALmagic Hollywood Plus DVD Decoder 0
+ d 11058400 EM840x REALmagic DVD/MPEG-2 Audio/Video Decoder 0
++d 11058401 EM8401 REALmagic DVD/MPEG-2 A/V Decoder 0
++d 11058470 EM8470 REALmagic DVD/MPEG-4 A/V Decoder 0
++d 11058471 EM8471 REALmagic DVD/MPEG-4 A/V Decoder 0
++d 11058475 EM8475 REALmagic DVD/MPEG-4 A/V Decoder 0
++d 11058476 EM8476 REALmagic DVD/MPEG-4 A/V Decoder 0
++d 11058485 EM8485 REALmagic DVD/MPEG-4 A/V Decoder 0
++d 11058486 EM8486 REALmagic DVD/MPEG-4 A/V Decoder 0
+ v 1106 VIA Technologies, Inc. 0
+ d 11060102 Embedded VIA Ethernet Controller 0
+ d 11060130 VT6305 1394.A Controller 0
+ d 11060305 VT8363/8365 [KT133/KM133] 0
+ s 1106030510438033 A7V Mainboard 0
++s 110603051043803e A7V-E Mainboard 0
+ s 1106030510438042 A7V133/A7V133-C Mainboard 0
+ s 11060305147ba401 KT7/KT7-RAID/KT7A/KT7A-RAID Mainboard 0
+ d 11060391 VT8371 [KX133] 0
+ d 11060501 VT8501 [Apollo MVP4] 0
+ d 11060505 VT82C505 0
+-d 11060561 VT82C561 0
+-d 11060571 VT82C586B PIPC Bus Master IDE 0
+-d 11060571 VT82C586/B/686A/B PIPC Bus Master IDE 1
+-s 1106057110438052 VT8233A Bus Master ATA100/66/33 IDE 1
+-s 1106057111060571 VT8235 Bus Master ATA133/100/66/33 IDE 0
++d 11060561 VT82C576MV 0 Shares chip with :0576. The VT82C576M has :1571 instead of :0561.
++d 11060571 VT82C586A/B/VT82C686/A/B/VT823x/A/C PIPC Bus Master IDE 0
++s 1106057110190985 P6VXA Motherboard 0
++s 1106057110190a81 L7VTA v1.0 Motherboard (KT400-8235) 0
++s 1106057110438052 VT8233A Bus Master ATA100/66/33 IDE 0
++s 110605711043808c A7V8X motherboard 0
++s 11060571104380a1 A7V8X-X motherboard rev. 1.01 0
++s 11060571104380ed A7V600 motherboard 0
++s 1106057111060571 VT82C586/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE 0
++s 1106057111790001 Magnia Z310 0
++s 110605711297f641 FX41 motherboard 0
++s 1106057114585002 GA-7VAX Mainboard 0
++s 1106057114627020 K8T NEO 2 motherboard 0
++s 11060571147b1407 KV8-MAX3 motherboard 0
++s 1106057118490571 K7VT2 motherboard 0
+ d 11060576 VT82C576 3V [Apollo Master] 0
+ d 11060585 VT82C585VP [Apollo VP1/VPX] 0
+ d 11060586 VT82C586/A/B PCI-to-ISA [Apollo VP] 0
+@@ -2848,77 +3819,158 @@
+ d 11060598 VT82C598 [Apollo MVP3] 0
+ d 11060601 VT8601 [Apollo ProMedia] 0
+ d 11060605 VT8605 [ProSavage PM133] 0
++s 110606051043802c CUV4X mainboard 0
+ d 11060680 VT82C680 [Apollo P6] 0
+ d 11060686 VT82C686 [Apollo Super South] 0
++s 1106068610190985 P6VXA Motherboard 0
++s 110606861043802c CUV4X mainboard 0
+ s 1106068610438033 A7V Mainboard 0
++s 110606861043803e A7V-E Mainboard 0
+ s 1106068610438040 A7M266 Mainboard 0
+ s 1106068610438042 A7V133/A7V133-C Mainboard 0
+ s 1106068611060000 VT82C686/A PCI to ISA Bridge 0
+ s 1106068611060686 VT82C686/A PCI to ISA Bridge 0
++s 1106068611790001 Magnia Z310 0
++s 11060686147ba702 KG7-Lite Mainboard 0
+ d 11060691 VT82C693A/694x [Apollo PRO133x] 0
++s 1106069110190985 P6VXA Motherboard 0
++s 1106069111790001 Magnia Z310 0
+ s 1106069114580691 VT82C691 Apollo Pro System Controller 0
+ d 11060693 VT82C693 [Apollo Pro Plus] 0
+ d 11060698 VT82C693A [Apollo Pro133 AGP] 0
+ d 11060926 VT82C926 [Amazon] 0
+ d 11061000 VT82C570MV 0
+ d 11061106 VT82C570MV 0
+-d 11061571 VT82C416MV 0
++d 11061571 VT82C576M/VT82C586 0
+ d 11061595 VT82C595/97 [Apollo VP2/97] 0
+-d 11063038 USB 0
++d 11063022 CLE266 0
++d 11063038 VT82xxxxx UHCI USB 1.1 Controller 0 This is *not* USB 2.0 as the existing entry suggests
+ s 1106303809251234 USB Controller 0
+-s 1106303812340925 MVP3 USB Controller 0
++s 1106303810190985 P6VXA Motherboard 0
++s 1106303810190a81 L7VTA v1.0 Motherboard (KT400-8235) 0
++s 110630381043808c VT6202 USB2.0 4 port controller 0
++s 11063038104380a1 A7V8X-X motherboard 0
++s 11063038104380ed A7V600 motherboard 0
++s 1106303811790001 Magnia Z310 0
++s 1106303814585004 GA-7VAX Mainboard 0
++s 1106303814627020 K8T NEO 2 motherboard 0
++s 11063038147b1407 KV8-MAX3 motherboard 0
+ d 11063040 VT82C586B ACPI 0
+ d 11063043 VT86C100A [Rhine] 0
+ s 1106304310bd0000 VT86C100A Fast Ethernet Adapter 0
+ s 1106304311060100 VT86C100A Fast Ethernet Adapter 0
+ s 1106304311861400 DFE-530TX rev A 0
+ d 11063044 IEEE 1394 Host Controller 0
++s 110630441025005a TravelMate 290 0
++s 1106304414581000 GA-7VT600-1394 Motherboard 0
++s 110630441462702d K8T NEO 2 motherboard 0
+ d 11063050 VT82C596 Power Management 0
+ d 11063051 VT82C596 Power Management 0
++d 11063053 VT6105M [Rhine-III] 0
+ d 11063057 VT82C686 [Apollo Super ACPI] 0
++s 1106305710190985 P6VXA Motherboard 0
+ s 1106305710438033 A7V Mainboard 0
++s 110630571043803e A7V-E Mainboard 0
+ s 1106305710438040 A7M266 Mainboard 0
+ s 1106305710438042 A7V133/A7V133-C Mainboard 0
++s 1106305711790001 Magnia Z310 0
+ d 11063058 VT82C686 AC97 Audio Controller 0
++s 110630580e110097 SoundMax Digital Integrated Audio 0
+ s 110630580e11b194 Soundmax integrated digital audio 0
++s 1106305810190985 P6VXA Motherboard 0
++s 1106305810431106 A7V133/A7V133-C Mainboard 0
+ s 1106305811064511 Onboard Audio on EP7KXA 0
+ s 1106305814587600 Onboard Audio 0
+ s 1106305814623091 MS-6309 Onboard Audio 0
++s 1106305814623300 MS-6330 Onboard Audio 0
+ s 1106305815dd7609 Onboard Audio 0
+-d 11063059 VT8233 AC97 Audio Controller 0
++d 11063059 VT8233/A/8235/8237 AC97 Audio Controller 0
++s 1106305910190a81 L7VTA v1.0 Motherboard (KT400-8235) 0
++s 1106305910438095 A7V8X Motherboard (Realtek ALC650 codec) 0
++s 11063059104380a1 A7V8X-X Motherboard 0
++s 11063059104380b0 A7V600 motherboard (ADI AD1980 codec [SoundMAX]) 0
++s 1106305911063059 L7VMM2 Motherboard 0
++s 1106305911064161 K7VT2 motherboard 0
++s 110630591297c160 FX41 motherboard (Realtek ALC650 codec) 0
++s 110630591458a002 GA-7VAX Onboard Audio (Realtek ALC650) 0
++s 1106305914620080 K8T NEO 2 motherboard 0
++s 1106305914623800 KT266 onboard audio 0
++s 11063059147b1407 KV8-MAX3 motherboard 0
+ d 11063065 VT6102 [Rhine-II] 0
++s 11063065104380a1 A7V8X-X Motherboard 0
+ s 1106306511060102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 0
+-s 1106306511063065 Embedded ethernet on VIA Eden 0
+ s 1106306511861400 DFE-530TX rev A 0
+ s 1106306511861401 DFE-530TX rev B 0
+-d 11063068 AC97 Modem Controller 0
++s 1106306513b91421 LD-10/100AL PCI Fast Ethernet Adapter (rev.B) 0
++d 11063068 AC'97 Modem Controller 0 This hosts more than just the Intel 537 codec, it also hosts PCtel (SIL33) and SmartLink (SIL34) codecs
++s 110630681462309e MS-6309 Saturn Motherboard 0
+ d 11063074 VT8233 PCI to ISA Bridge 0
+-s 1106307410438052 VT8233A 1
++s 1106307410438052 VT8233A 0
+ d 11063091 VT8633 [Apollo Pro266] 0
+-d 11063099 VT8367 [KT266] 0
+-d 11063099 VT8366/A/7 [Apollo KT266/A/333] 1
+-s 1106309910438064 A7V266-E 0
+-s 1106309910438064 A7V266-E Mainboard 1
+-s 110630991043807f A7V333 0
+-s 110630991043807f A7V333 Mainboard 1
++d 11063099 VT8366/A/7 [Apollo KT266/A/333] 0
++s 1106309910438064 A7V266-E Mainboard 0
++s 110630991043807f A7V333 Mainboard 0
++s 1106309918493099 K7VT2 motherboard 0
+ d 11063101 VT8653 Host Bridge 0
+ d 11063102 VT8662 Host Bridge 0
+ d 11063103 VT8615 Host Bridge 0
+ d 11063104 USB 2.0 0
++s 1106310410190a81 L7VTA v1.0 Motherboard (KT400-8235) 0
++s 110631041043808c A7V8X motherboard 0
++s 11063104104380a1 A7V8X-X motherboard rev 1.01 0
++s 11063104104380ed A7V600 motherboard 0
++s 110631041297f641 FX41 motherboard 0
++s 1106310414585004 GA-7VAX Mainboard 0
++s 1106310414627020 K8T NEO 2 motherboard 0
++s 11063104147b1407 KV8-MAX3 motherboard 0
++d 11063106 VT6105 [Rhine-III] 0
++s 1106310611861403 DFE-530TX rev C 0
++d 11063108 S3 Unichrome Pro VGA Adapter 0
+ d 11063109 VT8233C PCI to ISA Bridge 0
+ d 11063112 VT8361 [KLE133] Host Bridge 0
+-d 11063116 VT8375 [KM266] Host Bridge 0
++d 11063116 VT8375 [KM266/KL266] Host Bridge 0
++s 110631161297f641 FX41 motherboard 0
++d 11063118 S3 Unichrome Pro VGA Adapter 0
++d 11063119 VT6120/VT6121/VT6122 Gigabit Ethernet Adapter 0
++d 11063122 VT8623 [Apollo CLE266] integrated CastleRock graphics 0 found on EPIA M6000/9000 mainboard
++d 11063123 VT8623 [Apollo CLE266] 0 found on EPIA M6000/9000 mainboard
+ d 11063128 VT8753 [P4X266 AGP] 0
+ d 11063133 VT3133 Host Bridge 0
+ d 11063147 VT8233A ISA Bridge 0
+ d 11063148 P4M266 Host Bridge 0
++d 11063149 VIA VT6420 SATA RAID Controller 0
++s 11063149104380ed A7V600 motherboard 0
++s 110631491458b003 GA-7VM400AM(F) Motherboard 0
++s 1106314914627020 K8T Neo 2 Motherboard 0
+ d 11063156 P/KN266 Host Bridge 0
+-d 11063168 VT8374 P4X400 Host Controller/AGP Bridge 1 PCI devices found:
\n Bus 0, device 0, function 0:
\n Host bridge: PCI device 1106:3168 (VIA Technologies, Inc.) (rev 3).
+-d 11063177 VT8233A ISA Bridge 0
+-d 11063177 VT8235 ISA Bridge 1 The kernel patch available in http://www.uwsg.iu.edu/hypermail/linux/kernel/0208.2/0581.html declares this ID to be VT8235 and n
+-d 11063189 VT8377 [KT400] Host Bridge 0
++d 11063164 VT6410 ATA133 RAID controller 0 on ASUS P4P800
++d 11063168 VT8374 P4X400 Host Controller/AGP Bridge 0
++d 11063177 VT8235 ISA Bridge 0
++s 1106317710190a81 L7VTA v1.0 Motherboard (KT400-8235) 0
++s 110631771043808c A7V8X motherboard 0
++s 11063177104380a1 A7V8X-X motherboard 0
++s 110631771297f641 FX41 motherboard 0
++s 1106317714585001 GA-7VAX Mainboard 0
++s 1106317718493177 K7VT2 motherboard 0
++d 11063188 VT8385 [K8T800 AGP] Host Bridge 0
++s 11063188147b1407 KV8-MAX3 motherboard 0
++d 11063189 VT8377 [KT400/KT600 AGP] Host Bridge 0
++s 110631891043807f A7V8X motherboard 0
++s 1106318914585000 GA-7VAX Mainboard 0
++d 11063204 K8M800 0
++d 11063205 VT8378 [KM400/A] Chipset Host Bridge 0
++s 1106320514585000 GA-7VM400M Motherboard 0
++d 11063227 VT8237 ISA bridge [KT600/K8T800 South] 0
++s 11063227104380ed A7V600 motherboard 0
++s 1106322711063227 DFI KT600-AL Motherboard 0
++s 1106322714585001 GA-7VT600 Motherboard 0
++s 11063227147b1407 KV8-MAX3 motherboard 0
++d 11064149 VIA VT6420 (ATA133) Controller 0
+ d 11065030 VT82C596 ACPI [Apollo PRO] 0
+ d 11066100 VT85C100A [Rhine II] 0
++d 11067204 K8M800 0
++d 11067205 VT8378 [S3 UniChrome] Integrated Video 0 S3 Graphics UniChrome™ 2D/3D Graphics with motion compensation
++s 110672051458d000 Gigabyte GA-7VM400(A)M(F) Motherboard 0
+ d 11068231 VT8231 [PCI-to-ISA Bridge] 0
+ d 11068235 VT8235 ACPI 0
+ d 11068305 VT8363/8365 [KT133/KM133 AGP] 0
+@@ -2927,18 +3979,22 @@
+ d 11068596 VT82C596 [Apollo PRO AGP] 0
+ d 11068597 VT82C597 [Apollo VP3 AGP] 0
+ d 11068598 VT82C598/694x [Apollo MVP3/Pro133x AGP] 0
++s 1106859810190985 P6VXA Motherboard 0
+ d 11068601 VT8601 [Apollo ProMedia AGP] 0
+ d 11068605 VT8605 [PM133 AGP] 0
+ d 11068691 VT82C691 [Apollo Pro] 0
+ d 11068693 VT82C693 [Apollo Pro Plus] PCI Bridge 0
+ d 1106b091 VT8633 [Apollo Pro266 AGP] 0
+-d 1106b099 VT8367 [KT333 AGP] 0
+-d 1106b099 VT8366/A/7 [Apollo KT266/A/333 AGP] 1
++d 1106b099 VT8366/A/7 [Apollo KT266/A/333 AGP] 0
+ d 1106b101 VT8653 AGP Bridge 0
+ d 1106b102 VT8362 AGP Bridge 0
+ d 1106b103 VT8615 AGP Bridge 0
+ d 1106b112 VT8361 [KLE133] AGP Bridge 0
+-d 1106b168 VT8235 0
++d 1106b168 VT8235 PCI Bridge 0
++d 1106b188 VT8237 PCI bridge [K8T800 South] 0
++s 1106b188147b1407 KV8-MAX3 motherboard 0
++d 1106b198 VT8237 PCI Bridge 0
++d 1106d104 VT8237 Integrated Fast Ethernet Controller 0 32-Bit PCI bus master Ethernet MAC with standard MII interface
+ v 1107 Stratus Computers 0
+ d 11070576 VIA VT82C570MV [Apollo] (Wrong vendor ID!) 0
+ v 1108 Proteon, Inc. 0
+@@ -2955,7 +4011,17 @@
+ v 110a Siemens Nixdorf AG 0
+ d 110a0002 Pirahna 2-port 0
+ d 110a0005 Tulip controller, power management, switch extender 0
++d 110a0006 FSC PINC (I/O-APIC) 0
++d 110a0015 FSC Multiprocessor Interrupt Controller 0
++d 110a001d FSC Copernicus Management Controller 0
++d 110a007b FSC Remote Service Controller, mailbox device 0
++d 110a007c FSC Remote Service Controller, shared memory device 0
++d 110a007d FSC Remote Service Controller, SMIC device 0
+ d 110a2102 DSCC4 WAN adapter 0
++d 110a2104 Eicon Diva 2.02 compatible passive ISDN card 0
++d 110a3142 SIMATIC NET CP 5613A1 (Profibus Adapter) 0
++d 110a4021 SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter) 0
++d 110a4029 SIMATIC NET CP 5613A2 (Profibus Adapter) 0
+ d 110a4942 FPGA I-Bus Tracer for MBD 0
+ d 110a6120 SZB6120 0
+ v 110b Chromatic Research Inc. 0
+@@ -2969,8 +4035,7 @@
+ d 11106037 Firepower Powerized SMP I/O ASIC 0
+ d 11106073 Firepower Powerized SMP I/O ASIC 0
+ v 1111 Santa Cruz Operation 0
+-v 1112 Osicom Technologies Inc 1 see http://www.pcisig.com/membership/vid_search/by_vendor_id/?vendor_id=1112&type=h for proof
+-v 1112 RNS - Div. of Meret Communications Inc 0 DJ: Some people say that 0x1112 is Rockwell International
++v 1112 Osicom Technologies Inc 0 Also claimed to be RNS or Rockwell International, current PCISIG records list Osicom
+ d 11122200 FDDI Adapter 0
+ d 11122300 Fast Ethernet Adapter 0
+ d 11122340 4 Port Fast Ethernet Adapter 0
+@@ -2980,12 +4045,17 @@
+ s 11131211103c1207 EN-1207D Fast Ethernet Adapter 0
+ s 1113121111131211 EN-1207D Fast Ethernet Adapter 0
+ d 11131216 EN-1216 Ethernet Adapter 0
++s 1113121611132242 EN2242 10/100 Ethernet Mini-PCI Card 0
++s 11131216111a1020 SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX ?] 0
+ d 11131217 EN-1217 Ethernet Adapter 0
+ d 11135105 10Mbps Network card 0
+ d 11139211 EN-1207D Fast Ethernet Adapter 0
+ s 1113921111139211 EN-1207D Fast Ethernet Adapter 0
+-d 11139511 Fast Ethernet Adapter 0
++d 11139511 21x4x DEC-Tulip compatible Fast Ethernet 0
++d 1113d301 CPWNA100 (Philips wireless PCMCIA) 0
++d 1113ec02 SMC 1244TX v3 0
+ v 1114 Atmel Corporation 0
++d 11140506 802.11b Wireless Network Adaptor (at76c506) 0
+ v 1115 3D Labs 0
+ v 1116 Data Translation 0
+ d 11160022 DT3001 0
+@@ -3006,14 +4076,18 @@
+ d 11190003 GDT 6120/6520 0
+ d 11190004 GDT 6530 0
+ d 11190005 GDT 6550 0
+-d 11190006 GDT 6x17 0
+-d 11190007 GDT 6x27 0
++d 11190006 GDT 6117/6517 0
++d 11190007 GDT 6127/6527 0
+ d 11190008 GDT 6537 0
+-d 11190009 GDT 6557 0
++d 11190009 GDT 6557/6557-ECC 0
+ d 1119000a GDT 6115/6515 0
+ d 1119000b GDT 6125/6525 0
+ d 1119000c GDT 6535 0
+ d 1119000d GDT 6555 0
++d 11190010 GDT 6115/6515 0
++d 11190011 GDT 6125/6525 0
++d 11190012 GDT 6535 0
++d 11190013 GDT 6555/6555-ECC 0
+ d 11190100 GDT 6117RP/6517RP 0
+ d 11190101 GDT 6127RP/6527RP 0
+ d 11190102 GDT 6537RP 0
+@@ -3068,7 +4142,8 @@
+ d 11190211 GDT 6529RD/6629RD 0
+ d 11190260 GDT 7519RN/7619RN 0
+ d 11190261 GDT 7529RN/7629RN 0
+-d 11190300 GDT Raid Controller 0
++d 111902ff GDT MAXRP 0
++d 11190300 GDT NEWRX 0
+ v 111a Efficient Networks, Inc 0
+ d 111a0000 155P-MF1 (FPGA) 0
+ d 111a0002 155P-MF1 (ASIC) 0
+@@ -3084,12 +4159,15 @@
+ s 111a0005111a0a09 ENI-3060 ADSL (VPI=<0..15>) 0
+ d 111a0007 SpeedStream ADSL 0
+ s 111a0007111a1001 ENI-3061 ADSL [ASIC] 0
++d 111a1203 SpeedStream 1023 Wireless PCI Adapter 0
+ v 111b Teledyne Electronic Systems 0
+ v 111c Tricord Systems Inc. 0
+ d 111c0001 Powerbis Bridge 0
+-v 111d Integrated Device Tech 0
+-d 111d0001 IDT77211 ATM Adapter 0
+-d 111d0003 IDT77252 ATM network controller 0
++v 111d Integrated Device Technology, Inc. 0
++d 111d0001 IDT77201/77211 155Mbps ATM SAR Controller [NICStAR] 0
++d 111d0003 IDT77222/77252 155Mbps ATM MICRO ABR SAR Controller 0
++d 111d0004 IDT77V252 155Mbps ATM MICRO ABR SAR Controller 0
++d 111d0005 IDT77V222 155Mbps ATM MICRO ABR SAR Controller 0
+ v 111e Eldec 0
+ v 111f Precision Digital Images 0
+ d 111f4a47 Precision MX Video engine interface 0
+@@ -3120,16 +4198,45 @@
+ d 112f0001 MVC IM-PCI Video frame grabber/processor 0
+ v 1130 Computervision 0
+ v 1131 Philips Semiconductors 0
++d 11311561 USB 1.1 Host Controller 0
++d 11311562 USB 2.0 Host Controller 0
+ d 11313400 SmartPCI56(UCB1500) 56K Modem 0
++d 11315400 TriMedia TM1000/1100 0
++d 11315402 TriMedia TM-1300 0
+ d 11317130 SAA7130 Video Broadcast Decoder 0
++s 1131713051680138 LiveView FlyVideo 2000 0
++d 11317133 SAA713X Audio+video broadcast decoder 0
++s 1131713351680138 LifeView FlyVideo 3000 0
++s 1131713351680212 LifeView FlyTV Platinum mini 0
+ d 11317134 SAA7134 0 PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl)
++d 11317135 SAA7135 Audio+video broadcast decoder 0
+ d 11317145 SAA7145 0
+ d 11317146 SAA7146 0
++s 11317146110a0000 Fujitsu/Siemens DVB-C card rev1.5 0
++s 11317146110affff Fujitsu/Siemens DVB-C card rev1.5 0
++s 1131714611314f56 KNC1 DVB-S Budget 0
++s 1131714611314f61 Fujitsu-Siemens Activy DVB-S Budget 0
+ s 11317146114b2003 DVRaptor Video Edit/Capture Card 0
+ s 1131714611bd0006 DV500 Overlay 0
+ s 1131714611bd000a DV500 Overlay 0
++s 1131714613c20000 Siemens/Technotrend/Hauppauge DVB card rev1.3 or rev1.5 0
++s 1131714613c20001 Technotrend/Hauppauge DVB card rev1.3 or rev1.6 0
++s 1131714613c20002 Technotrend/Hauppauge DVB card rev2.1 0
++s 1131714613c20003 Technotrend/Hauppauge DVB card rev2.1 0
++s 1131714613c20004 Technotrend/Hauppauge DVB card rev2.1 0
++s 1131714613c20006 Technotrend/Hauppauge DVB card rev1.3 or rev1.6 0
++s 1131714613c20008 Technotrend/Hauppauge DVB-T 0
++s 1131714613c2000a Octal/Technotrend DVB-C for iTV 0
++s 1131714613c21003 Technotrend-Budget / Hauppauge WinTV-NOVA-S DVB card 0
++s 1131714613c21004 Technotrend-Budget / Hauppauge WinTV-NOVA-C DVB card 0
++s 1131714613c21005 Technotrend-Budget / Hauppauge WinTV-NOVA-T DVB card 0
++s 1131714613c2100c Technotrend-Budget / Hauppauge WinTV-NOVA-CI DVB card 0
++s 1131714613c2100f Technotrend-Budget / Hauppauge WinTV-NOVA-CI DVB card 0
++s 1131714613c21011 Technotrend-Budget / Hauppauge WinTV-NOVA-T DVB card 0
++s 1131714613c21013 SATELCO Multimedia DVB 0
++s 1131714613c21102 Technotrend/Hauppauge DVB card rev2.1 0
+ v 1132 Mitel Corp. 0
+-v 1133 Eicon Technology Corporation 0
++v 1133 Eicon Networks Corporation 0 This is the new official company name. See disclaimer on www.eicon.com for details!
+ d 11337901 EiconCard S90 0
+ d 11337902 EiconCard S90 0
+ d 11337911 EiconCard S91 0
+@@ -3141,26 +4248,84 @@
+ d 1133b921 EiconCard P92 0
+ d 1133b922 EiconCard P92 0
+ d 1133b923 EiconCard P92 0
+-d 1133e001 DIVA 20PRO 0
+-s 1133e0011133e001 DIVA Pro 2.0 S/T 0
+-d 1133e002 DIVA 20 0
+-s 1133e0021133e002 DIVA 2.0 S/T 0
+-d 1133e003 DIVA 20PRO_U 0
+-s 1133e0031133e003 DIVA Pro 2.0 U 0
+-d 1133e004 DIVA 20_U 0
+-s 1133e0041133e004 DIVA 2.0 U 0
+-d 1133e005 DIVA LOW 0
+-s 1133e0051133e005 DIVA 2.01 S/T 0
+-d 1133e00b Eicon Diva 2.02 1 New version of Eicon Diva card class 280
+-d 1133e010 DIVA Server BRI-2M 0
+-s 1133e0101133e010 DIVA Server BRI-2M 0
+-d 1133e012 DIVA Server BRI-8M 0
+-s 1133e0121133e012 DIVA Server BRI-8M 0
+-d 1133e014 DIVA Server PRI-30M 0
+-s 1133e0141133e014 DIVA Server PRI-30M 0
+-d 1133e018 DIVA Server BRI-2M/-2F 0
++d 1133e001 Diva Pro 2.0 S/T 0
++d 1133e002 Diva 2.0 S/T PCI 0
++d 1133e003 Diva Pro 2.0 U 0
++d 1133e004 Diva 2.0 U PCI 0
++d 1133e005 Diva 2.01 S/T PCI 0
++d 1133e006 Diva CT S/T PCI 0
++d 1133e007 Diva CT U PCI 0
++d 1133e008 Diva CT Lite S/T PCI 0
++d 1133e009 Diva CT Lite U PCI 0
++d 1133e00a Diva ISDN+V.90 PCI 0
++d 1133e00b Diva 2.02 PCI S/T 0
++d 1133e00c Diva 2.02 PCI U 0
++d 1133e00d Diva ISDN Pro 3.0 PCI 0
++d 1133e00e Diva ISDN+CT S/T PCI Rev 2 0
++d 1133e010 Diva Server BRI-2M PCI 0
++s 1133e010110a0021 Fujitsu Siemens ISDN S0 0
++s 1133e01080010014 Diva Server BRI-2M PCI Cornet NQ 0
++d 1133e011 Diva Server BRI S/T Rev 2 0
++d 1133e012 Diva Server 4BRI-8M PCI 0
++s 1133e01280010014 Diva Server 4BRI-8M PCI Cornet NQ 0
++d 1133e013 Diva Server 4BRI Rev 2 0
++s 1133e01311331300 Diva Server V-4BRI-8 0
++s 1133e0131133e013 Diva Server 4BRI-8M 2.0 PCI 0
++s 1133e01380010014 Diva Server 4BRI-8M 2.0 PCI Cornet NQ 0
++d 1133e014 Diva Server PRI-30M PCI 0
++s 1133e01400080100 Diva Server PRI-30M PCI 0
++s 1133e01480010014 Diva Server PRI-30M PCI Cornet NQ 0
++d 1133e015 DIVA Server PRI Rev 2 0
++s 1133e0151133e015 Diva Server PRI 2.0 PCI 0
++s 1133e01580010014 Diva Server PRI 2.0 PCI Cornet NQ 0
++d 1133e016 Diva Server Voice 4BRI PCI 0
++s 1133e01680010014 Diva Server PRI Cornet NQ 0
++d 1133e017 Diva Server Voice 4BRI Rev 2 0
++s 1133e0171133e017 Diva Server Voice 4BRI-8M 2.0 PCI 0
++s 1133e01780010014 Diva Server Voice 4BRI-8M 2.0 PCI Cornet NQ 0
++d 1133e018 Diva Server BRI-2M 2.0 PCI 0
++s 1133e01811331800 Diva Server V-BRI-2 0
++s 1133e0181133e018 Diva Server BRI-2M 2.0 PCI 0
++s 1133e01880010014 Diva Server BRI-2M 2.0 PCI Cornet NQ 0
++d 1133e019 Diva Server Voice PRI Rev 2 0
++s 1133e0191133e019 Diva Server Voice PRI 2.0 PCI 0
++s 1133e01980010014 Diva Server Voice PRI 2.0 PCI Cornet NQ 0
++d 1133e01a Diva Server 2FX 0
++d 1133e01b Diva Server Voice BRI-2M 2.0 PCI 0
++s 1133e01b1133e01b Diva Server Voice BRI-2M 2.0 PCI 0
++s 1133e01b80010014 Diva Server Voice BRI-2M 2.0 PCI Cornet NQ 0
++d 1133e01c Diva Server PRI Rev 3 0
++s 1133e01c11331c01 Diva Server PRI/E1/T1-8 0
++s 1133e01c11331c02 Diva Server PRI/T1-24 0
++s 1133e01c11331c03 Diva Server PRI/E1-30 0
++s 1133e01c11331c04 Diva Server PRI/E1/T1 0
++s 1133e01c11331c05 Diva Server V-PRI/T1-24 0
++s 1133e01c11331c06 Diva Server V-PRI/E1-30 0
++s 1133e01c11331c07 Diva Server PRI/E1/T1-8 Cornet NQ 0
++s 1133e01c11331c08 Diva Server PRI/T1-24 Cornet NQ 0
++s 1133e01c11331c09 Diva Server PRI/E1-30 Cornet NQ 0
++s 1133e01c11331c0a Diva Server PRI/E1/T1 Cornet NQ 0
++s 1133e01c11331c0b Diva Server V-PRI/T1-24 Cornet NQ 0
++s 1133e01c11331c0c Diva Server V-PRI/E1-30 Cornet NQ 0
++d 1133e01e Diva Server 2PRI 0
++s 1133e01e11331e00 Diva Server V-2PRI/E1-60 0
++s 1133e01e11331e01 Diva Server V-2PRI/T1-48 0
++s 1133e01e11331e02 Diva Server 2PRI/E1-60 0
++s 1133e01e11331e03 Diva Server 2PRI/T1-48 0
++d 1133e020 Diva Server 4PRI 0
++s 1133e02011332000 Diva Server V-4PRI/E1-120 0
++s 1133e02011332001 Diva Server V-4PRI/T1-96 0
++s 1133e02011332002 Diva Server 4PRI/E1-120 0
++s 1133e02011332003 Diva Server 4PRI/T1-96 0
++d 1133e024 Diva Server Analog-4P 0
++s 1133e02411332400 Diva Server V-Analog-4P 0
++s 1133e0241133e024 Diva Server Analog-4P 0
++d 1133e028 Diva Server Analog-8P 0
++s 1133e02811332800 Diva Server V-Analog-8P 0
++s 1133e0281133e028 Diva Server Analog-8P 0
+ v 1134 Mercury Computer Systems 0
+ d 11340001 Raceway Bridge 0
++d 11340002 Dual PCI to RapidIO Bridge 0
+ v 1135 Fuji Xerox Co Ltd 0
+ d 11350001 Printer controller 0
+ v 1136 Momentum Data Systems 0
+@@ -3200,9 +4365,15 @@
+ v 1144 Cincinnati Milacron 0
+ d 11440001 Noservo controller 0
+ v 1145 Workbit Corporation 0
++d 11458007 NinjaSCSI-32 Workbit 0
++d 1145f007 NinjaSCSI-32 KME 0
++d 1145f010 NinjaSCSI-32 Workbit 0
++d 1145f012 NinjaSCSI-32 Logitec 0
++d 1145f013 NinjaSCSI-32 Logitec 0
++d 1145f015 NinjaSCSI-32 Melco 0
+ v 1146 Force Computers 0
+ v 1147 Interface Corp 0
+-v 1148 Syskonnect (Schneider & Koch) 0
++v 1148 SysKonnect 0 Formerly (Schneider & Koch)
+ d 11484000 FDDI Adapter 0
+ s 114840000e11b03b Netelligent 100 FDDI DAS Fibre SC 0
+ s 114840000e11b03c Netelligent 100 FDDI SAS Fibre SC 0
+@@ -3220,16 +4391,54 @@
+ s 1148400011485843 FDDI SK-5843 (SK-NET FDDI-LP64) 0
+ s 1148400011485844 FDDI SK-5844 (SK-NET FDDI-LP64 DAS) 0
+ d 11484200 Token Ring adapter 0
+-d 11484300 Gigabit Ethernet 0
+-s 1148430011489821 SK-9821 (1000Base-T single link) 0
+-s 1148430011489822 SK-9822 (1000Base-T dual link) 0
+-s 1148430011489841 SK-9841 (1000Base-LX single link) 0
+-s 1148430011489842 SK-9842 (1000Base-LX dual link) 0
+-s 1148430011489843 SK-9843 (1000Base-SX single link) 0
+-s 1148430011489844 SK-9844 (1000Base-SX dual link) 0
+-s 1148430011489861 SK-9861 (1000Base-SX VF45 single link) 0
+-s 1148430011489862 SK-9862 (1000Base-SX VF45 dual link) 0
+-d 11484400 Gigabit Ethernet 0
++d 11484300 SK-98xx Gigabit Ethernet Server Adapter 0
++s 1148430011489821 SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T) 0
++s 1148430011489822 SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link) 0
++s 1148430011489841 SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX) 0
++s 1148430011489842 SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link) 0
++s 1148430011489843 SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX) 0
++s 1148430011489844 SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link) 0
++s 1148430011489861 SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition) 0
++s 1148430011489862 SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link) 0
++s 1148430011489871 SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX) 0
++s 1148430011489872 SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link) 0
++s 1148430012592970 AT-2970SX Gigabit Ethernet Adapter 0
++s 1148430012592971 AT-2970LX Gigabit Ethernet Adapter 0
++s 1148430012592972 AT-2970TX Gigabit Ethernet Adapter 0
++s 1148430012592973 AT-2971SX Gigabit Ethernet Adapter 0
++s 1148430012592974 AT-2971T Gigabit Ethernet Adapter 0
++s 1148430012592975 AT-2970SX/2SC Gigabit Ethernet Adapter 0
++s 1148430012592976 AT-2970LX/2SC Gigabit Ethernet Adapter 0
++s 1148430012592977 AT-2970TX/2TX Gigabit Ethernet Adapter 0
++d 11484320 SK-98xx V2.0 Gigabit Ethernet Adapter 0
++s 1148432011480121 Marvell RDK-8001 Adapter 0
++s 1148432011480221 Marvell RDK-8002 Adapter 0
++s 1148432011480321 Marvell RDK-8003 Adapter 0
++s 1148432011480421 Marvell RDK-8004 Adapter 0
++s 1148432011480621 Marvell RDK-8006 Adapter 0
++s 1148432011480721 Marvell RDK-8007 Adapter 0
++s 1148432011480821 Marvell RDK-8008 Adapter 0
++s 1148432011480921 Marvell RDK-8009 Adapter 0
++s 1148432011481121 Marvell RDK-8011 Adapter 0
++s 1148432011481221 Marvell RDK-8012 Adapter 0
++s 1148432011483221 SK-9521 V2.0 10/100/1000Base-T Adapter 0
++s 1148432011485021 SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter 0
++s 1148432011485041 SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter 0
++s 1148432011485043 SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter 0
++s 1148432011485051 SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter 0
++s 1148432011485061 SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter 0
++s 1148432011485071 SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter 0
++s 1148432011489521 SK-9521 10/100/1000Base-T Adapter 0
++d 11484400 SK-9Dxx Gigabit Ethernet Adapter 0
++d 11484500 SK-9Mxx Gigabit Ethernet Adapter 0
++d 11489e00 SK-9Exx 10/100/1000Base-T Adapter 0
++s 11489e0011482100 SK-9E21 Server Adapter 0
++s 11489e00114821d0 SK-9E21D 10/100/1000Base-T Adapter 0
++s 11489e0011482200 SK-9E22 Server Adapter 0
++s 11489e0011488100 SK-9E81 Server Adapter 0
++s 11489e0011488200 SK-9E82 Server Adapter 0
++s 11489e0011489100 SK-9E91 Server Adapter 0
++s 11489e0011489200 SK-9E92 Server Adapter 0
+ v 1149 Win System Corporation 0
+ v 114a VMIC 0
+ d 114a5579 VMIPCI-5579 (Reflective Memory Card) 0
+@@ -3270,14 +4479,28 @@
+ s 114f0024114f0031 DataFire RAS BRI S/T Adapter 0
+ d 114f0026 AccelePort 4r 920 0
+ d 114f0027 AccelePort Xr 920 0
++d 114f0028 ClassicBoard 4 0
++d 114f0029 ClassicBoard 8 0
+ d 114f0034 AccelePort 2r 920 0
+ d 114f0035 DataFire DSP T1/E1/PRI cPCI 0
+ d 114f0040 AccelePort Xp 0
+-d 114f0042 AccelePort 2p PCI 0
++d 114f0042 AccelePort 2p 0
++d 114f0043 AccelePort 4p 0
++d 114f0044 AccelePort 8p 0
++d 114f0045 AccelePort 16p 0
++d 114f004e AccelePort 32p 0
+ d 114f0070 Datafire Micro V IOM2 (Europe) 0
+ d 114f0071 Datafire Micro V (Europe) 0
+ d 114f0072 Datafire Micro V IOM2 (North America) 0
+ d 114f0073 Datafire Micro V (North America) 0
++d 114f00b0 Digi Neo 4 0
++d 114f00b1 Digi Neo 8 0
++d 114f00c8 Digi Neo 2 DB9 0
++d 114f00c9 Digi Neo 2 DB9 PRI 0
++d 114f00ca Digi Neo 2 RJ45 0
++d 114f00cb Digi Neo 2 RJ45 PRI 0
++d 114f00d0 ClassicBoard 4 422 0
++d 114f00d1 ClassicBoard 8 422 0
+ d 114f6001 Avanstar 0
+ v 1150 Thinking Machines Corp 0
+ v 1151 JAE Electronics Inc. 0
+@@ -3324,6 +4547,7 @@
+ d 115d000f Cardbus Ethernet 10/100 0
+ s 115d000f10140183 10/100 EtherJet Cardbus Adapter 0
+ s 115d000f115d0183 Cardbus Ethernet 10/100 0
++d 115d00d4 Mini-PCI K56Flex Modem 0
+ d 115d0101 Cardbus 56k modem 0
+ s 115d0101115d1081 Cardbus 56k Modem 0
+ d 115d0103 Cardbus Ethernet + 56k Modem 0
+@@ -3344,23 +4568,40 @@
+ v 1165 Imagraph Corporation 0
+ d 11650001 Motion TPEG Recorder/Player with audio 0
+ v 1166 ServerWorks 0
++d 11660000 CMIC-LE 0
+ d 11660005 CNB20-LE Host Bridge 0
++d 11660006 CNB20HE Host Bridge 0
+ d 11660007 CNB20-LE Host Bridge 0
+ d 11660008 CNB20HE Host Bridge 0
+ d 11660009 CNB20LE Host Bridge 0
+ d 11660010 CIOB30 0
+ d 11660011 CMIC-HE 0
+-d 11660012 CMIC-LE 0
++d 11660012 CMIC-WS Host Bridge (GC-LE chipset) 0
+ d 11660013 CNB20-HE Host Bridge 0
+-d 11660014 CNB20-HE Host Bridge 0
++d 11660014 CMIC-LE Host Bridge (GC-LE chipset) 0
+ d 11660015 CMIC-GC Host Bridge 0
+ d 11660016 CMIC-GC Host Bridge 0
+-d 11660017 CMIC-SL 0
++d 11660017 GCNB-LE Host Bridge 0
++d 11660101 CIOB-X2 PCI-X I/O Bridge 0
++d 11660110 CIOB-E I/O Bridge with Gigabit Ethernet 0
+ d 11660200 OSB4 South Bridge 0
+ d 11660201 CSB5 South Bridge 0
++s 116602014c531080 CT8 mainboard 0
++d 11660203 CSB6 South Bridge 0
+ d 11660211 OSB4 IDE Controller 0
+ d 11660212 CSB5 IDE Controller 0
+-d 11660220 OSB4/CSB5 USB Controller 0
++s 116602124c531080 CT8 mainboard 0
++d 11660213 CSB6 RAID/IDE Controller 0
++d 11660217 CSB6 IDE Controller 0
++d 11660220 OSB4/CSB5 OHCI USB Controller 0
++s 116602204c531080 CT8 mainboard 0
++d 11660221 CSB6 OHCI USB Controller 0
++d 11660225 CSB5 LPC bridge 0
++s 116602254c531080 CT8 mainboard 0 cancelled
++d 11660227 GCLE-2 Host Bridge 0
++d 11660230 CSB5 LPC bridge 0
++s 116602304c531080 CT8 mainboard 0
++d 11660240 K2 SATA 0
+ v 1167 Mutoh Industries Inc 0
+ v 1168 Thine Electronics Inc 0
+ v 1169 Centre for Development of Advanced Computing 0
+@@ -3393,7 +4634,7 @@
+ d 11790603 ToPIC95 PCI to CardBus Bridge for Notebooks 0
+ d 1179060a ToPIC95 0
+ d 1179060f ToPIC97 0
+-d 11790617 ToPIC95 PCI to Cardbus Bridge with ZV Support 0
++d 11790617 ToPIC100 PCI to Cardbus Bridge with ZV Support 0
+ d 11790618 CPU to PCI and PCI to ISA bridge 0
+ d 11790701 FIR Port 0 Claimed to be Lucent DSP1645 [Mars], but that's apparently incorrect. Does anyone know the correct ID?
+ d 11790804 TC6371AF SmartMedia Controller 0
+@@ -3410,16 +4651,21 @@
+ d 11800465 RL5c465 0
+ d 11800466 RL5c466 0
+ d 11800475 RL5c475 0
++s 11800475144dc006 vpr Matrix 170B4 CardBus bridge 0
+ d 11800476 RL5c476 II 0
++s 1180047610140185 ThinkPad A/T/X Series 0
+ s 11800476104d80df Vaio PCG-FX403 0
+ s 11800476104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
++s 1180047614ef0220 PCD-RP-220S 0
+ d 11800477 RL5c477 0
+ d 11800478 RL5c478 0
+ s 1180047810140184 ThinkPad A30p (2653-64G) 0
+ d 11800522 R5C522 IEEE 1394 Controller 0
+ s 11800522101401cf ThinkPad A30p (2653-64G) 0
+ d 11800551 R5C551 IEEE 1394 Controller 0
++s 11800551144dc006 vpr Matrix 170B4 0
+ d 11800552 R5C552 IEEE 1394 Controller 0
++s 1180055210140511 ThinkPad A/T/X Series 0
+ v 1181 Telmatics International 0
+ v 1183 Fujikura Ltd 0
+ v 1184 Forks Inc 0
+@@ -3429,12 +4675,34 @@
+ d 11861002 DL10050 Sundance Ethernet 0
+ s 1186100211861002 DFE-550TX 0
+ s 1186100211861012 DFE-580TX 0
++d 11861025 AirPlus Xtreme G DWL-G650 Adapter 0
++d 11861026 AirXpert DWL-AG650 Wireless Cardbus Adapter 0
++d 11861043 AirXpert DWL-AG650 Wireless Cardbus Adapter 0
+ d 11861300 RTL8139 Ethernet 0
+ s 1186130011861300 DFE-538TX 10/100 Ethernet Adapter 0
+ s 1186130011861301 DFE-530TX+ 10/100 Ethernet Adapter 0
+ d 11861340 DFE-690TXD CardBus PC Card 0
++d 11861541 DFE-680TXD CardBus PC Card 0
+ d 11861561 DRP-32TXD Cardbus PC Card 0
+-d 11864000 DL2K Ethernet 0
++d 11862027 AirPlus Xtreme G DWL-G520 Adapter 0
++d 11863203 AirPlus Xtreme G DWL-G520 Adapter 0
++d 11863300 DWL-510 2.4GHz Wireless PCI Adapter 0
++d 11863a03 AirPro DWL-A650 Wireless Cardbus Adapter(rev.B) 0
++d 11863a04 AirPro DWL-AB650 Multimode Wireless Cardbus Adapter 0
++d 11863a05 AirPro DWL-AB520 Multimode Wireless PCI Adapter 0
++d 11863a07 AirXpert DWL-AG650 Wireless Cardbus Adapter 0
++d 11863a08 AirXpert DWL-AG520 Wireless PCI Adapter 0
++d 11863a10 AirXpert DWL-AG650 Wireless Cardbus Adapter(rev.B) 0
++d 11863a11 AirXpert DWL-AG520 Wireless PCI Adapter(rev.B) 0
++d 11863a12 AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C) 0
++d 11863a13 AirPlus DWL-G520 Wireless PCI Adapter(rev.B) 0
++d 11863a14 AirPremier DWL-AG530 Wireless PCI Adapter 0
++d 11863a63 AirXpert DWL-AG660 Wireless Cardbus Adapter 0
++d 11863b05 DWL-G650+ CardBus PC Card 0
++d 11864000 DL2000-based Gigabit Ethernet 0
++d 11864c00 Gigabit Ethernet Adapter 0
++s 11864c0011864c00 DGE-530T Gigabit Ethernet Adapter 0
++d 11868400 D-Link DWL-650+ CardBus PC Card 0
+ v 1187 Advanced Technology Laboratories, Inc. 0
+ v 1188 Shima Seiki Manufacturing Ltd. 0
+ v 1189 Matsushita Electronics Co Ltd 0
+@@ -3487,6 +4755,7 @@
+ v 1195 Ratoc System Inc 0
+ v 1196 Hytec Electronics Ltd 0
+ v 1197 Gage Applied Sciences, Inc. 0
++d 1197010c CompuScope 82G 8bit 2GS/s Analog Input Card 0
+ v 1198 Lambda Systems Inc 0
+ v 1199 Attachmate Corporation 0
+ v 119a Mind Share, Inc. 0
+@@ -3510,11 +4779,129 @@
+ v 11a9 InnoSys Inc. 0
+ d 11a94240 AMCC S933Q Intelligent Serial Card 0
+ v 11aa Actel 0
+-v 11ab Galileo Technology Ltd. 0
++v 11ab Marvell Technology Group Ltd. 0 Formerly Galileo Technology, Inc.
+ d 11ab0146 GT-64010/64010A System Controller 0
++d 11ab138f W8300 802.11 Adapter (rev 07) 0
++d 11ab1fa6 Marvell W8300 802.11 Adapter 0
++d 11ab4320 Gigabit Ethernet Controller 0
++s 11ab432010190f38 Marvell 88E8001 Gigabit Ethernet Controller (ECS) 0
++s 11ab432010198001 Marvell 88E8001 Gigabit Ethernet Controller (ECS) 0
++s 11ab43201043173c Marvell 88E8001 Gigabit Ethernet Controller (Asus) 0
++s 11ab43201043811a Marvell 88E8001 Gigabit Ethernet Controller (Asus) 0
++s 11ab4320105b0c19 Marvell 88E8001 Gigabit Ethernet Controller (Foxconn) 0
++s 11ab432010b8b452 SMC EZ Card 1000 (SMC9452TXV.2) 0
++s 11ab432011ab0121 Marvell RDK-8001 0
++s 11ab432011ab0321 Marvell RDK-8003 0
++s 11ab432011ab1021 Marvell RDK-8010 0
++s 11ab432011ab5021 Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Controller (64 bit) 0
++s 11ab432011ab9521 Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Controller (32 bit) 0
++s 11ab43201458e000 Marvell 88E8001 Gigabit Ethernet Controller (Gigabyte) 0
++s 11ab4320147b1406 Marvell 88E8001 Gigabit Ethernet Controller (Abit) 0
++s 11ab432015d40047 Marvell 88E8001 Gigabit Ethernet Controller (Iwill) 0
++s 11ab432016959025 Marvell 88E8001 Gigabit Ethernet Controller (Epox) 0
++s 11ab432017f21c03 Marvell 88E8001 Gigabit Ethernet Controller (Albatron) 0
++s 11ab4320270f2803 Marvell 88E8001 Gigabit Ethernet Controller (Chaintech) 0
++d 11ab4350 Fast Ethernet Controller 0
++s 11ab435011790001 Marvell 88E8035 Fast Ethernet Controller (Toshiba) 0
++s 11ab435011ab3521 Marvell RDK-8035 0
++s 11ab43501854000d Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab43501854000e Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab43501854000f Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540011 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540012 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540016 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540017 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540018 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540019 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab43501854001c Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab43501854001e Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++s 11ab435018540020 Marvell 88E8035 Fast Ethernet Controller (LGE) 0
++d 11ab4351 Fast Ethernet Controller 0
++s 11ab4351107b4009 Marvell 88E8036 Fast Ethernet Controller (Wistron) 0
++s 11ab435110f78338 Marvell 88E8036 Fast Ethernet Controller (Panasonic) 0
++s 11ab435111790001 Marvell 88E8036 Fast Ethernet Controller (Toshiba) 0
++s 11ab43511179ff00 Marvell 88E8036 Fast Ethernet Controller (Compal) 0
++s 11ab43511179ff10 Marvell 88E8036 Fast Ethernet Controller (Inventec) 0
++s 11ab435111ab3621 Marvell RDK-8036 0
++s 11ab435113d1ac12 Abocom EFE3K - 10/100 Ethernet Expresscard 0
++s 11ab4351161f203d Marvell 88E8036 Fast Ethernet Controller (Arima) 0
++s 11ab43511854000d Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab43511854000e Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab43511854000f Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540011 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540012 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540016 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540017 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540018 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540019 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab43511854001c Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab43511854001e Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++s 11ab435118540020 Marvell 88E8036 Fast Ethernet Controller (LGE) 0
++d 11ab4360 Gigabit Ethernet Controller 0
++s 11ab436010438134 Marvell 88E8052 Gigabit Ethernet Controller (Asus) 0
++s 11ab4360107b4009 Marvell 88E8052 Gigabit Ethernet Controller (Wistron) 0
++s 11ab436011ab5221 Marvell RDK-8052 0
++s 11ab43601458e000 Marvell 88E8052 Gigabit Ethernet Controller (Gigabyte) 0
++s 11ab43601462052c Marvell 88E8052 Gigabit Ethernet Controller (MSI) 0
++s 11ab436018498052 Marvell 88E8052 Gigabit Ethernet Controller (ASRock) 0
++s 11ab43601940e000 Marvell 88E8052 Gigabit Ethernet Controller (Gigabyte) 0
++s 11ab4360a0a00509 Marvell 88E8052 Gigabit Ethernet Controller (Aopen) 0
++d 11ab4361 Gigabit Ethernet Controller 0
++s 11ab4361107b3015 Marvell 88E8050 Gigabit Ethernet Controller (Gateway) 0
++s 11ab436111ab5021 Marvell 88E8050 Gigabit Ethernet Controller (Intel) 0
++s 11ab436180863063 D925XCVLK mainboard 0
++d 11ab4362 Gigabit Ethernet Controller 0
++s 11ab4362103c2a0d Marvell 88E8053 Gigabit Ethernet Controller (Asus) 0
++s 11ab436210438142 Marvell 88E8053 Gigabit Ethernet Controller (Asus) 0
++s 11ab4362109f3197 Marvell 88E8053 Gigabit Ethernet Controller (Trigem) 0
++s 11ab436210f78338 Marvell 88E8053 Gigabit Ethernet Controller (Panasonic) 0
++s 11ab436210fda430 Marvell 88E8053 Gigabit Ethernet Controller (SOYO) 0
++s 11ab436211790001 Marvell 88E8053 Gigabit Ethernet Controller (Toshiba) 0
++s 11ab43621179ff00 Marvell 88E8053 Gigabit Ethernet Controller (Compal) 0
++s 11ab43621179ff10 Marvell 88E8053 Gigabit Ethernet Controller (Inventec) 0
++s 11ab436211ab5321 Marvell RDK-8053 0
++s 11ab43621297c240 Marvell 88E8053 Gigabit Ethernet Controller (Shuttle) 0
++s 11ab43621297c241 Marvell 88E8053 Gigabit Ethernet Controller (Shuttle) 0
++s 11ab43621297c242 Marvell 88E8053 Gigabit Ethernet Controller (Shuttle) 0
++s 11ab43621297c243 Marvell 88E8053 Gigabit Ethernet Controller (Shuttle) 0
++s 11ab43621297c244 Marvell 88E8053 Gigabit Ethernet Controller (Shuttle) 0
++s 11ab436213d1ac11 Abocom EGE5K - Giga Ethernet Expresscard 0
++s 11ab43621458e000 Marvell 88E8053 Gigabit Ethernet Controller (Gigabyte) 0
++s 11ab43621462058c Marvell 88E8053 Gigabit Ethernet Controller (MSI) 0
++s 11ab436214c00012 Marvell 88E8053 Gigabit Ethernet Controller (Compal) 0
++s 11ab4362155804a0 Marvell 88E8053 Gigabit Ethernet Controller (Clevo) 0
++s 11ab436215bd1003 Marvell 88E8053 Gigabit Ethernet Controller (DFI) 0
++s 11ab4362161f203c Marvell 88E8053 Gigabit Ethernet Controller (Arima) 0
++s 11ab4362161f203d Marvell 88E8053 Gigabit Ethernet Controller (Arima) 0
++s 11ab436216959029 Marvell 88E8053 Gigabit Ethernet Controller (Epox) 0
++s 11ab436217f22c08 Marvell 88E8053 Gigabit Ethernet Controller (Albatron) 0
++s 11ab436217ff0585 Marvell 88E8053 Gigabit Ethernet Controller (Quanta) 0
++s 11ab436218498053 Marvell 88E8053 Gigabit Ethernet Controller (ASRock) 0
++s 11ab43621854000b Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621854000c Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540010 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540013 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540014 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540015 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621854001a Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621854001b Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621854001d Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621854001f Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540021 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab436218540022 Marvell 88E8053 Gigabit Ethernet Controller (LGE) 0
++s 11ab43621940e000 Marvell 88E8053 Gigabit Ethernet Controller (Gigabyte) 0
++s 11ab4362270f2801 Marvell 88E8053 Gigabit Ethernet Controller (Chaintech) 0
++s 11ab4362a0a00506 Marvell 88E8053 Gigabit Ethernet Controller (Aopen) 0
+ d 11ab4611 GT-64115 System Controller 0
+ d 11ab4620 GT-64120/64120A/64121A System Controller 0
+ d 11ab4801 GT-48001 0
++d 11ab5040 MV88SX5040 4-port SATA I PCI-X Controller 0
++d 11ab5041 MV88SX5041 4-port SATA I PCI-X Controller 0
++d 11ab5080 MV88SX5080 8-port SATA I PCI-X Controller 0
++d 11ab5081 MV88SX5081 8-port SATA I PCI-X Controller 0
++d 11ab6041 MV88SX6041 4-port SATA II PCI-X Controller 0
++d 11ab6081 MV88SX6081 8-port SATA II PCI-X Controller 0
++d 11ab6460 MV64360/64361/64362 System Controller 0
+ d 11abf003 GT-64010 Primary Image Piranha Image Generator 0
+ v 11ac Canon Information Systems Research Aust. 0
+ v 11ad Lite-On Communications Inc 0
+@@ -3528,6 +4915,7 @@
+ s 11adc11511adc001 LNE100TX [ver 2.0] 0
+ v 11ae Aztech System Ltd 0
+ v 11af Avid Technology Inc. 0
++d 11af0001 [Cinema] 0
+ v 11b0 V3 Semiconductor Inc. 0
+ d 11b00002 V300PSC 0
+ d 11b00292 V292PBC [Am29030/40 Bridge] 0
+@@ -3552,9 +4940,8 @@
+ v 11be International Microcircuits Inc 0
+ v 11bf Astrodesign, Inc. 0
+ v 11c0 Hewlett Packard 0
+-v 11c1 Lucent Microelectronics 0
++v 11c1 Agere Systems (former Lucent Microelectronics) 0
+ d 11c10440 56k WinModem 0
+-s 11c1044000010440 LT WinModem 56k Data+Fax+Voice+Dsvd 0
+ s 11c1044010338015 LT WinModem 56k Data+Fax+Voice+Dsvd 0
+ s 11c1044010338047 LT WinModem 56k Data+Fax+Voice+Dsvd 0
+ s 11c104401033804f LT WinModem 56k Data+Fax+Voice+Dsvd 0
+@@ -3596,7 +4983,6 @@
+ s 11c1044114680441 Presario 56k V.90 DF Modem 0
+ s 11c1044116680440 Lucent Win Modem 0
+ d 11c10442 56k WinModem 0
+-s 11c1044200010440 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 0
+ s 11c1044211c10440 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 0
+ s 11c1044211c10442 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 0
+ s 11c1044213e00412 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 0
+@@ -3609,6 +4995,8 @@
+ d 11c10443 LT WinModem 0
+ d 11c10444 LT WinModem 0
+ d 11c10445 LT WinModem 0
++s 11c1044580862203 PRO/100+ MiniPCI (probably an Ambit U98.003.C.00 combo card) 0
++s 11c1044580862204 PRO/100+ MiniPCI on Armada E500 0
+ d 11c10446 LT WinModem 0
+ d 11c10447 LT WinModem 0
+ d 11c10448 WinModem 56k 0
+@@ -3637,7 +5025,8 @@
+ d 11c1044e LT WinModem 0
+ d 11c1044f V90 WildWire Modem 0
+ d 11c10450 LT WinModem 0
+-s 11c10450144f4005 Toshiba Magnia SG20 1
++s 11c10450103380a8 Versa Note Vxi 0
++s 11c10450144f4005 Magnia SG20 0
+ d 11c10451 LT WinModem 0
+ d 11c10452 LT WinModem 0
+ d 11c10453 LT WinModem 0
+@@ -3648,16 +5037,30 @@
+ d 11c10458 LT WinModem 0
+ d 11c10459 LT WinModem 0
+ d 11c1045a LT WinModem 0
+-d 11c1045c LT WinModem 1
++d 11c1045c LT WinModem 0
+ d 11c10461 V90 WildWire Modem 0
+ d 11c10462 V90 WildWire Modem 0
+ d 11c10480 Venus Modem (V90, 56KFlex) 0
++d 11c1048c V.92 56K WinModem 0
++d 11c1048f V.92 56k WinModem 0 InPorte Home Internal 56k Modem/fax/answering machine/SMS Features
+ d 11c15801 USB 0
+ d 11c15802 USS-312 USB Controller 0
++d 11c15803 USS-344S USB Controller 0 4 port PCI USB Controller made by Agere (formely Lucent)
+ d 11c15811 FW323 0
++s 11c158118086524c D865PERL mainboard 0
+ s 11c15811dead0800 FireWire Host Bus Adapter 0
++d 11c1ab10 WL60010 Wireless LAN MAC 0
++d 11c1ab11 WL60040 Multimode Wireles LAN MAC 0
++s 11c1ab1111c1ab12 WaveLAN 11abg Cardbus card (Model 1102) 0
++s 11c1ab1111c1ab13 WaveLAN 11abg MiniPCI card (Model 0512) 0
++s 11c1ab1111c1ab15 WaveLAN 11abg Cardbus card (Model 1106) 0
++s 11c1ab1111c1ab16 WaveLAN 11abg MiniPCI card (Model 0516) 0
++d 11c1ab20 ORiNOCO PCI Adapter 0
++d 11c1ab21 Agere Wireless PCI Adapter 0
++d 11c1ab30 Hermes2 Mini-PCI WaveLAN a/b/g 0
++s 11c1ab3014cd2012 Hermes2 Mini-PCI WaveLAN a/b/g 0
+ v 11c2 Sand Microelectronics 0
+-v 11c3 NEC Corp 0
++v 11c3 NEC Corporation 0
+ v 11c4 Document Technologies, Inc 0
+ v 11c5 Shiva Corporation 0
+ v 11c6 Dainippon Screen Mfg. Co. Ltd 0
+@@ -3686,6 +5089,7 @@
+ v 11d2 Intercom Inc. 0
+ v 11d3 Trancell Systems Inc 0
+ v 11d4 Analog Devices 0
++d 11d41535 Blackfin BF535 processor 0
+ d 11d41805 SM56 PCI modem 0
+ d 11d41889 AD1889 sound chip 0
+ v 11d5 Ikon Corporation 0
+@@ -3746,7 +5150,7 @@
+ s 11f6201111f62011 RL100-ATX 0
+ d 11f62201 ReadyLink 100TX (Winbond W89C840) 0
+ s 11f6220111f62011 ReadyLink 100TX 0
+-d 11f69881 RL100TX 0
++d 11f69881 RL100TX Fast Ethernet 0
+ v 11f7 Scientific Atlanta 0
+ v 11f8 PMC-Sierra Inc. 0
+ d 11f87375 PM7375 [LASAR-155 ATM SAR] 0
+@@ -3756,23 +5160,39 @@
+ v 11fc Silicon Magic 0
+ v 11fd High Street Consultants 0
+ v 11fe Comtrol Corporation 0
+-d 11fe0001 RocketPort 8 Oct 0
+-d 11fe0002 RocketPort 8 Intf 0
+-d 11fe0003 RocketPort 16 Intf 0
+-d 11fe0004 RocketPort 32 Intf 0
+-d 11fe0005 RocketPort Octacable 0
+-d 11fe0006 RocketPort 8J 0
+-d 11fe0007 RocketPort 4-port 0
+-d 11fe0008 RocketPort 8-port 0
+-d 11fe0009 RocketPort 16-port 0
+-d 11fe000a RocketPort Plus Quadcable 0
+-d 11fe000b RocketPort Plus Octacable 0
+-d 11fe000c RocketPort 8-port Modem 0
++d 11fe0001 RocketPort 32 port w/external I/F 0
++d 11fe0002 RocketPort 8 port w/external I/F 0
++d 11fe0003 RocketPort 16 port w/external I/F 0
++d 11fe0004 RocketPort 4 port w/quad cable 0
++d 11fe0005 RocketPort 8 port w/octa cable 0
++d 11fe0006 RocketPort 8 port w/RJ11 connectors 0
++d 11fe0007 RocketPort 4 port w/RJ11 connectors 0
++d 11fe0008 RocketPort 8 port w/ DB78 SNI (Siemens) connector 0
++d 11fe0009 RocketPort 16 port w/ DB78 SNI (Siemens) connector 0
++d 11fe000a RocketPort Plus 4 port 0
++d 11fe000b RocketPort Plus 8 port 0
++d 11fe000c RocketModem 6 port 0
++d 11fe000d RocketModem 4-port 0
++d 11fe000e RocketPort Plus 2 port RS232 0
++d 11fe000f RocketPort Plus 2 port RS422 0
++d 11fe0801 RocketPort UPCI 32 port w/external I/F 0
++d 11fe0802 RocketPort UPCI 8 port w/external I/F 0
++d 11fe0803 RocketPort UPCI 16 port w/external I/F 0
++d 11fe0805 RocketPort UPCI 8 port w/octa cable 0
++d 11fe080c RocketModem III 8 port 0
++d 11fe080d RocketModem III 4 port 0
++d 11fe0903 RocketPort Compact PCI 16 port w/external I/F 0
+ d 11fe8015 RocketPort 4-port UART 16954 0
+ v 11ff Scion Corporation 0
++d 11ff0003 AG-5 0
+ v 1200 CSS Corporation 0
+ v 1201 Vista Controls Corp 0
+ v 1202 Network General Corp. 0
++d 12024300 Gigabit Ethernet Adapter 0
++s 1202430012029841 SK-9841 LX 0
++s 1202430012029842 SK-9841 LX dual link 0
++s 1202430012029843 SK-9843 SX 0
++s 1202430012029844 SK-9843 SX dual link 0
+ v 1203 Bayer Corporation, Agfa Division 0
+ v 1204 Lattice Semiconductor Corporation 0
+ v 1205 Array Corporation 0
+@@ -3819,7 +5239,18 @@
+ d 12176933 OZ6933 Cardbus Controller 0
+ s 1217693310251016 Travelmate 612 TX 0
+ d 12176972 OZ6912 Cardbus Controller 0
+-s 1217697234127856 Toshiba Magnia SG20 1
++s 121769721014020c ThinkPad R30 0
++s 1217697211790001 Magnia Z310 0
++d 12177110 OZ711Mx MultiMediaBay Accelerator 0
++s 12177110103c0890 NC6000 laptop 0
++d 12177112 OZ711EC1/M1 SmartCardBus MultiMediaBay Controller 0
++d 12177113 OZ711EC1 SmartCardBus Controller 0
++d 12177114 OZ711M1 SmartCardBus MultiMediaBay Controller 0
++d 121771e2 OZ711E2 SmartCardBus Controller 0
++d 12177212 OZ711M2 SmartCardBus MultiMediaBay Controller 0
++d 12177213 OZ6933E CardBus Controller 0
++d 12177223 OZ711M3 SmartCardBus MultiMediaBay Controller 0
++s 12177223103c0890 NC6000 laptop 0
+ v 1218 Hybricon Corp. 0
+ v 1219 First Virtual Corporation 0
+ v 121a 3Dfx Interactive, Inc. 0
+@@ -3841,14 +5272,13 @@
+ s 121a0003139c0016 Raven 0
+ s 121a0003139c0017 Raven 0
+ s 121a000314af0002 Maxi Gamer Phoenix 0
+-s 121a000330303030 Skywell Magic TwinPower 0
+ d 121a0004 Voodoo Banshee [Velocity 100] 0
+ d 121a0005 Voodoo 3 0
+ s 121a0005121a0004 Voodoo3 AGP 0
+ s 121a0005121a0030 Voodoo3 AGP 0
+ s 121a0005121a0031 Voodoo3 AGP 0
+ s 121a0005121a0034 Voodoo3 AGP 0
+-s 121a0005121a0036 Voodoo3 0
++s 121a0005121a0036 Voodoo3 2000 PCI 0
+ s 121a0005121a0037 Voodoo3 AGP 0
+ s 121a0005121a0038 Voodoo3 AGP 0
+ s 121a0005121a003a Voodoo3 AGP 0
+@@ -3863,6 +5293,7 @@
+ s 121a0005121a0061 Voodoo3 3500 TV (PAL) 0
+ s 121a0005121a0062 Voodoo3 3500 TV (SECAM) 0
+ d 121a0009 Voodoo 4 / Voodoo 5 0
++s 121a0009121a0003 Voodoo5 PCI 5500 0
+ s 121a0009121a0009 Voodoo5 AGP 5500/6000 0
+ d 121a0057 Voodoo 3/3000 [Avenger] 0
+ v 121b Advanced Telecommunications Modules 0
+@@ -3888,6 +5319,7 @@
+ v 1224 Interactive Images 0
+ v 1225 Power I/O, Inc. 0
+ v 1227 Tech-Source 0
++d 12270006 Raptor GFX 8P 0
+ v 1228 Norsk Elektro Optikk A/S 0
+ v 1229 Data Kinesis Inc. 0
+ v 122a Integrated Telecom 0
+@@ -3895,6 +5327,7 @@
+ v 122c Sican GmbH 0
+ v 122d Aztech System Ltd 0
+ d 122d1206 368DSP 0
++d 122d1400 Trident PCI288-Q3DII (NX) 0
+ d 122d50dc 3328 Audio 0
+ s 122d50dc122d0001 3328 Audio 0
+ d 122d80da 3328 Audio 0
+@@ -3933,6 +5366,9 @@
+ v 1240 Marathon Technologies Corp. 0
+ v 1241 DSC Communications 0
+ v 1242 JNI Corporation 0 Formerly Jaycor Networks, Inc.
++d 12421560 JNIC-1560 PCI-X Fibre Channel Controller 0
++s 1242156012426562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter 0
++s 124215601242656a FCX-6562 PCI-X Fibre Channel Adapter 0
+ d 12424643 FCI-1063 Fibre Channel Adapter 0
+ d 12426562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter 0
+ d 1242656a FCX-6562 PCI-X Fibre Channel Adapter 0
+@@ -3945,6 +5381,8 @@
+ d 12440e00 Fritz!PCI v2.0 ISDN 0
+ d 12441100 C2 ISDN 0
+ d 12441200 T1 ISDN 0
++d 12442700 Fritz!Card DSL SL 0
++d 12442900 Fritz!Card DSL v2.0 0
+ v 1245 A.P.D., S.A. 0
+ v 1246 Dipix Technologies, Inc. 0
+ v 1247 Xylon Research, Inc. 0
+@@ -3952,7 +5390,7 @@
+ v 1249 Samsung Electronics Co., Ltd. 0
+ v 124a AEG Electrocom GmbH 0
+ v 124b SBS/Greenspring Modular I/O 0
+-d 124b0040 PCI-40A Quad IndustryPack Carrier or cPCI-200 Four Slot IndustryPack carrier 0
++d 124b0040 PCI-40A or cPCI-200 Quad IndustryPack carrier 0
+ s 124b0040124b9080 PCI9080 Bridge 0
+ v 124c Solitron Technologies, Inc. 0
+ v 124d Stallion Technologies, Inc. 0
+@@ -3981,10 +5419,13 @@
+ v 1258 Gilbarco, Inc. 0
+ v 1259 Allied Telesyn International 0
+ d 12592560 AT-2560 Fast Ethernet Adapter (i82557B) 0
++d 1259a117 RTL81xx Fast Ethernet 0
++d 1259a120 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ v 125a ABB Power Systems 0
+ v 125b Asix Electronics Corporation 0
+-d 125b1400 ALFA GFC2204 0
++d 125b1400 ALFA GFC2204 Fast Ethernet 0
+ v 125c Aurora Technologies, Inc. 0
++d 125c0101 Saturn 4520P 0
+ d 125c0640 Aries 16000P 0
+ v 125d ESS Technology 0
+ d 125d0000 ES336H Fax Modem (Early Model) 0
+@@ -3995,8 +5436,8 @@
+ d 125d1969 ES1969 Solo-1 Audiodrive 0
+ s 125d196910140166 ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard 0
+ s 125d1969125d8888 Solo-1 Audio Adapter 0
+-s 125d1969525fc888 ES1969 SOLO-1 AudioDrive (+ES1938) 0
+ d 125d1978 ES1978 Maestro 2E 0
++s 125d19780e11b112 Armada M700/E500 0
+ s 125d19781033803c ES1978 Maestro-2E Audiodrive 0
+ s 125d197810338058 ES1978 Maestro-2E Audiodrive 0
+ s 125d197810924000 Monster Sound MX400 0
+@@ -4007,6 +5448,7 @@
+ d 125d1989 ESS Modem 0
+ s 125d1989125d1989 ESS Modem 0
+ d 125d1998 ES1983S Maestro-3i PCI Audio Accelerator 0
++s 125d1998102800b1 Latitude C600 0
+ s 125d1998102800e6 ES1983S Maestro-3i (Dell Inspiron 8100) 0
+ d 125d1999 ES1983S Maestro-3i PCI Modem Accelerator 0
+ d 125d199a ES1983S Maestro-3i PCI Audio Accelerator 0
+@@ -4025,11 +5467,30 @@
+ s 125d289814fe0429 ES56-PI Data Fax Modem 0
+ v 125e Specialvideo Engineering SRL 0
+ v 125f Concurrent Technologies, Inc. 0
+-v 1260 Harris Semiconductor 0
++v 1260 Intersil Corporation 0
++d 12603872 Prism 2.5 Wavelan chipset 0
++s 1260387214680202 LAN-Express IEEE 802.11b Wireless LAN 0
+ d 12603873 Prism 2.5 Wavelan chipset 0
+ s 1260387311863501 DWL-520 Wireless PCI Adapter 0
+-s 1260387317373874 WMP11 Wireless 802.11b PCI Adaptor 0
+-s 1260387380862513 Wireless 802.11b MiniPCI Adapter 1
++s 1260387311863700 DWL-520 Wireless PCI Adapter, Rev E1 0
++s 1260387313854105 MA311 802.11b wireless adapter 0
++s 1260387316680414 HWP01170-01 802.11b PCI Wireless Adapter 0
++s 1260387316a51601 AIR.mate PC-400 PCI Wireless LAN Adapter 0
++s 1260387317373874 WMP11 Wireless 802.11b PCI Adapter 0
++s 1260387380862513 Wireless 802.11b MiniPCI Adapter 0
++d 12603886 ISL3886 [Prism Javelin/Prism Xbow] 0
++s 1260388617cf0037 Z-Com XG-901 and clones Wireless Adapter 0
++d 12603890 Intersil ISL3890 [Prism GT/Prism Duette] 0
++s 1260389010b82802 SMC2802W Wireless PCI Adapter 0
++s 1260389010b82835 SMC2835W Wireless Cardbus Adapter 0
++s 1260389010b8a835 SMC2835W V2 Wireless Cardbus Adapter 0
++s 126038901113ee03 SMC2802W V2 Wireless PCI Adapter 0
++s 1260389011863202 DWL-G650 A1 Wireless Adapter 0
++s 126038901259c104 CG-WLCB54GT Wireless Adapter 0
++s 1260389013854800 WG511 Wireless Adapter 0
++s 1260389016a51605 ALLNET ALL0271 Wireless PCI Adapter 0
++s 1260389017cf0014 Z-Com XG-600 and clones Wireless Adapter 0
++s 1260389017cf0020 Z-Com XG-900 and clones Wireless Adapter 0
+ d 12608130 HMP8130 NTSC/PAL Video Decoder 0
+ d 12608131 HMP8131 NTSC/PAL Video Decoder 0
+ v 1261 Matsushita-Kotobuki Electronics Industries, Ltd. 0
+@@ -4049,12 +5510,16 @@
+ v 126a Lexmark International, Inc. 0
+ v 126b Adax, Inc. 0
+ v 126c Northern Telecom 0
++d 126c1211 10/100BaseTX [RTL81xx] 0
++d 126c126c 802.11b Wireless Ethernet Adapter 0
+ v 126d Splash Technology, Inc. 0
+ v 126e Sumitomo Metal Industries, Ltd. 0
+ v 126f Silicon Motion, Inc. 0
++d 126f0501 SM501 VoyagerGX 0
+ d 126f0710 SM710 LynxEM 0
+ d 126f0712 SM712 LynxEM+ 0
+ d 126f0720 SM720 Lynx3DM 0
++d 126f0730 SM731 Cougar3DR 0
+ d 126f0810 SM810 LynxE 0
+ d 126f0811 SM811 LynxE 0
+ d 126f0820 SM820 Lynx3D 0
+@@ -4065,6 +5530,7 @@
+ v 1273 Hughes Network Systems 0
+ d 12730002 DirecPC 0
+ v 1274 Ensoniq 0
++d 12741171 ES1373 [AudioPCI] (also Creative Labs CT5803) 0
+ d 12741371 ES1371 [AudioPCI-97] 0
+ s 127413710e110024 AudioPCI on Motherboard Compaq Deskpro 0
+ s 127413710e11b1a7 ES1371, ES1373 AudioPCI 0
+@@ -4120,11 +5586,11 @@
+ s 1274137180865643 ES1371, ES1373 AudioPCI On Motherboard Vancouver 0
+ s 1274137180865753 ES1371, ES1373 AudioPCI On Motherboard WS440BX 0
+ d 12745000 ES1370 [AudioPCI] 0
+-s 1274500049424c4c Creative Sound Blaster AudioPCI128 0
+ d 12745880 5880 AudioPCI 0
+ s 1274588012742000 Creative Sound Blaster AudioPCI128 0
+ s 1274588012742003 Creative SoundBlaster AudioPCI 128 0
+ s 1274588012745880 Creative Sound Blaster AudioPCI128 0
++s 1274588012748001 Sound Blaster 16PCI 4.1ch 0
+ s 127458801458a000 5880 AudioPCI On Motherboard 6OXET 0
+ s 1274588014626880 5880 AudioPCI On Motherboard MS-6188 1.00 0
+ s 12745880270f2001 5880 AudioPCI On Motherboard 6CTR 0
+@@ -4135,6 +5601,7 @@
+ v 1277 Comstream 0
+ v 1278 Transtech Parallel Systems Ltd. 0
+ d 12780701 TPE3/TM3 PowerPC Node 0
++d 12780710 TPE5 PowerPC PCI board 0
+ v 1279 Transmeta Corporation 0
+ d 12790295 Northbridge 0
+ d 12790395 LongRun Northbridge 0
+@@ -4263,12 +5730,15 @@
+ v 1281 Yokogawa Electric Corporation 0
+ v 1282 Davicom Semiconductor, Inc. 0
+ d 12829009 Ethernet 100/10 MBit 0
+-d 12829100 Ethernet 100/10 MBit 0
+-d 12829102 Ethernet 100/10 MBit 0
++d 12829100 21x4x DEC-Tulip compatible 10/100 Ethernet 0
++d 12829102 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ d 12829132 Ethernet 100/10 MBit 0
+ v 1283 Integrated Technology Express, Inc. 0
+ d 1283673a IT8330G 0
++d 12838212 IT/ITE8212 Dual channel ATA RAID controller (PCI version seems to be IT8212, embedded seems to be ITE8212) 0
++s 1283821212830001 IT/ITE8212 Dual channel ATA RAID controller 0
+ d 12838330 IT8330G 0
++d 12838872 IT8874F PCI Dual Serial Port Controller 0
+ d 12838888 IT8888F PCI to ISA Bridge with SMB 0
+ d 12838889 IT8889F PCI to ISA Bridge 0
+ d 1283e886 IT8330G 0
+@@ -4314,6 +5784,7 @@
+ v 12a1 Simpact Associates, Inc. 0
+ v 12a2 Newgen Systems Corporation 0
+ v 12a3 Lucent Technologies 0
++d 12a38105 T8105 H100 Digital Switch 0
+ v 12a4 NTT Electronics Technology Company 0
+ v 12a5 Vision Dynamics Ltd. 0
+ v 12a6 Scalable Networks, Inc. 0
+@@ -4322,15 +5793,19 @@
+ v 12a9 Xiotech Corporation 0
+ v 12aa SDL Communications, Inc. 0
+ v 12ab Yuan Yuan Enterprise Co., Ltd. 0
++d 12ab0002 AU8830 [Vortex2] Based Sound Card With A3D Support 0
+ d 12ab3000 MPG-200C PCI DVD Decoder Card 0
+ v 12ac Measurex Corporation 0
+ v 12ad Multidata GmbH 0
+ v 12ae Alteon Networks Inc. 0
+ d 12ae0001 AceNIC Gigabit Ethernet 0
++s 12ae000110140104 Gigabit Ethernet-SX PCI Adapter 0
+ s 12ae000112ae0001 Gigabit Ethernet-SX (Universal) 0
+ s 12ae000114100104 Gigabit Ethernet-SX PCI Adapter 0
+ d 12ae0002 AceNIC Gigabit Ethernet (Copper) 0
++s 12ae000210a98002 Acenic Gigabit Ethernet 0
+ s 12ae000212ae0002 Gigabit Ethernet-T (3C986-T) 0
++d 12ae00fa Farallon PN9100-T Gigabit Ethernet 0
+ v 12af TDK USA Corp 0
+ v 12b0 Jorge Scientific Corp 0
+ v 12b1 GammaLink 0
+@@ -4341,7 +5816,7 @@
+ v 12b6 Natural Microsystems 0
+ v 12b7 Cognex Modular Vision Systems Div. - Acumen Inc. 0
+ v 12b8 Korg 0
+-v 12b9 US Robotics/3Com 0
++v 12b9 3Com Corp, Modem Division (formerly US Robotics) 0
+ d 12b91006 WinModem 0
+ s 12b9100612b9005c USR 56k Internal Voice WinModem (Model 3472) 0
+ s 12b9100612b9005e USR 56k Internal WinModem (Models 662975) 0
+@@ -4424,16 +5899,21 @@
+ d 12d200a0 ITNT2 0
+ v 12d3 Vingmed Sound A/S 0
+ v 12d4 Ulticom (Formerly DGM&S) 0
+-v 12d5 Equator Technologies 0
++d 12d40200 T1 Card 0
++v 12d5 Equator Technologies Inc 0
+ v 12d6 Analogic Corp 0
+ v 12d7 Biotronic SRL 0
+ v 12d8 Pericom Semiconductor 0
+ v 12d9 Aculab PLC 0
++d 12d90002 PCI Prosody 0
++d 12d90004 cPCI Prosody 0
++d 12d90005 Aculab E1/T1 PCI card 0
+ v 12da True Time Inc. 0
+ v 12db Annapolis Micro Systems, Inc 0
+ v 12dc Symicron Computer Communication Ltd. 0
+ v 12dd Management Graphics 0
+ v 12de Rainbow Technologies 0
++d 12de0200 CryptoSwift CS200 0
+ v 12df SBS Technologies Inc 0
+ v 12e0 Chase Research 0
+ d 12e00010 ST16C654 Quad UART 0
+@@ -4510,7 +5990,7 @@
+ v 1304 Juniper Networks 0
+ v 1305 Netphone, Inc 0
+ v 1306 Duet Technologies 0
+-v 1307 Computer Boards 0
++v 1307 Measurement Computing 0 Formerly ComputerBoards
+ d 13070001 PCI-DAS1602/16 0
+ d 1307000b PCI-DIO48H 0
+ d 1307000c PCI-PDISO8 0
+@@ -4546,6 +6026,9 @@
+ d 13070036 PCI-DAS64/M2/16 0
+ d 13070037 PCI-DAS64/M3/16 0
+ d 1307004c PCI-DAS1000 0
++d 1307004d PCI-QUAD04 0
++d 13070052 PCI-DAS4020/12 0
++d 1307005e PCI-DAS6025 0
+ v 1308 Jato Technologies Inc. 0
+ d 13080001 NetCelerator Adapter 0
+ s 1308000113080001 NetCelerator Adapter 0
+@@ -4562,11 +6045,17 @@
+ v 1313 Yaskawa Electric Co. 0
+ v 1316 Teradyne Inc 0
+ v 1317 Linksys 0
+-d 13170981 Fast Ethernet 10/100 0
+-d 13170985 Network Everywhere Fast Ethernet 10/100 model NC100 0
+-d 13171985 Fast Ethernet 10/100 0
++d 13170981 21x4x DEC-Tulip compatible 10/100 Ethernet 0
++d 13170985 NC100 Network Everywhere Fast Ethernet 10/100 0
++d 13171985 21x4x DEC-Tulip compatible 10/100 Ethernet 0
++d 13172850 HSP MicroModem 56 0
++d 13178201 ADMtek ADM8211 802.11b Wireless Interface 0
++s 1317820110b82635 SMC2635W 802.11b (11Mbps) wireless lan pcmcia (cardbus) card 0
++s 1317820113178201 SMC2635W 802.11b (11mbps) wireless lan pcmcia (cardbus) card 0
++d 13178211 ADMtek ADM8211 802.11b Wireless Interface 0
++d 13179511 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ v 1318 Packet Engines Inc. 0
+-d 13180911 PCI Ethernet Adapter 0
++d 13180911 GNIC-II PCI Gigabit Ethernet [Hamachi] 0
+ v 1319 Fortemedia, Inc 0
+ d 13190801 Xwave QS3000A [FM801] 0
+ d 13190802 Xwave QS3000A [FM801 game port] 0
+@@ -4615,6 +6104,7 @@
+ d 131f2060 Trio 2S(16550)+1P 0
+ d 131f2061 Trio 2S(16650)+1P 0
+ d 131f2062 Trio 2S(16850)+1P 0
++d 131f2081 CyberSerial (8-port) ST16654 0
+ v 1320 Crypto AG 0
+ v 1321 Arcobel Graphics BV 0
+ v 1322 MTT Co., Ltd 0
+@@ -4631,8 +6121,14 @@
+ v 132d Integrated Silicon Solution, Inc. 0
+ v 1330 MMC Networks 0
+ v 1331 Radisys Corp. 0
++d 13310030 ENP-2611 0
++d 13318200 82600 Host Bridge 0
++d 13318201 82600 IDE 0
++d 13318202 82600 USB 0
++d 13318210 82600 PCI Bridge 0
+ v 1332 Micro Memory 0
+ d 13325415 MM-5415CN PCI Memory Module with Battery Backup 0
++d 13325425 MM-5425CN PCI 64/66 Memory Module with Battery Backup 0
+ v 1334 Redcreek Communications, Inc 0
+ v 1335 Videomail, Inc 0
+ v 1337 Third Planet Publishing 0
+@@ -4657,7 +6153,10 @@
+ v 134b ARK Research Corp. 0
+ v 134c Chori Joho System Co. Ltd 0
+ v 134d PCTel Inc 0
++d 134d2189 HSP56 MicroModem 0
++d 134d2486 2304WT V.92 MDC Modem 0
+ d 134d7890 HSP MicroModem 56 0
++s 134d7890134d0001 PCT789 adapter 0
+ d 134d7891 HSP MicroModem 56 0
+ s 134d7891134d0001 HSP MicroModem 56 0
+ d 134d7892 HSP MicroModem 56 0
+@@ -4682,21 +6181,22 @@
+ v 135a Brain Boxes 0
+ v 135b Giganet Inc 0
+ v 135c Quatech Inc 0
+-d 135c0010 QSC-100 1
+-d 135c0020 DSC-100 1
+-d 135c0030 DSC-200/300 1
+-d 135c0040 QSC-200/300 1
+-d 135c0050 ESC-100D 1
+-d 135c0060 ESC-100M 1
++d 135c0010 QSC-100 0
++d 135c0020 DSC-100 0
++d 135c0030 DSC-200/300 0
++d 135c0040 QSC-200/300 0
++d 135c0050 ESC-100D 0
++d 135c0060 ESC-100M 0
+ d 135c00f0 MPAC-100 Syncronous Serial Card (Zilog 85230) 0
+-d 135c0170 QSCLP-100 1
+-d 135c0180 DSCLP-100 1
+-d 135c0190 SSCLP-100 1
+-d 135c01a0 QSCLP-200/300 1
+-d 135c01b0 DSCLP-200/300 1
+-d 135c01c0 SSCLP-200/300 1
++d 135c0170 QSCLP-100 0
++d 135c0180 DSCLP-100 0
++d 135c0190 SSCLP-100 0
++d 135c01a0 QSCLP-200/300 0
++d 135c01b0 DSCLP-200/300 0
++d 135c01c0 SSCLP-200/300 0
+ v 135d ABB Network Partner AB 0
+ v 135e Sealevel Systems Inc 0
++d 135e5101 Route 56.PCI - Multi-Protocol Serial Interface (Zilog Z16C32) 0
+ d 135e7101 Single Port RS-232/422/485/530 0
+ d 135e7201 Dual Port RS-232/422/485 Interface 0
+ d 135e7202 Dual Port RS-232 Interface 0
+@@ -4706,6 +6206,13 @@
+ d 135e8001 8001 Digital I/O Adapter 0
+ v 135f I-Data International A-S 0
+ v 1360 Meinberg Funkuhren 0
++d 13600101 PCI32 DCF77 Radio Clock 0
++d 13600102 PCI509 DCF77 Radio Clock 0
++d 13600103 PCI510 DCF77 Radio Clock 0
++d 13600201 GPS167PCI GPS Receiver 0
++d 13600202 GPS168PCI GPS Receiver 0
++d 13600203 GPS169PCI GPS Receiver 0
++d 13600301 TCR510PCI IRIG Receiver 0
+ v 1361 Soliton Systems K.K. 0
+ v 1362 Fujifacom Corporation 0
+ v 1363 Phoenix Technology Ltd 0
+@@ -4717,11 +6224,14 @@
+ v 1369 Digigram 0
+ v 136a High Soft Tech 0
+ v 136b Kawasaki Steel Corporation 0
++d 136bff01 KL5A72002 Motion JPEG 0
+ v 136c Adtek System Science Co Ltd 0
+ v 136d Gigalabs Inc 0
+ v 136f Applied Magic Inc 0
+ v 1370 ATL Products 0
+ v 1371 CNet Technology Inc 0
++d 1371434e GigaCard Network Adapter 0
++s 1371434e1371434e N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L) 0
+ v 1373 Silicon Vision Inc 0
+ v 1374 Silicom Ltd 0
+ v 1375 Argosystems Inc 0
+@@ -4730,6 +6240,7 @@
+ v 1378 Telemann Co. Ltd 0
+ v 1379 Asahi Kasei Microsystems Co Ltd 0
+ v 137a Mark of the Unicorn Inc 0
++d 137a0001 PCI-324 Audiowire Interface 0
+ v 137b PPT Vision 0
+ v 137c Iwatsu Electric Co Ltd 0
+ v 137d Dynachip Corporation 0
+@@ -4738,14 +6249,24 @@
+ v 1380 Sanritz Automation Co Ltd 0
+ v 1381 Brains Co. Ltd 0
+ v 1382 Marian - Electronic & Software 0
++d 13820001 ARC88 audio recording card 0
++d 13822088 Marc-8 MIDI 8 channel audio card 0
+ v 1383 Controlnet Inc 0
+ v 1384 Reality Simulation Systems Inc 0
+ v 1385 Netgear 0
++d 13850013 WG311T 0 Note: This lists as Atheros Communications, Inc. AR5212 802.11abg NIC because of Madwifi
+ d 13854100 802.11b Wireless Adapter (MA301) 0
+-d 1385620a GA620 0
++d 13854105 MA311 802.11b wireless adapter 0
++d 13854400 WAG511 802.11a/b/g Dual Band Wireless PC Card 0
++d 13854600 WAG511 802.11a/b/g Dual Band Wireless PC Card 0
++d 13854601 WAG511 802.11a/b/g Dual Band Wireless PC Card 0
++d 13854610 WAG511 802.11a/b/g Dual Band Wireless PC Card 0
++d 13854a00 WAG311 802.11a/g Wireless PCI Adapter 0
++d 13854c00 WG311v2 54 Mbps Wireless PCI Adapter 0
++d 1385620a GA620 Gigabit Ethernet 0
+ d 1385622a GA622 0
+-d 1385630a GA630 0
+-d 1385f311 FA311 0
++d 1385630a GA630 Gigabit Ethernet 0
++d 1385f004 FA310TX 0
+ v 1386 Video Domain Technologies 0
+ v 1387 Systran Corp 0
+ v 1388 Hitachi Information Technology Co Ltd 0
+@@ -4762,6 +6283,7 @@
+ v 1392 Medialight Inc 0
+ v 1393 Moxa Technologies Co Ltd 0
+ d 13931040 Smartio C104H/PCI 0
++d 13931141 Industrio CP-114 0
+ d 13931680 Smartio C168H/PCI 0
+ d 13932040 Intellio CP-204J 0
+ d 13932180 Intellio C218 Turbo PCI 0
+@@ -4794,11 +6316,16 @@
+ d 13a30006 6500 Public Key Processor 0
+ d 13a30007 7811 Security Processor 0
+ d 13a30012 7951 Security Processor 0
++d 13a30014 78XX Security Processor 0
++d 13a30016 8065 Security Processor 0
++d 13a30017 8165 Security Processor 0
++d 13a30018 8154 Security Processor 0
+ v 13a4 Rascom Inc 0
+ v 13a5 Audio Digital Imaging Inc 0
+ v 13a6 Videonics Inc 0
+ v 13a7 Teles AG 0
+ v 13a8 Exar Corp. 0
++d 13a80154 XR17C154 Quad UART 0
+ d 13a80158 XR17C158 Octal UART 0
+ v 13a9 Siemens Medical Systems, Ultrasound Group 0
+ v 13aa Broadband Networks Inc 0
+@@ -4824,16 +6351,23 @@
+ v 13be Miroku Jyoho Service Co. Ltd 0
+ v 13bf Sharewave Inc 0
+ v 13c0 Microgate Corporation 0
+-d 13c00010 SyncLink WAN Adapter 0
++d 13c00010 SyncLink Adapter v1 0
++d 13c00020 SyncLink SCC Adapter 0
++d 13c00030 SyncLink Multiport Adapter 0
++d 13c00210 SyncLink Adapter v2 0
+ v 13c1 3ware Inc 0
+-d 13c11000 3ware ATA-RAID 0
+-d 13c11001 3ware 7000-series ATA-RAID 0
+-d 13c11002 3ware ATA-RAID 0
++d 13c11000 3ware Inc 3ware 5xxx/6xxx-series PATA-RAID 0
++d 13c11001 3ware Inc 3ware 7xxx/8xxx-series PATA/SATA-RAID 0
++s 13c1100113c11001 3ware Inc 3ware 7xxx/8xxx-series PATA/SATA-RAID 0
++d 13c11002 3ware Inc 3ware 9xxx-series SATA-RAID 0
+ v 13c2 Technotrend Systemtechnik GmbH 0
+ v 13c3 Janz Computer AG 0
+ v 13c4 Phase Metrics 0
+ v 13c5 Alphi Technology Corp 0
+ v 13c6 Condor Engineering Inc 0
++d 13c60520 CEI-520 A429 Card 0
++d 13c60620 CEI-620 A429 Card 0
++d 13c60820 CEI-820 A429 Card 0
+ v 13c7 Blue Chip Technology Ltd 0
+ v 13c8 Apptech Inc 0
+ v 13c9 Eaton Corporation 0
+@@ -4844,9 +6378,13 @@
+ v 13ce Cocom A/S 0
+ v 13cf Studio Audio & Video Ltd 0
+ v 13d0 Techsan Electronics Co Ltd 0
++d 13d02103 B2C2 FlexCopII DVB chip / Technisat SkyStar2 DVB card 0
++d 13d02200 B2C2 FlexCopIII DVB chip / Technisat SkyStar2 DVB card 0
+ v 13d1 Abocom Systems Inc 0
+-d 13d1ab02 ADMtek Centaur-C rev 17 [D-Link DFE-680TX] CardBus Fast Ethernet Adapter 1
++d 13d1ab02 ADMtek Centaur-C rev 17 [D-Link DFE-680TX] CardBus Fast Ethernet Adapter 0
++d 13d1ab03 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ d 13d1ab06 RTL8139 [FE2000VX] CardBus Fast Ethernet Attached Port Adapter 0
++d 13d1ab08 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ v 13d2 Shark Multimedia Inc 0
+ v 13d3 IMC Networks 0
+ v 13d4 Graphics Microsystems Inc 0
+@@ -4872,7 +6410,7 @@
+ v 13e6 Argosy research Inc 0
+ v 13e7 NAC Incorporated 0
+ v 13e8 Chip Express Corporation 0
+-v 13e9 Chip Express Corporation 0
++v 13e9 Intraserver Technology Inc 0
+ v 13ea Dallas Semiconductor 0
+ v 13eb Hauppauge Computer Works Inc 0
+ v 13ec Zydacron Inc 0
+@@ -4888,14 +6426,18 @@
+ d 13f41401 Zentai Fibre Channel Adapter 0
+ v 13f5 Kansai Electric Co. Ltd 0
+ v 13f6 C-Media Electronics Inc 0
++d 13f60011 CMI8738 0
+ d 13f60100 CM8338A 0
+ s 13f6010013f6ffff CMI8338/C3DX PCI Audio Device 0
+ d 13f60101 CM8338B 0
+ s 13f6010113f60101 CMI8338-031 PCI Audio Device 0
+ d 13f60111 CM8738 0
++s 13f6011110190970 P6STP-FL motherboard 0
++s 13f6011110438035 CUSI-FX motherboard 0
+ s 13f6011110438077 CMI8738 6-channel audio controller 0
+ s 13f60111104380e2 CMI8738 6ch-MX 0
+ s 13f6011113f60111 CMI8738/C3DX PCI Audio Device 0
++s 13f601111681a000 Gamesurround MUSE XL 0
+ d 13f60211 CM8738 0
+ v 13f7 Wildfire Communications 0
+ v 13f8 Ad Lib Multimedia Inc 0
+@@ -4905,6 +6447,10 @@
+ v 13fc Computer Peripherals International 0
+ v 13fd Micro Science Inc 0
+ v 13fe Advantech Co. Ltd 0
++d 13fe1240 PCI-1240 4-channel stepper motor controller card w. Nova Electronics MCX314 0
++d 13fe1600 PCI-1612 4-port RS-232/422/485 PCI Communication Card 0
++d 13fe1752 PCI-1752 0
++d 13fe1754 PCI-1754 0
+ d 13fe1756 PCI-1756 0
+ v 13ff Silicon Spice Inc 0
+ v 1400 Artx Inc 0
+@@ -4919,9 +6465,15 @@
+ d 14070100 Lava Dual Serial 0
+ d 14070101 Lava Quatro A 0
+ d 14070102 Lava Quatro B 0
++d 14070120 Quattro-PCI A 0
++d 14070121 Quattro-PCI B 0
++d 14070180 Lava Octo A 0
++d 14070181 Lava Octo B 0
+ d 14070200 Lava Port Plus 0
+ d 14070201 Lava Quad A 0
+ d 14070202 Lava Quad B 0
++d 14070220 Lava Quattro PCI Ports A/B 0
++d 14070221 Lava Quattro PCI Ports C/D 0
+ d 14070500 Lava Single Serial 0
+ d 14070600 Lava Port 650 0
+ d 14078000 Lava Parallel 0
+@@ -4940,13 +6492,16 @@
+ v 140f Salient Systems Corp 0
+ v 1410 Midas lab Inc 0
+ v 1411 Ikos Systems Inc 0
+-v 1412 IC Ensemble Inc 0
+-d 14121712 ICE1712 [Envy24] 0
++v 1412 VIA Technologies Inc. 0 formerly IC Ensemble Inc.
++d 14121712 ICE1712 [Envy24] PCI Multi-Channel I/O Controller 0
++s 141217121412d638 M-Audio Delta 410 0
++d 14121724 VT1720/24 [Envy24PT/HT] PCI Multi-Channel Audio Controller 0
+ v 1413 Addonics 0
+ v 1414 Microsoft Corporation 0
+ v 1415 Oxford Semiconductor Ltd 0
+ d 14158403 VScom 011H-EP1 1 port parallel adaptor 0
+ d 14159501 OX16PCI954 (Quad 16950 UART) function 0 0
++s 14159501131f2050 CyberPro (4-port) 0
+ s 1415950115ed2000 MCCR Serial p0-3 of 8 0
+ s 1415950115ed2001 MCCR Serial p0-3 of 16 0
+ d 1415950a EXSYS EX-41092 Dual 16950 Serial adapter 0
+@@ -4965,11 +6520,13 @@
+ v 141e Fanuc Ltd 0
+ v 141f Visiontech Ltd 0
+ v 1420 Psion Dacom plc 0
++d 14208002 Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part) 0
++d 14208003 Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part) 0
+ v 1421 Ads Technologies Inc 0
+ v 1422 Ygrec Systems Co Ltd 0
+ v 1423 Custom Technology Corp. 0
+ v 1424 Videoserver Connections 0
+-v 1425 ASIC Designers Inc 0
++v 1425 Chelsio Communications Inc 0
+ v 1426 Storage Technology Corp. 0
+ v 1427 Better On-Line Solutions 0
+ v 1428 Edec Co Ltd 0
+@@ -4979,10 +6536,12 @@
+ v 142c Minton Optic Industry Co Ltd 0
+ v 142d Pix stream Inc 0
+ v 142e Vitec Multimedia 0
++d 142e4020 VM2-2 [Video Maker 2] MPEG1/2 Encoder 0
+ v 142f Radicom Research Inc 0
+ v 1430 ITT Aerospace/Communications Division 0
+ v 1431 Gilat Satellite Networks 0
+ v 1432 Edimax Computer Co. 0
++d 14329130 RTL81xx Fast Ethernet 0
+ v 1433 Eltec Elektronik GmbH 0
+ v 1435 Real Time Devices US Inc. 0
+ v 1436 CIS Technology Inc 0
+@@ -5012,6 +6571,7 @@
+ d 144a7434 PCI-7434 0
+ d 144a7841 PCI-7841 0
+ d 144a8133 PCI-8133 0
++d 144a8164 PCI-8164 0
+ d 144a8554 PCI-8554 0
+ d 144a9111 PCI-9111 0
+ d 144a9113 PCI-9113 0
+@@ -5039,7 +6599,11 @@
+ d 145f0001 NextMove PCI 0
+ v 1460 DYNARC INC 0
+ v 1461 Avermedia Technologies Inc 0
+-v 1462 Micro-star International Co Ltd 0
++v 1462 Micro-Star International Co., Ltd. 0
++d 14626825 PCI Card wireless 11g [PC54G] 0
++d 14628725 NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter 0
++d 14629000 NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter 0 MSI G4Ti4800, 128MB DDR SDRAM, TV-Out, DVI-I
++d 14629119 NVIDIA NV31 [GeForce FX 5600XT] VGA Adapter 0
+ v 1463 Fast Corporation 0
+ v 1464 Interactive Circuits & Systems Ltd 0
+ v 1465 GN NETTEST Telecom DIV. 0
+@@ -5050,6 +6614,7 @@
+ v 146a IFR 0
+ v 146b Parascan Technologies Ltd 0
+ v 146c Ruby Tech Corp. 0
++d 146c1430 FE-1430TX Fast Ethernet PCI Adapter 0
+ v 146d Tachyon, INC. 0
+ v 146e Williams Electronics Games, Inc. 0
+ v 146f Multi Dimensional Consulting Inc 0
+@@ -5095,11 +6660,13 @@
+ v 1496 JOYTECH Computer Co., Ltd. 0
+ v 1497 SMA Regelsysteme GmBH 0
+ v 1498 TEWS Datentechnik GmBH 0
++d 149830c8 TPCI200 0
+ v 1499 EMTEC CO., Ltd 0
+ v 149a ANDOR Technology Ltd 0
+ v 149b SEIKO Instruments Inc 0
+ v 149c OVISLINK Corp. 0
+ v 149d NEWTEK Inc 0
++d 149d0001 Video Toaster for PC 0
+ v 149e Mapletree Networks Inc. 0
+ v 149f LECTRON Co Ltd 0
+ v 14a0 SOFTING GmBH 0
+@@ -5126,6 +6693,14 @@
+ d 14b30000 DSL NIC 0
+ v 14b4 PHILIPS Business Electronics B.V. 0
+ v 14b5 Creamware GmBH 0
++d 14b50200 Scope 0
++d 14b50300 Pulsar 0
++d 14b50400 PulsarSRB 0
++d 14b50600 Pulsar2 0
++d 14b50800 DSP-Board 0
++d 14b50900 DSP-Board 0
++d 14b50a00 DSP-Board 0
++d 14b50b00 DSP-Board 0
+ v 14b6 Quantum Data Corp. 0
+ v 14b7 PROXIM Inc 0
+ d 14b70001 Symphony 4110 0
+@@ -5135,8 +6710,10 @@
+ d 14b90340 PC4800 0
+ d 14b90350 PC4800 0
+ d 14b94500 PC4500 0
+-d 14b94800 PC4800 0
+-d 14b9a504 Cisco Aironet Wireless 802.11b 1 This is the name used by IBM in their Thinkpad T30 doc. It is a wireless ethernet card.
++d 14b94800 Cisco Aironet 340 802.11b Wireless LAN Adapter/Aironet PC4800 0
++d 14b9a504 Cisco Aironet Wireless 802.11b 0
++d 14b9a505 Cisco Aironet CB20a 802.11a Wireless LAN Adapter 0
++d 14b9a506 Cisco Aironet Mini PCI b/g 0
+ v 14ba INTERNIX Inc. 0
+ v 14bb SEMTECH Corporation 0
+ v 14bc Globespan Semiconductor Inc. 0
+@@ -5145,6 +6722,7 @@
+ v 14bf SPIDER Communications Inc. 0
+ v 14c0 COMPAL Electronics Inc 0
+ v 14c1 MYRICOM Inc. 0
++d 14c18043 Myrinet 2000 Scalable Cluster Interconnect 0
+ v 14c2 DTK Computer 0
+ v 14c3 MEDIATEK Corp. 0
+ v 14c4 IWASAKI Information Systems Co Ltd 0
+@@ -5184,7 +6762,9 @@
+ v 14d6 Accusys Inc 0
+ v 14d7 Hirakawa Hewtech Corp 0
+ v 14d8 HOPF Elektronik GmBH 0
+-v 14d9 Alpha Processor Inc 0
++v 14d9 Alliance Semiconductor Corporation 0 Formerly SiPackets, Inc., formerly API NetWorks, Inc., formerly Alpha Processor, Inc.
++d 14d90010 AP1011/SP1011 HyperTransport-PCI Bridge [Sturgeon] 0
++d 14d99000 AS90L10204/10208 HyperTransport to PCI-X Bridge 0
+ v 14da National Aerospace Laboratories 0
+ v 14db AFAVLAB Technology Inc 0
+ d 14db2120 TK9902 0
+@@ -5208,41 +6788,57 @@
+ v 14e2 INFOLIBRIA 0
+ v 14e3 AMTELCO 0
+ v 14e4 Broadcom Corporation 0
++d 14e40800 Sentry5 Chipcommon I/O Controller 0
++d 14e40804 Sentry5 PCI Bridge 0
++d 14e40805 Sentry5 MIPS32 CPU 0
++d 14e40806 Sentry5 Ethernet Controller 0
++d 14e4080b Sentry5 Crypto Accelerator 0
++d 14e4080f Sentry5 DDR/SDR RAM Controller 0
++d 14e40811 Sentry5 External Interface Core 0
++d 14e40816 BCM3302 Sentry5 MIPS32 CPU 0
+ d 14e41644 NetXtreme BCM5700 Gigabit Ethernet 0
+-s 14e4164410140277 Broadcom Vigil B5700 1000BaseTX 0
++s 14e4164410140277 Broadcom Vigil B5700 1000Base-T 0
+ s 14e41644102800d1 Broadcom BCM5700 0
+ s 14e4164410280106 Broadcom BCM5700 0
+-s 14e4164410280109 Broadcom BCM5700 1000BaseTX 0
++s 14e4164410280109 Broadcom BCM5700 1000Base-T 0
+ s 14e416441028010a Broadcom BCM5700 1000BaseTX 0
+-s 14e4164410b71000 3C996-T 1000BaseTX 0
+-s 14e4164410b71001 3C996B-T 1000BaseTX 0
+-s 14e4164410b71002 3C996C-T 1000BaseTX 0
+-s 14e4164410b71003 3C997-T 1000BaseTX Dual Port 0
+-s 14e4164410b71004 3C996-SX 1000BaseSX 0
+-s 14e4164410b71005 3C997-SX 1000BaseSX Dual Port 0
++s 14e4164410b71000 3C996-T 1000Base-T 0
++s 14e4164410b71001 3C996B-T 1000Base-T 0
++s 14e4164410b71002 3C996C-T 1000Base-T 0
++s 14e4164410b71003 3C997-T 1000Base-T Dual Port 0
++s 14e4164410b71004 3C996-SX 1000Base-SX 0
++s 14e4164410b71005 3C997-SX 1000Base-SX Dual Port 0
+ s 14e4164410b71008 3C942 Gigabit LOM (31X31) 0
+-s 14e4164414e40002 NetXtreme 1000BaseSX 0
+-s 14e4164414e40003 NetXtreme 1000BaseSX 0
+-s 14e4164414e40004 NetXtreme 1000BaseTX 0
++s 14e4164414e40002 NetXtreme 1000Base-SX 0
++s 14e4164414e40003 NetXtreme 1000Base-SX 0
++s 14e4164414e40004 NetXtreme 1000Base-T 0
+ s 14e4164414e41028 NetXtreme 1000BaseTX 0
+-s 14e4164414e41644 BCM5700 1000BaseTX 0
++s 14e4164414e41644 BCM5700 1000Base-T 0
+ d 14e41645 NetXtreme BCM5701 Gigabit Ethernet 0
+ s 14e416450e11007c NC7770 Gigabit Server Adapter (PCI-X, 10/100/1000-T) 0
+ s 14e416450e11007d NC6770 Gigabit Server Adapter (PCI-X, 1000-SX) 0
+ s 14e416450e110085 NC7780 Gigabit Server Adapter (embedded, WOL) 0
+ s 14e416450e110099 NC7780 Gigabit Server Adapter (embedded, WOL) 0
+ s 14e416450e11009a NC7770 Gigabit Server Adapter (PCI-X, 10/100/1000-T) 0
+-s 14e4164510280121 Broadcom BCM5701 1000BaseTX 0
+-s 14e4164510b71004 3C996-SX 1000BaseSX 0
+-s 14e4164510b71006 3C996B-T 1000BaseTX 0
+-s 14e4164510b71007 3C1000-T 1000BaseTX 0
+-s 14e4164510b71008 3C940-BR01 1000BaseTX 0
+-s 14e4164514e40001 BCM5701 1000BaseTX 0
+-s 14e4164514e40005 BCM5701 1000BaseTX 0
+-s 14e4164514e40006 BCM5701 1000BaseTX 0
+-s 14e4164514e40007 BCM5701 1000BaseSX 0
+-s 14e4164514e40008 BCM5701 1000BaseTX 0
+-s 14e4164514e48008 BCM5701 1000BaseTX 0
++s 14e416450e1100c1 NC6770 Gigabit Server Adapter (PCI-X, 1000-SX) 0
++s 14e4164510280121 Broadcom BCM5701 1000Base-T 0
++s 14e41645103c128a HP 1000Base-T (PCI) [A7061A] 0
++s 14e41645103c128b HP 1000Base-SX (PCI) [A7073A] 0
++s 14e41645103c12a4 HP Core Lan 1000Base-T 0
++s 14e41645103c12c1 HP IOX Core Lan 1000Base-T [A7109AX] 0
++s 14e4164510a98010 SGI IO9 Gigabit Ethernet (Copper) 0
++s 14e4164510a98011 SGI Gigabit Ethernet (Copper) 0
++s 14e4164510a98012 SGI Gigabit Ethernet (Fiber) 0
++s 14e4164510b71004 3C996-SX 1000Base-SX 0
++s 14e4164510b71006 3C996B-T 1000Base-T 0
++s 14e4164510b71007 3C1000-T 1000Base-T 0
++s 14e4164510b71008 3C940-BR01 1000Base-T 0
++s 14e4164514e40001 BCM5701 1000Base-T 0
++s 14e4164514e40005 BCM5701 1000Base-T 0
++s 14e4164514e40006 BCM5701 1000Base-T 0
++s 14e4164514e40007 BCM5701 1000Base-SX 0
++s 14e4164514e40008 BCM5701 1000Base-T 0
++s 14e4164514e48008 BCM5701 1000Base-T 0
+ d 14e41646 NetXtreme BCM5702 Gigabit Ethernet 0
+ s 14e416460e1100bb NC7760 1000BaseTX 0
+ s 14e4164610280126 Broadcom BCM5702 1000BaseTX 0
+@@ -5250,26 +6846,153 @@
+ d 14e41647 NetXtreme BCM5703 Gigabit Ethernet 0
+ s 14e416470e110099 NC7780 1000BaseTX 0
+ s 14e416470e11009a NC7770 1000BaseTX 0
++s 14e4164710a98010 SGI IO9 Gigabit Ethernet (Copper) 0
+ s 14e4164714e40009 BCM5703 1000BaseTX 0
+ s 14e4164714e4000a BCM5703 1000BaseSX 0
+ s 14e4164714e4000b BCM5703 1000BaseTX 0
+ s 14e4164714e48009 BCM5703 1000BaseTX 0
+ s 14e4164714e4800a BCM5703 1000BaseTX 0
+-d 14e41648 "Broadcom Corporation|BCM5704 1000BaseTX" 1
++d 14e41648 NetXtreme BCM5704 Gigabit Ethernet 0
++s 14e416480e1100cf NC7772 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416480e1100d0 NC7782 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416480e1100d1 NC7783 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e4164810b72000 3C998-T Dual Port 10/100/1000 PCI-X 0
++s 14e4164810b73000 3C999-T Quad Port 10/100/1000 PCI-X 0
++s 14e4164811661648 NetXtreme CIOB-E 1000Base-T 0
++d 14e4164a NetXtreme II BCM5706 Gigabit Ethernet 0
+ d 14e4164d NetXtreme BCM5702FE Gigabit Ethernet 0
++d 14e41653 NetXtreme BCM5705 Gigabit Ethernet 0
++s 14e416530e1100e3 NC7761 Gigabit Server Adapter 0
++d 14e41654 NetXtreme BCM5705_2 Gigabit Ethernet 0
++s 14e416540e1100e3 NC7761 Gigabit Server Adapter 0
++s 14e41654103c3100 NC1020 HP ProLiant Gigabit Server Adapter 32 PCI 0
++d 14e41659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 0
++d 14e4165d NetXtreme BCM5705M Gigabit Ethernet 0
++d 14e4165e NetXtreme BCM5705M_2 Gigabit Ethernet 0
++s 14e4165e103c0890 NC6000 laptop 0
++d 14e4166e 570x 10/100 Integrated Controller 0
++d 14e41677 NetXtreme BCM5751 Gigabit Ethernet PCI Express 0
++s 14e4167710280179 Optiplex GX280 0
++d 14e4167d NetXtreme BCM5751M Gigabit Ethernet PCI Express 0
++d 14e4167e NetXtreme BCM5751F Fast Ethernet PCI Express 0
++d 14e41696 NetXtreme BCM5782 Gigabit Ethernet 0
++s 14e41696103c12bc HP d530 CMT (DG746A) 0
++s 14e4169614e4000d NetXtreme BCM5782 1000Base-T 0
++d 14e4169c NetXtreme BCM5788 Gigabit Ethernet 0
++d 14e4169d NetLink BCM5789 Gigabit Ethernet PCI Express 0
+ d 14e416a6 NetXtreme BCM5702X Gigabit Ethernet 0
++s 14e416a60e1100bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T) 0
++s 14e416a610280126 BCM5702 1000Base-T 0
++s 14e416a614e4000c BCM5702 1000Base-T 0
++s 14e416a614e48009 BCM5702 1000Base-T 0
+ d 14e416a7 NetXtreme BCM5703X Gigabit Ethernet 0
+-d 14e416a8 Broadcom Corporation|BCM5704 1000BaseSX 1
+-d 14e44210 BCM4210 iLine10 HomePNA 2.0 1
+-d 14e44211 BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem 1
+-d 14e44212 BCM v.90 56k modem 0
+-d 14e44212 BCM4212 v.90 56k modem 1
+-d 14e44402 BCM4402 Integrated 10/100BaseT 1
+-d 14e44410 BCM4413 iLine32 HomePNA 2.0 1
+-d 14e44411 BCM4413 V.90 56k modem 1
+-d 14e44412 BCM4413 10/100BaseT 1
++s 14e416a70e1100ca NC7771 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416a70e1100cb NC7781 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416a714e40009 NetXtreme BCM5703 1000Base-T 0
++s 14e416a714e4000a NetXtreme BCM5703 1000Base-SX 0
++s 14e416a714e4000b NetXtreme BCM5703 1000Base-T 0
++s 14e416a714e4800a NetXtreme BCM5703 1000Base-T 0
++d 14e416a8 NetXtreme BCM5704S Gigabit Ethernet 0
++s 14e416a810b72001 3C998-SX Dual Port 1000-SX PCI-X 0
++d 14e416aa NetXtreme II BCM5706S Gigabit Ethernet 0
++d 14e416c6 NetXtreme BCM5702A3 Gigabit Ethernet 0
++s 14e416c610b71100 3C1000B-T 10/100/1000 PCI 0
++s 14e416c614e4000c BCM5702 1000Base-T 0
++s 14e416c614e48009 BCM5702 1000Base-T 0
++d 14e416c7 NetXtreme BCM5703 Gigabit Ethernet 0
++s 14e416c70e1100ca NC7771 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416c70e1100cb NC7781 Gigabit Server Adapter (PCI-X, 10,100,1000-T) 0
++s 14e416c7103c12c3 HP Combo FC/GigE-SX [A9782A] 0
++s 14e416c7103c12ca HP Combo FC/GigE-T [A9784A] 0
++s 14e416c714e40009 NetXtreme BCM5703 1000Base-T 0
++s 14e416c714e4000a NetXtreme BCM5703 1000Base-SX 0
++d 14e416dd NetLink BCM5781 Gigabit Ethernet PCI Express 0
++d 14e416f7 NetXtreme BCM5753 Gigabit Ethernet PCI Express 0
++d 14e416fd NetXtreme BCM5753M Gigabit Ethernet PCI Express 0
++d 14e416fe NetXtreme BCM5753F Fast Ethernet PCI Express 0
++d 14e4170c BCM4401-B0 100Base-TX 0
++d 14e4170d NetXtreme BCM5901 100Base-TX 0
++s 14e4170d10140545 ThinkPad R40e (2684-HVG) builtin ethernet controller 0
++d 14e4170e NetXtreme BCM5901 100Base-TX 0
++d 14e43352 BCM3352 0
++d 14e43360 BCM3360 0
++d 14e44210 BCM4210 iLine10 HomePNA 2.0 0
++d 14e44211 BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem 0
++d 14e44212 BCM4212 v.90 56k modem 0
++d 14e44301 BCM4303 802.11b Wireless LAN Controller 0
++s 14e4430110280407 TrueMobile 1180 Onboard WLAN 0
++s 14e4430110430120 WL-103b Wireless LAN PC Card 0
++d 14e44305 BCM4307 V.90 56k Modem 0
++d 14e44306 BCM4307 Ethernet Controller 0
++d 14e44307 BCM4307 802.11b Wireless LAN Controller 0
++d 14e44310 BCM4310 Chipcommon I/OController 0
++d 14e44312 BCM4310 UART 0
++d 14e44313 BCM4310 Ethernet Controller 0
++d 14e44315 BCM4310 USB Controller 0
++d 14e44320 BCM4306 802.11b/g Wireless LAN Controller 0
++s 14e4432010280001 TrueMobile 1300 WLAN Mini-PCI Card 0
++s 14e4432010280003 Wireless 1350 WLAN Mini-PCI Card 0
++s 14e443201043100f WL-100G 0
++s 14e4432014e44320 Linksys WMP54G PCI 0
++s 14e4432017374320 WPC54G 0
++s 14e4432017997010 Belkin F5D7010 54g Wireless Network card 0
++d 14e44321 BCM4306 802.11a Wireless LAN Controller 0
++d 14e44322 BCM4306 UART 0
++d 14e44324 BCM4309 802.11a/b/g 0
++s 14e4432410280001 Truemobile 1400 0
++s 14e4432410280003 Truemobile 1450 MiniPCI 0
++d 14e44325 BCM43xG 802.11b/g 0
++s 14e4432514140003 Wireless Notebook Adapter MN-720 0
++s 14e4432514140004 Wireless PCI Adapter MN-730 0
++d 14e44326 BCM4307 Chipcommon I/O Controller? 0 probably this is a correct ID...
++d 14e44401 BCM4401 100Base-T 0
++s 14e44401104380a8 A7V8X motherboard 0
++d 14e44402 BCM4402 Integrated 10/100BaseT 0
++d 14e44403 BCM4402 V.90 56k Modem 0
++d 14e44410 BCM4413 iLine32 HomePNA 2.0 0
++d 14e44411 BCM4413 V.90 56k modem 0
++d 14e44412 BCM4412 10/100BaseT 0
++d 14e44430 BCM44xx CardBus iLine32 HomePNA 2.0 0
++d 14e44432 BCM4432 CardBus 10/100BaseT 0
++d 14e44610 BCM4610 Sentry5 PCI to SB Bridge 0
++d 14e44611 BCM4610 Sentry5 iLine32 HomePNA 1.0 0
++d 14e44612 BCM4610 Sentry5 V.90 56k Modem 0
++d 14e44613 BCM4610 Sentry5 Ethernet Controller 0
++d 14e44614 BCM4610 Sentry5 External Interface 0
++d 14e44615 BCM4610 Sentry5 USB Controller 0
++d 14e44704 BCM4704 PCI to SB Bridge 0
++d 14e44705 BCM4704 Sentry5 802.11b Wireless LAN Controller 0
++d 14e44706 BCM4704 Sentry5 Ethernet Controller 0
++d 14e44707 BCM4704 Sentry5 USB Controller 0
++d 14e44708 BCM4704 Crypto Accelerator 0
++d 14e44710 BCM4710 Sentry5 PCI to SB Bridge 0
++d 14e44711 BCM47xx Sentry5 iLine32 HomePNA 2.0 0
++d 14e44712 BCM47xx V.92 56k modem 0
++d 14e44713 Sentry5 Ethernet Controller 0
++d 14e44714 BCM47xx Sentry5 External Interface 0
++d 14e44715 Sentry5 USB Controller 0
++d 14e44716 BCM47xx Sentry5 USB Host Controller 0
++d 14e44717 BCM47xx Sentry5 USB Device Controller 0
++d 14e44718 Sentry5 Crypto Accelerator 0
++d 14e44720 BCM4712 MIPS CPU 0
++d 14e45365 BCM5365P Sentry5 Host Bridge 0
++d 14e45600 BCM5600 StrataSwitch 24+2 Ethernet Switch Controller 0
++d 14e45605 BCM5605 StrataSwitch 24+2 Ethernet Switch Controller 0
++d 14e45615 BCM5615 StrataSwitch 24+2 Ethernet Switch Controller 0
++d 14e45625 BCM5625 StrataSwitch 24+2 Ethernet Switch Controller 0
++d 14e45645 BCM5645 StrataSwitch 24+2 Ethernet Switch Controller 0
++d 14e45670 BCM5670 8-Port 10GE Ethernet Switch Fabric 0
++d 14e45680 BCM5680 G-Switch 8 Port Gigabit Ethernet Switch Controller 0
++d 14e45690 BCM5690 12-port Multi-Layer Gigabit Ethernet Switch 0
++d 14e45691 BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller 0
+ d 14e45820 BCM5820 Crypto Accelerator 0
+ d 14e45821 BCM5821 Crypto Accelerator 0
++d 14e45822 BCM5822 Crypto Accelerator 0
++d 14e45823 BCM5823 Crypto Accelerator 0
++d 14e45824 BCM5824 Crypto Accelerator 0
++d 14e45840 BCM5840 Crypto Accelerator 0
++d 14e45841 BCM5841 Crypto Accelerator 0
++d 14e45850 BCM5850 Crypto Accelerator 0
+ v 14e5 Pixelfusion Ltd 0
+ v 14e6 SHINING Technology Inc 0
+ v 14e7 3CX 0
+@@ -5277,6 +7000,7 @@
+ v 14e9 GARNETS System CO Ltd 0
+ v 14ea Planex Communications, Inc 0
+ d 14eaab06 FNW-3603-TX CardBus Fast Ethernet 0
++d 14eaab07 RTL81xx RealTek Ethernet 0
+ v 14eb SEIKO EPSON Corp 0
+ v 14ec ACQIRIS 0
+ v 14ed DATAKINETICS Ltd 0
+@@ -5352,6 +7076,9 @@
+ s 14f11456122d4302 Dell MP3930V-W(C) MiniPCI 0
+ d 14f11610 ADSL AccessRunner PCI Arbitration Device 0
+ d 14f11611 AccessRunner PCI ADSL Interface Device 0
++d 14f11620 ADSL AccessRunner V2 PCI Arbitration Device 0
++d 14f11621 AccessRunner V2 PCI ADSL Interface Device 0
++d 14f11622 AccessRunner V2 PCI ADSL Yukon WAN Adapter 0
+ d 14f11803 HCF 56k Modem 0
+ s 14f118030e110023 623-LAN Grizzly 0
+ s 14f118030e110043 623-LAN Yogi 0
+@@ -5415,22 +7142,37 @@
+ s 14f12f0013e08d84 IBM HSFi V.90 0
+ s 14f12f0013e08d85 Compaq Stinger 0
+ s 14f12f0014f12004 Dynalink 56PMi 0
++d 14f12f02 HSF 56k HSFi Data/Fax 0
++d 14f12f11 HSF 56k HSFi Modem 0
+ d 14f18234 RS8234 ATM SAR Controller [ServiceSAR Plus] 0
++d 14f18800 Winfast TV2000 XP 0
+ v 14f2 MOBILITY Electronics 0
+-v 14f3 BROADLOGIC 0
++d 14f20120 EV1000 bridge 0
++d 14f20121 EV1000 Parallel port 0
++d 14f20122 EV1000 Serial port 0
++d 14f20123 EV1000 Keyboard controller 0
++d 14f20124 EV1000 Mouse controller 0
++v 14f3 BroadLogic 0
++d 14f32030 2030 DVB-S Satellite Reciever 0
++d 14f32050 2050 DVB-T Terrestrial (Cable) Reciever 0
++d 14f32060 2060 ATSC Terrestrial (Cable) Reciever 0
+ v 14f4 TOKYO Electronic Industry CO Ltd 0
+ v 14f5 SOPAC Ltd 0
+ v 14f6 COYOTE Technologies LLC 0
+ v 14f7 WOLF Technology Inc 0
+ v 14f8 AUDIOCODES Inc 0
++d 14f82077 TP-240 dual span E1 VoIP PCI card 0
+ v 14f9 AG COMMUNICATIONS 0
+ v 14fa WANDEL & GOCHERMANN 0
+ v 14fb TRANSAS MARINE (UK) Ltd 0
+-v 14fc QUADRICS Supercomputers World 0
++v 14fc Quadrics Ltd 0
++d 14fc0000 QsNet Elan3 Network Adapter 0
++d 14fc0001 QsNetII Elan4 Network Adapter 0
+ v 14fd JAPAN Computer Industry Inc 0
+ v 14fe ARCHTEK TELECOM Corp 0
+ v 14ff TWINHEAD INTERNATIONAL Corp 0
+ v 1500 DELTA Electronics, Inc 0
++d 15001360 RTL81xx RealTek Ethernet 0
+ v 1501 BANKSOFT CANADA Ltd 0
+ v 1502 MITSUBISHI ELECTRIC LOGISTICS SUPPORT Co Ltd 0
+ v 1503 KAWASAKI LSI USA Inc 0
+@@ -5462,8 +7204,10 @@
+ v 1514 TFL LAN Inc 0
+ v 1515 Advent design 0
+ v 1516 MYSON Technology Inc 0
++d 15160800 MTD-8xx 100/10M Ethernet PCI Adapter 0
+ d 15160803 SURECOM EP-320X-S 100/10M Ethernet PCI Adapter 0
+ s 15160803132010bd SURECOM EP-320X-S 100/10M Ethernet PCI Adapter 0
++d 15160891 MTD-8xx 100/10M Ethernet PCI Adapter 0
+ v 1517 ECHOTEK Corp 0
+ v 1518 PEP MODULAR Computers GmbH 0
+ v 1519 TELEFON AKTIEBOLAGET LM Ericsson 0
+@@ -5486,8 +7230,24 @@
+ s 1522010015220400 RockForceDUO+ 2 Port V.92/V.44 Data/Fax/Voice Modem 0
+ s 1522010015220500 RockForceQUATRO+ 4 Port V.92/V.44 Data/Fax/Voice Modem 0
+ s 1522010015220600 RockForce+ 2 Port V.90 Data/Fax/Voice Modem 0
++s 1522010015220700 RockForce+ 4 Port V.90 Data/Fax/Voice Modem 0
++s 1522010015220800 RockForceOCTO+ 8 Port V.92/V.44 Data/Fax/Voice Modem 0
++s 1522010015220c00 RockForceDUO+ 2 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem 0
++s 1522010015220d00 RockForceQUATRO+ 4 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem 0
++s 1522010015221d00 RockForceOCTO+ 8 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem 0 this is a correction to a recent entry. 1522:0E00 should be 1522:1D00
+ v 1523 MUSIC Semiconductors 0
+ v 1524 ENE Technology Inc 0
++d 15240510 CB710 Memory Card Reader Controller 0
++d 15240610 PCI Smart Card Reader Controller 0
++d 15241211 CB1211 Cardbus Controller 0
++d 15241225 CB1225 Cardbus Controller 0
++d 15241410 CB1410 Cardbus Controller 0
++s 152414101025005a TravelMate 290 0
++d 15241411 CB-710/2/4 Cardbus Controller 0
++d 15241412 CB-712/4 Cardbus Controller 0
++d 15241420 CB1420 Cardbus Controller 0
++d 15241421 CB-720/2/4 Cardbus Controller 0
++d 15241422 CB-722/4 Cardbus Controller 0
+ v 1525 IMPACT Technologies 0
+ v 1526 ISS, Inc 0
+ v 1527 SOLECTRON 0
+@@ -5507,9 +7267,13 @@
+ v 1535 EVERGREEN Technologies Inc 0
+ v 1537 DATALEX COMMUNCATIONS 0
+ v 1538 ARALION Inc 0
++d 15380303 ARS106S Ultra ATA 133/100/66 Host Controller 0
+ v 1539 ATELIER INFORMATIQUES et ELECTRONIQUE ETUDES S.A. 0
+ v 153a ONO SOKKI 0
+ v 153b TERRATEC Electronic GmbH 0
++d 153b1144 Aureon 5.1 0
++d 153b1147 Aureon 5.1 Sky 0 Terratec seems to use several IDs for the same card.
++d 153b1158 Philips Semiconductors SAA7134 (rev 01) [Terratec Cinergy 600 TV] 0
+ v 153c ANTAL Electronic 0
+ v 153d FILANET Corp 0
+ v 153e TECHWELL Inc 0
+@@ -5518,7 +7282,8 @@
+ v 1541 MACHONE Communications 0
+ v 1542 VIVID Technology Inc 0
+ v 1543 SILICON Laboratories 0
+-d 15434c22 Si3036 1 MC'97 DAA
++d 15433052 Intel 537 [Winmodem] 0
++d 15434c22 Si3036 MC'97 DAA 0
+ v 1544 DCM DATA Systems 0
+ v 1545 VISIONTEK 0
+ v 1546 IOI Technology Corp 0
+@@ -5651,16 +7416,24 @@
+ v 15aa Moreton Bay 0
+ v 15ab Bluesteel Networks Inc 0
+ v 15ac North Atlantic Instruments 0
+-v 15ad VMWare Inc 0
+-d 15ad0405 Unknown? 1
++v 15ad VMware Inc 0
++d 15ad0405 [VMware SVGA II] PCI Display Adapter 0
+ d 15ad0710 Virtual SVGA 0
+-d 15ad0720 Virtual SVGA? 1
++d 15ad0720 VMware High-Speed Virtual NIC [vmxnet] 0
+ v 15ae Amersham Pharmacia Biotech 0
+ v 15b0 Zoltrix International Ltd 0
+ v 15b1 Source Technology Inc 0
+ v 15b2 Mosaid Technologies Inc 0
+-v 15b3 Mellanox Technology 0
++v 15b3 Mellanox Technologies 0
+ d 15b35274 MT21108 InfiniBridge 0
++d 15b35a44 MT23108 InfiniHost 0
++d 15b35a45 MT23108 [Infinihost HCA Flash Recovery] 0
++d 15b35a46 MT23108 PCI Bridge 0
++d 15b35e8c MT24204 [InfiniHost III Lx HCA] 0
++d 15b35e8d MT24204 [InfiniHost III Lx HCA Flash Recovery] 0
++d 15b36278 MT25208 InfiniHost III Ex (Tavor compatibility mode) 0
++d 15b36279 MT25208 [InfiniHost III Ex HCA Flash Recovery] 0
++d 15b36282 MT25208 InfiniHost III Ex 0
+ v 15b4 CCI/TRIAD 0
+ v 15b5 Cimetrics Inc 0
+ v 15b6 Texas Memory Systems Inc 0
+@@ -5670,7 +7443,9 @@
+ v 15ba Impacct Technology Corp 0
+ v 15bb Portwell Inc 0
+ v 15bc Agilent Technologies 0
+-d 15bc2929 E2929A PCI/PCI-X Bus Analyzer 0
++d 15bc2922 64 Bit, 133MHz PCI-X Exerciser & Protocol Checker 0
++d 15bc2928 64 Bit, 66MHz PCI Exerciser & Analyzer 0
++d 15bc2929 64 Bit, 133MHz PCI-X Analyzer & Exerciser 0
+ v 15bd DFI Inc 0
+ v 15be Sola Electronics 0
+ v 15bf High Tech Computer Corp (HTC) 0
+@@ -5680,11 +7455,11 @@
+ v 15c3 Taiwan Mycomp Co Ltd 0
+ v 15c4 EVSX Inc 0
+ v 15c5 Procomp Informatics Ltd 0
++d 15c58010 1394b - 1394 Firewire 3-Port Host Adapter Card 0
+ v 15c6 Technical University of Budapest 0
+ v 15c7 Tateyama System Laboratory Co Ltd 0
+ d 15c70349 Tateyama C-PCI PLC/NC card Rev.01A 0
+ v 15c8 Penta Media Co Ltd 0
+-d 15c89050 PentaNet 1 Satellite DVB Card
+ v 15c9 Serome Technology Inc 0
+ v 15ca Bitboys OY 0
+ v 15cb AG Electronics Ltd 0
+@@ -5719,9 +7494,12 @@
+ v 15e8 National Datacomm Corp 0
+ d 15e80130 Wireless PCI Card 0
+ v 15e9 Pacific Digital Corp 0
++d 15e91841 ADMA-100 DiscStaQ ATA Controller 0
+ v 15ea Tokyo Denshi Sekei K.K. 0
+ v 15eb Drsearch GmbH 0
+ v 15ec Beckhoff GmbH 0
++d 15ec3101 FC3101 Profibus DP 1 Channel PCI 0
++d 15ec5102 FC5102 0
+ v 15ed Macrolink Inc 0
+ v 15ee In Win Development Inc 0
+ v 15ef Intelligent Paradigm Inc 0
+@@ -5755,37 +7533,109 @@
+ v 1619 FarSite Communications Ltd 0
+ d 16190400 FarSync T2P (2 port X.21/V.35/V.24) 0
+ d 16190440 FarSync T4P (4 port X.21/V.35/V.24) 0
++v 161f Rioworks 0 www.rioworks.com
++v 1626 TDK Semiconductor Corp. 0
++d 16268410 RTL81xx Fast Ethernet 0
+ v 1629 Kongsberg Spacetec AS 0
+ d 16291003 Format synchronizer v3.0 0
+ d 16292002 Fast Universal Data Output 0
++v 1637 Linksys 0 This seems to occur on their 802.11b Wireless card WMP-11
++d 16373874 Linksys 802.11b WMP11 PCI Wireless card 0
+ v 1638 Standard Microsystems Corp [SMC] 0
+-d 16381100 SMC2602W EZConnect / Addtron AWA-100 0
++d 16381100 SMC2602W EZConnect / Addtron AWA-100 / Eumitcom PCI WL11000 0
++v 163c Smart Link Ltd. 0
++d 163c3052 SmartLink SmartPCI562 56K Modem 0
++d 163c5449 SmartPCI561 Modem 0
+ v 1657 Brocade Communications Systems, Inc. 0
+-v 165a Epix Inc. 1
+-d 165ac100 PIXCI(R) CL1 PCI Camera Link Video Capture Board 1 Custom chip made for this board, based on QuickLogic QL5232
+-d 165ad200 PIXCI(R) D2X PCI Digital Video Capture Board 1 Custom chip made for this board, based on QuickLogic QL5232
+-d 165ad300 PIXCI(R) D3X PCI Digital Video Capture Board 1 Custom chip made for this board, based on QuickLogic QL5232
++v 165a Epix Inc 0
++d 165ac100 PIXCI(R) CL1 Camera Link Video Capture Board [custom QL5232] 0
++d 165ad200 PIXCI(R) D2X Digital Video Capture Board [custom QL5232] 0
++d 165ad300 PIXCI(R) D3X Digital Video Capture Board [custom QL5232] 0
+ v 165d Hsing Tech. Enterprise Co., Ltd. 0
+ v 1661 Worldspace Corp. 0
+-v 1668 Action Tec Electronics Inc 0
+-v 168c Action Tec Electronics Inc 1 subtype: '0007 802.11a WLAN Controller (AR5k chipset)'
++v 1668 Actiontec Electronics Inc 0
++d 16680100 Mini-PCI bridge 0
++v 166d Broadcom Corporation 0 Formerly SiByte, Inc.
++d 166d0001 SiByte BCM1125/1125H/1250 System-on-a-Chip PCI 0
++d 166d0002 SiByte BCM1125H/1250 System-on-a-Chip HyperTransport 0
++v 1677 Bernecker + Rainer 0
++d 1677104e 5LS172.6 B&R Dual CAN Interface Card 0
++d 167712d7 5LS172.61 B&R Dual CAN Interface Card 0
++v 1681 Hercules 0
++d 16810010 Hercules 3d Prophet II Ultra 64MB [ 350 MHz NV15BR core, 128-bit DDR @ 460 MHz, 1.5v AGP4x ] 0 More specs, more accurate desc.
++v 1688 CastleNet Technology Inc. 0
++d 16881170 WLAN 802.11b card 0
++v 168c Atheros Communications, Inc. 0
++d 168c0007 AR5000 802.11a Wireless Adapter 0
++d 168c0011 AR5210 802.11a NIC 0
++d 168c0012 AR5211 802.11ab NIC 0
++d 168c0013 AR5212 802.11abg NIC 0
++s 168c001311863202 D-link DWL-G650 B3 Wireless cardbus adapter 0
++s 168c001311863203 DWL-G520 Wireless PCI Adapter 0
++s 168c001311863a13 DWL-G520 Wireless PCI Adapter rev. B 0
++s 168c001311863a94 C54C Wireless 801.11g cardbus 0
++s 168c001313854d00 Netgear WG311T Wireless PCI Adapter 0
++s 168c001314b70a60 8482-WD ORiNOCO 11a/b/g Wireless PCI Adapter 0
++s 168c0013168c0013 WG511T Wireless CardBus Adapter 0
++s 168c0013168c1025 DWL-G650B2 Wireless CardBus Adapter 0
++s 168c0013168c2026 Netgate 5354MP ARIES a(108Mb turbo)/b/g MiniPCI Adapter 0
++d 168c1014 AR5212 802.11abg NIC 0
++v 16a5 Tekram Technology Co.,Ltd. 0
+ v 16ab Global Sun Technology Inc 0
+-d 16ab1102 PCMCIA-to-PCI Wireless Network Bridge 1 PLX chipset
++d 16ab1100 GL24110P 0
++d 16ab1101 PLX9052 PCMCIA-to-PCI Wireless LAN 0
++d 16ab1102 PCMCIA-to-PCI Wireless Network Bridge 0
++v 16ae Safenet Inc 0
++d 16ae1141 SafeXcel-1141 0
++v 16b4 Aspex Semiconductor Ltd 0
++v 16be Creatix Polymedia GmbH 0
++v 16ca CENATEK Inc 0
++d 16ca0001 Rocket Drive DL 0
++v 16cd Densitron Technologies 0
++v 16df PIKA Technologies Inc. 0 www.pikatechnologies.com
++v 16e3 European Space Agency 0
++d 16e31e0f LEON2FT Processor 0
+ v 16ec U.S. Robotics 0
++d 16ec00ff USR997900 10/100 Mbps PCI Network Card 0
+ d 16ec3685 Wireless Access PCI Adapter Model 022415 0
++v 16ed Sycron N. V. 0
++d 16ed1001 UMIO communication card 0
++v 16f3 Jetway Information Co., Ltd. 0
++v 16f4 Vweb Corp 0
++d 16f48000 VW2010 0
+ v 16f6 VideoTele.com, Inc. 0
+-v 170b NetOctave Inc 0
++v 1702 Internet Machines Corporation (IMC) 0 www.internetmachines.com
++v 1705 Digital First, Inc. 0
++v 170b NetOctave 0
++d 170b0100 NSP2000-SSL crypto accelerator 0
+ v 170c YottaYotta Inc. 0
++v 1725 Vitesse Semiconductor 0 Seems to be a 2nd ID for Vitesse Semiconductor
++d 17257174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 0
++v 172a Accelerated Encryption 0
++v 1734 Fujitsu Siemens Computer GmbH 0
+ v 1737 Linksys 0
++d 17370013 WMP54G Wireless Pci Card 0
++d 17370015 WMP54GS Wireless Pci Card 0
++d 17371032 Gigabit Network Adapter 0
++s 1737103217370015 EG1032 v2 Instant Gigabit Network Adapter 0
++d 17371064 Gigabit Network Adapter 0
++s 1737106417370016 EG1064 v2 Instant Gigabit Network Adapter 0
++d 1737ab08 21x4x DEC-Tulip compatible 10/100 Ethernet 0
++d 1737ab09 21x4x DEC-Tulip compatible 10/100 Ethernet 0
+ v 173b Altima (nee Broadcom) 0
+ d 173b03e8 AC1000 Gigabit Ethernet 0
++d 173b03e9 AC1001 Gigabit Ethernet 0
+ d 173b03ea AC9100 Gigabit Ethernet 0
++s 173b03ea173b0001 AC1002 0
++d 173b03eb AC1003 Gigabit Ethernet 0
+ v 1743 Peppercon AG 0
+ d 17438139 ROL/F-100 Fast Ethernet Adapter with ROL 0
++v 1749 RLX Technologies 0
+ v 174b PC Partner Limited 0
++v 174d WellX Telecom SA 0
++v 175c AudioScience Inc 0
+ v 175e Sanera Systems, Inc. 0
+-v 1787 Sapphire Technology Ltd. 1 http://mirror.ati.com/support/identify/graphicschart.html
+-v 1787 Hightech Information System Ltd. 1 Oops, I goofed on the Sapphire entry above.. this one is correct
++v 1787 Hightech Information System Ltd. 0
+ v 1796 Research Centre Juelich 0 also used by Struck Innovative Systeme for joint developments
+ d 17960001 SIS1100 [Gigabit link] 0
+ d 17960002 HOTlink 0
+@@ -5793,10 +7643,81 @@
+ d 17960004 CAMAC Controller 0
+ d 17960005 PROFIBUS 0
+ d 17960006 AMCC HOTlink 0
+-v 1799 Belkin 1
+-v 17af Hightech Information System Ltd. 1 ATI supplied info - http://mirror.ati.com/support/identify/graphicschart.html
++v 1797 JumpTec h, GMBH 0
++v 1799 Belkin 0
++d 17996001 Wireless PCI Card - F5D6001 0
++d 17996020 Wireless PCMCIA Card - F5D6020 0
++d 17996060 Wireless PDA Card - F5D6060 0
++d 17997000 Wireless PCI Card - F5D7000 0
++v 17a0 Genesys Logic, Inc 0
++d 17a08033 GL880S USB 1.1 controller 0
++d 17a08034 GL880S USB 2.0 controller 0
++v 17af Hightech Information System Ltd. 0
++v 17b3 Hawking Technologies 0
++d 17b3ab08 PN672TX 10/100 Ethernet 0
++v 17b4 Indra Networks, Inc. 0
++d 17b40011 WebEnhance 100 GZIP Compression Card 0
++v 17c0 Wistron Corp. 0
++v 17c2 Newisys, Inc. 0
++v 17cc NetChip Technology, Inc 0
++d 17cc2280 USB 2.0 0
++v 17d5 S2io Inc. 0 S2io ships 10Gb PCI-X Ethernet adapters www.s2io.com
++v 17ee Connect Components Ltd 0 http://www.connect3d.com
++v 17fe Linksys, A Division of Cisco Systems 0
++d 17fe2220 [AirConn] INPROCOMM IPN 2220 Wireless LAN Adapter (rev 01) 0
+ v 1813 Ambient Technologies Inc 0
+-d 18134000 HaM controllerless modem 1
++d 18134000 HaM controllerless modem 0
++s 1813400016be0001 V9x HAM Data Fax Modem 0
++d 18134100 HaM plus Data Fax Modem 0
++s 1813410016be0002 V9x HAM 1394 0
++v 1814 RaLink 0
++d 18140101 Wireless PCI Adpator RT2400 / RT2460 0
++d 18140201 Ralink RT2500 802.11 Cardbus Reference Card 0
++s 181402011371001e CWC-854 Wireless-G CardBus Adapter 0
++s 181402011371001f CWM-854 Wireless-G Mini PCI Adapter 0
++s 1814020113710020 CWP-854 Wireless-G PCI Adapter 0
++v 1820 InfiniCon Systems Inc. 0
++v 1822 Twinhan Technology Co. Ltd 0
++v 182d SiteCom Europe BV 0
++d 182d3069 ISDN PCI DC-105V2 0 HFC-based ISDN card
++v 1830 Credence Systems Corporation 0
++v 183b MikroM GmbH 0
++d 183b08a7 MVC100 DVI 0
++d 183b08a8 MVC101 SDI 0
++d 183b08a9 MVC102 DVI+Audio 0
++v 1849 ASRock Incorporation 0
++v 1851 Microtune, Inc. 0
++v 1852 Anritsu Corp. 0
++v 1867 Topspin Communications 0
++d 18675a44 MT23108 PCI-X HCA 0
++d 18675a45 MT23108 PCI-X HCA flash recovery 0
++d 18675a46 MT23108 PCI-X HCA bridge 0
++d 18676278 MT25208 InfiniHost III Ex (Tavor compatibility mode) 0
++d 18676282 MT25208 InfiniHost III Ex 0
++v 1888 Varisys Ltd 0
++d 18880301 VMFX1 FPGA PMC module 0
++d 18880601 VSM2 dual PMC carrier 0
++d 18880710 VS14x series PowerPC PCI board 0
++d 18880720 VS24x series PowerPC PCI board 0
++v 1894 KNC One 0 found e.g. on KNC DVB-S card
++v 1896 B&B Electronics Manufacturing Company, Inc. 0
++v 18a1 Astute Networks Inc. 0
++v 18ac DViCO Corporation 0
++d 18acd810 FusionHDTV 3 Gold 0
++v 18bc Info-Tek Corp. 0
++v 18c8 Cray Inc 0 assigned to Octigabay System, which has been acquired by Cray
++v 18c9 ARVOO Engineering BV 0
++v 18ca XGI - Xabre Graphics Inc 0
++d 18ca0040 Volari V8 0
++v 18e6 MPL AG 0
++d 18e60001 OSCI [Octal Serial Communication Interface] 0
++v 18f7 Commtech, Inc. 0
++d 18f70001 Fastcom ESCC-PCI-335 0
++d 18f70002 Fastcom 422/4-PCI-335 0
++d 18f70004 Fastcom 422/2-PCI-335 0
++d 18f70005 Fastcom IGESCC-PCI-ISO/1 0
++d 18f7000a Fastcom 232/4-PCI-335 0
++v 18fb Resilience Corporation 0
+ v 1a08 Sierra semiconductor 0
+ d 1a080000 SC15064 0
+ v 1b13 Jaton Corp 0
+@@ -5809,7 +7730,12 @@
+ d 1de12020 DC-390 0
+ d 1de1690c 690c 0
+ d 1de1dc29 DC290 0
++v 1fc0 Tumsan Oy 0
++d 1fc00300 E2200 Dual E1/Rawpipe Card 0
++v 2000 Smart Link Ltd. 0
+ v 2001 Temporal Research Ltd 0
++v 2003 Smart Link Ltd. 0
++v 2004 Smart Link Ltd. 0
+ v 21c3 21st Century Computer Corp. 0
+ v 2348 Racore 0
+ d 23482010 8142 100VG/AnyLAN 0
+@@ -5821,7 +7747,19 @@
+ v 3000 Hansol Electronics Inc. 0
+ v 3142 Post Impression Systems. 0
+ v 3388 Hint Corp 0
+-d 33880021 HB1-SE33 PCI-PCI Bridge 0
++d 33880013 HiNT HC4 PCI to ISDN bridge, Multimedia audio controller 0
++d 33880014 HiNT HC4 PCI to ISDN bridge, Network controller 0
++d 33880020 HB6 Universal PCI-PCI bridge (transparent mode) 0
++d 33880021 HB6 Universal PCI-PCI bridge (non-transparent mode) 0
++s 338800214c531050 CT7 mainboard 0
++s 338800214c531080 CT8 mainboard 0
++s 338800214c5310a0 CA3/CR3 mainboard 0
++s 338800214c533010 PPCI mezzanine (32-bit PMC) 0
++s 338800214c533011 PPCI mezzanine (64-bit PMC) 0
++d 33880022 HiNT HB4 PCI-PCI Bridge (PCI6150) 0
++d 33880026 HB2 PCI-PCI Bridge 0
++d 3388101a E.Band [AudioTrak Inca88] 0
++d 3388101b E.Band [AudioTrak Inca88] 0
+ d 33888011 VXPro II Chipset 0
+ s 3388801133888011 VXPro II Chipset CPU to PCI Bridge 0
+ d 33888012 VXPro II Chipset 0
+@@ -5829,8 +7767,8 @@
+ d 33888013 VXPro II IDE 0
+ s 3388801333888013 VXPro II Chipset EIDE Controller 0
+ v 3411 Quantum Designs (H.K.) Inc 0
+-v 3412 Unknown 1 Toshiba Magnia SG20 has a 3412:7856 as a subsystem of 1217:6972
+ v 3513 ARCOM Control Systems Ltd 0
++v 3842 eVga.com. Corp. 0
+ v 38ef 4Links 0
+ v 3d3d 3DLabs 0
+ d 3d3d0001 GLINT 300SX 0
+@@ -5843,6 +7781,7 @@
+ d 3d3d0008 GLINT Gamma G1 0
+ d 3d3d0009 Permedia II 2D+3D 0
+ s 3d3d000910400011 AccelStar II 0
++s 3d3d000913e91000 6221L-4U 0
+ s 3d3d00093d3d0100 AccelStar II 3D Accelerator 0
+ s 3d3d00093d3d0111 Permedia 3:16 0
+ s 3d3d00093d3d0114 Santa Ana 0
+@@ -5854,7 +7793,18 @@
+ d 3d3d000a GLINT R3 0
+ s 3d3d000a3d3d0121 Oxygen VX1 0
+ d 3d3d000c GLINT R3 [Oxygen VX1] 0
++s 3d3d000c3d3d0144 Oxygen VX1-4X AGP [Permedia 4] 0
++d 3d3d000d GLint R4 rev A 0
++d 3d3d0011 GLint R4 rev B 0
++d 3d3d0012 GLint R5 rev A 0
++d 3d3d0013 GLint R5 rev B 0
++d 3d3d0020 VP10 visual processor 0
++d 3d3d0022 VP10 visual processor 0 P10 generic II
++d 3d3d0024 VP9 visual processor 0
+ d 3d3d0100 Permedia II 2D+3D 0
++d 3d3d07a1 Wildcat III 6210 0
++d 3d3d07a2 Sun XVR-500 Graphics Accelerator 0
++d 3d3d07a3 Wildcat IV 7210 0
+ d 3d3d1004 Permedia 0
+ d 3d3d3d04 Permedia 0
+ d 3d3dffff Glint VGA 0
+@@ -5877,10 +7827,16 @@
+ v 4033 Addtron Technology Co, Inc. 0
+ d 40331360 RTL8139 Ethernet 0
+ v 4143 Digital Equipment Corp 0
++v 4144 Alpha Data 0
+ v 416c Aladdin Knowledge Systems 0
+ d 416c0100 AladdinCARD 0
+ d 416c0200 CPC 0
+ v 4444 Internext Compression Inc 0
++d 44440016 iTVC16 (CX23416) MPEG-2 Encoder 0
++s 4444001600704009 WinTV PVR 250 0
++d 44440803 iTVC15 MPEG-2 Encoder 0
++s 4444080300704000 WinTV PVR-350 0
++s 4444080300704001 WinTV PVR-250 0
+ v 4468 Bridgeport machines 0
+ v 4594 Cogetec Informatique Inc 0
+ v 45fb Baldor Electric Company 0
+@@ -5889,6 +7845,8 @@
+ v 4916 RedCreek Communications Inc 0
+ d 49161960 RedCreek PCI adapter 0
+ v 4943 Growth Networks 0
++v 494f ACCES I/O Products, Inc. 0
++d 494f10e8 LPCI-COM-8SM 0
+ v 4978 Axil Computer Inc 0
+ v 4a14 NetVin 0
+ d 4a145000 NV5000SC 0
+@@ -5896,6 +7854,11 @@
+ v 4b10 Buslogic Inc. 0
+ v 4c48 LUNG HWA Electronics 0
+ v 4c53 SBS Technologies 0
++d 4c530000 PLUSTEST device 0
++s 4c5300004c533000 PLUSTEST card (PC104+) 0
++s 4c5300004c533001 PLUSTEST card (PMC) 0
++d 4c530001 PLUSTEST-MM device 0
++s 4c5300014c533002 PLUSTEST-MM card (PMC) 0
+ v 4ca1 Seanix Technology Inc 0
+ v 4d51 MediaQ Inc. 0
+ d 4d510200 MQ-200 0
+@@ -5926,6 +7889,7 @@
+ v 5143 Qualcomm Inc 0
+ v 5145 Ensoniq (Old) 0
+ d 51453031 Concert AudioPCI 0
++v 5168 Animation Technologies Inc. 0
+ v 5301 Alliance Semiconductor Corp. 0
+ d 53010001 ProMotion aT3D 0
+ v 5333 S3 Inc. 0
+@@ -5997,6 +7961,7 @@
+ d 53338a22 Savage 4 0
+ s 53338a2210338068 Savage 4 0
+ s 53338a2210338069 Savage 4 0
++s 53338a2210338110 Savage4 LT 0
+ s 53338a22105d0018 SR9 8Mb SDRAM 0
+ s 53338a22105d002a SR9 Pro 16Mb SDRAM 0
+ s 53338a22105d003a SR9 Pro 32Mb SDRAM 0
+@@ -6034,8 +7999,9 @@
+ d 53338c10 86C270-294 Savage/MX-MV 0
+ d 53338c11 82C270-294 Savage/MX 0
+ d 53338c12 86C270-294 Savage/IX-MV 0
+-s 53338c121014017f ThinkPad T20 1
++s 53338c121014017f ThinkPad T20 0
+ d 53338c13 86C270-294 Savage/IX 0
++s 53338c1311790001 Magnia Z310 0
+ d 53338c22 SuperSavage MX/128 0
+ d 53338c24 SuperSavage MX/64 0
+ d 53338c26 SuperSavage MX/64C 0
+@@ -6046,9 +8012,10 @@
+ d 53338c2e SuperSavage IX/C SDR 0
+ s 53338c2e101401fc ThinkPad T23 (2647-4MG) 0
+ d 53338c2f SuperSavage IX/C DDR 0
+-d 53338d01 VT8603 [ProSavage PN133] AGP4X VGA Controller (Twister) 0 Integrated in VIA ProSavage PN133 North Bridge
++d 53338d01 86C380 [ProSavageDDR K4M266] 0
+ d 53338d02 VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK) 0
+-d 53338d04 VT8751 [ProSavageDDR P4M266] VGA Controller 0
++d 53338d03 VT8751 [ProSavageDDR P4M266] 0
++d 53338d04 VT8375 [ProSavage8 KM266/KL266] 0
+ d 53339102 86C410 Savage 2000 0
+ s 5333910210925932 Viper II Z200 0
+ s 5333910210925934 Viper II Z200 0
+@@ -6060,6 +8027,7 @@
+ s 5333910210925a57 Viper II Z200 0
+ d 5333ca00 SonicVibes 0
+ v 544c Teralogic Inc 0
++d 544c0350 TL880-based HDTV/ATSC tuner 0
+ v 5455 Technische University Berlin 0
+ d 54554458 S5933 0
+ v 5519 Cnet Technologies, Inc. 0
+@@ -6067,7 +8035,10 @@
+ d 55440001 I-30xx Scanner Interface 0
+ v 5555 Genroco, Inc 0
+ d 55550003 TURBOstor HFP-832 [HiPPI NIC] 0
++v 5654 VoiceTronix Pty Ltd 0
++d 56543132 OpenSwitch12 0
+ v 5700 Netpower 0
++v 5851 Exacq Technologies 0
+ v 6356 UltraStor 0
+ v 6374 c't Magazin fr Computertechnik 0
+ d 63746773 GPPCI 0
+@@ -6081,18 +8052,58 @@
+ v 8008 Quancom Electronic GmbH 0
+ d 80080010 WDOG1 [PCI-Watchdog 1] 0
+ d 80080011 PWDOG2 [PCI-Watchdog 2] 0
++v 807d Asustek Computer, Inc. 0 Wrong ID used in subsystem ID of AsusTek PCI-USB2 PCI card.
+ v 8086 Intel Corp. 0
+ d 80860007 82379AB 0
+ d 80860008 Extended Express System Support Controller 0
+-d 80860039 21145 0
++s 8086000800081000 WorldMark 4300 INCA ASIC 0
++d 80860039 21145 Fast Ethernet 0
+ d 80860122 82437FX 0
+-d 80860482 82375EB 0
+-d 80860483 82424ZX [Saturn] 0
+-d 80860484 82378IB [SIO ISA Bridge] 0
+-d 80860486 82430ZX [Aries] 0
+-d 808604a3 82434LX [Mercury/Neptune] 0
++d 80860309 80303 I/O Processor PCI-to-PCI Bridge 0
++d 8086030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0
++d 80860326 6700/6702PXH I/OxAPIC Interrupt Controller A 0
++d 80860327 6700PXH I/OxAPIC Interrupt Controller B 0
++d 80860329 6700PXH PCI Express-to-PCI Bridge A 0
++d 8086032a 6700PXH PCI Express-to-PCI Bridge B 0
++d 8086032c 6702PXH PCI Express-to-PCI Bridge A 0
++d 80860330 80332 [Dobson] I/O processor 0 A-segment bridge
++d 80860331 80332 [Dobson] I/O processor 0 A-segment IOAPIC
++d 80860332 80332 [Dobson] I/O processor 0 B-segment bridge
++d 80860333 80332 [Dobson] I/O processor 0 B-segment IOAPIC
++d 80860334 80332 [Dobson] I/O processor 0 Address Translation Unit (ATU)
++d 80860335 80331 [Lindsay] I/O processor 0 PCI-X bridge
++d 80860336 80331 [Lindsay] I/O processor 0 Address Translation Unit (ATU)
++d 80860340 41210 [Lanai] Serial to Parallel PCI Bridge 0 A-segment bridge
++d 80860341 41210 [Lanai] Serial to Parallel PCI Bridge 0 B-segment bridge
++d 80860482 82375EB/SB PCI to EISA Bridge 0
++d 80860483 82424TX/ZX [Saturn] CPU to PCI bridge 0
++d 80860484 82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge 0
++d 80860486 82425EX/ZX [Aries] PCIset with ISA bridge 0
++d 808604a3 82434LX/NX [Mercury/Neptune] Processor to PCI bridge 0
+ d 808604d0 82437FX [Triton FX] 0
++d 80860500 E8870 Processor bus control 0
++d 80860501 E8870 Memory controller 0
++d 80860502 E8870 Scalability Port 0 0 and registers common to both SPs
++d 80860503 E8870 Scalability Port 1 0 and global performance monitoring
++d 80860510 E8870IO Hub Interface Port 0 registers (8-bit compatibility port) 0
++d 80860511 E8870IO Hub Interface Port 1 registers 0
++d 80860512 E8870IO Hub Interface Port 2 registers 0
++d 80860513 E8870IO Hub Interface Port 3 registers 0
++d 80860514 E8870IO Hub Interface Port 4 registers 0
++d 80860515 E8870IO General SIOH registers 0
++d 80860516 E8870IO RAS registers 0
++d 80860530 E8870SP Scalability Port 0 registers 0
++d 80860531 E8870SP Scalability Port 1 registers 0
++d 80860532 E8870SP Scalability Port 2 registers 0
++d 80860533 E8870SP Scalability Port 3 registers 0
++d 80860534 E8870SP Scalability Port 4 registers 0
++d 80860535 E8870SP Scalability Port 5 registers 0
++d 80860536 E8870SP Interleave registers 0 and 1 0 (bi-interleave 0) and global registers that are neither per-port nor per-interleave
++d 80860537 E8870SP Interleave registers 2 and 3 0 (bi-interleave 1)
+ d 80860600 RAID Controller 0
++s 80860600808601c1 ICP Vortex GDT8546RZ 0
++s 80860600808601f7 SCRU32 0
++d 8086061f 80303 I/O Processor 0 uninitialized SRCU32 RAID Controller
+ d 80860960 80960RP [i960 RP Microprocessor/Bridge] 0
+ d 80860962 80960RM [i960RM Bridge] 0
+ d 80860964 80960RP [i960 RP Microprocessor/Bridge] 0
+@@ -6105,6 +8116,7 @@
+ d 80861001 82543GC Gigabit Ethernet Controller (Fiber) 0
+ s 808610010e11004a NC6136 Gigabit Server Adapter 0
+ s 80861001101401ea Netfinity Gigabit Ethernet SX Adapter 0
++s 8086100180861002 PRO/1000 F Server Adapter 0
+ s 8086100180861003 PRO/1000 F Server Adapter 0
+ d 80861002 Pro 100 LAN+Modem 56 Cardbus II 0
+ s 808610028086200e Pro 100 LAN+Modem 56 Cardbus II 0
+@@ -6117,39 +8129,100 @@
+ s 8086100480861004 PRO/1000 T Server Adapter 0
+ s 8086100480862004 PRO/1000 T Server Adapter 0
+ d 80861008 82544EI Gigabit Ethernet Controller (Copper) 0
++s 8086100810140269 iSeries 1000/100/10 Ethernet Adapter 0
++s 808610081028011c PRO/1000 XT Network Connection 0
+ s 8086100880861107 PRO/1000 XT Server Adapter 0
+ s 8086100880862107 PRO/1000 XT Server Adapter 0
+ s 8086100880862110 PRO/1000 XT Server Adapter 0
++s 8086100880863108 PRO/1000 XT Network Connection 0
+ d 80861009 82544EI Gigabit Ethernet Controller (Fiber) 0
++s 8086100910140268 iSeries Gigabit Ethernet Adapter 0
+ s 8086100980861109 PRO/1000 XF Server Adapter 0
+ s 8086100980862109 PRO/1000 XF Server Adapter 0
+ d 8086100c 82544GC Gigabit Ethernet Controller (Copper) 0
+ s 8086100c80861112 PRO/1000 T Desktop Adapter 0
+ s 8086100c80862112 PRO/1000 T Desktop Adapter 0
+ d 8086100d 82544GC Gigabit Ethernet Controller (LOM) 0
++s 8086100d10280123 PRO/1000 XT Network Connection 0
++s 8086100d1079891f 82544GC Based Network Connection 0
++s 8086100d4c531080 CT8 mainboard 0
++s 8086100d8086110d 82544GC Based Network Connection 0
+ d 8086100e 82540EM Gigabit Ethernet Controller 0
++s 8086100e10140265 PRO/1000 MT Network Connection 0
++s 8086100e10140267 PRO/1000 MT Network Connection 0
++s 8086100e1014026a PRO/1000 MT Network Connection 0
++s 8086100e1028002e Optiplex GX260 0
++s 8086100e10280151 PRO/1000 MT Network Connection 0
++s 8086100e107b8920 PRO/1000 MT Desktop Adapter 0
+ s 8086100e8086001e PRO/1000 MT Desktop Adapter 0
+ s 8086100e8086002e PRO/1000 MT Desktop Adapter 0
+ d 8086100f 82545EM Gigabit Ethernet Controller (Copper) 0
++s 8086100f10140269 iSeries 1000/100/10 Ethernet Adapter 0
++s 8086100f1014028e PRO/1000 MT Network Connection 0
++s 8086100f80861000 PRO/1000 MT Network Connection 0
+ s 8086100f80861001 PRO/1000 MT Server Adapter 0
+ d 80861010 82546EB Gigabit Ethernet Controller (Copper) 0
++s 808610101014027c PRO/1000 MT Dual Port Network Adapter 0
++s 8086101018fb7872 RESlink-X 0
++s 808610104c531080 CT8 mainboard 0
++s 808610104c5310a0 CA3/CR3 mainboard 0
+ s 8086101080861011 PRO/1000 MT Dual Port Server Adapter 0
++s 808610108086101a PRO/1000 MT Dual Port Network Adapter 0
++s 8086101080863424 SE7501HG2 Mainboard 0
+ d 80861011 82545EM Gigabit Ethernet Controller (Fiber) 0
++s 8086101110140268 iSeries Gigabit Ethernet Adapter 0
+ s 8086101180861002 PRO/1000 MF Server Adapter 0
++s 8086101180861003 PRO/1000 MF Server Adapter (LX) 0
+ d 80861012 82546EB Gigabit Ethernet Controller (Fiber) 0
+ s 8086101280861012 PRO/1000 MF Dual Port Server Adapter 0
++d 80861013 82541EI Gigabit Ethernet Controller (Copper) 0
++s 8086101380860013 PRO/1000 MT Network Connection 0
++s 8086101380861013 IBM ThinkCentre Network Card 0
++s 8086101380861113 PRO/1000 MT Desktop Adapter 0
++d 80861014 82541ER Gigabit Ethernet Controller 0
+ d 80861015 82540EM Gigabit Ethernet Controller (LOM) 0
++d 80861016 82540EP Gigabit Ethernet Controller (LOM) 0
++s 808610161014052c PRO/1000 MT Mobile Connection 0
++s 8086101611790001 PRO/1000 MT Mobile Connection 0
++s 8086101680861016 PRO/1000 MT Mobile Connection 0
++d 80861017 82540EP Gigabit Ethernet Controller (LOM) 0
++s 8086101780861017 PR0/1000 MT Desktop Connection 0
++d 80861018 82541EI Gigabit Ethernet Controller 0 Update controller name from 82541EP to 82541EI
++s 8086101880861018 PRO/1000 MT Desktop Adapter 0
++d 80861019 82547EI Gigabit Ethernet Controller (LOM) 0
++s 8086101914581019 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 8086101980861019 PRO/1000 CT Desktop Connection 0
++s 808610198086301f D865PERL mainboard 0
++s 8086101980863427 S875WP1-E mainboard 0
++d 8086101d 82546EB Gigabit Ethernet Controller 0
++s 8086101d80861000 PRO/1000 MT Quad Port Server Adapter 0
++d 8086101e 82540EP Gigabit Ethernet Controller (Mobile) 0
++s 8086101e10140549 PRO/1000 MT Mobile Connection 0
++s 8086101e11790001 PRO/1000 MT Mobile Connection 0
++s 8086101e8086101e PRO/1000 MT Mobile Connection 0
++d 80861026 82545GM Gigabit Ethernet Controller 0
++s 8086102680861000 PRO/1000 MT Server Connection 0
++s 8086102680861001 PRO/1000 MT Server Adapter 0
++s 8086102680861002 PRO/1000 MT Server Adapter 0
++s 8086102680861026 PRO/1000 MT Server Connection 0
++d 80861027 82545GM Gigabit Ethernet Controller 0
++s 8086102780861001 PRO/1000 MF Server Adapter(LX) 0
++s 8086102780861002 PRO/1000 MF Server Adapter(LX) 0
++s 8086102780861003 PRO/1000 MF Server Adapter(LX) 0
++s 8086102780861027 PRO/1000 MF Server Adapter 0
++d 80861028 82545GM Gigabit Ethernet Controller 0
++s 8086102880861028 PRO/1000 MB Server Adapter 0
+ d 80861029 82559 Ethernet Controller 0
+ d 80861030 82559 InBusiness 10/100 0
+ d 80861031 82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller 0
+-s 8086103110140209 ThinkPad A30p (2653-64G) 0
+-s 8086103110140209 ThinkPad A30p/T30 1
++s 8086103110140209 ThinkPad A/T/X Series 0
+ s 80861031104d80e7 Vaio PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+ s 80861031107b5350 EtherExpress PRO/100 VE 0
+ s 8086103111790001 EtherExpress PRO/100 VE 0
+ s 80861031144dc000 EtherExpress PRO/100 VE 0
+ s 80861031144dc001 EtherExpress PRO/100 VE 0
+ s 80861031144dc003 EtherExpress PRO/100 VE 0
++s 80861031144dc006 vpr Matrix 170B4 0
+ d 80861032 82801CAM (ICH3) PRO/100 VE Ethernet Controller 0
+ d 80861033 82801CAM (ICH3) PRO/100 VM (LOM) Ethernet Controller 0
+ d 80861034 82801CAM (ICH3) PRO/100 VM Ethernet Controller 0
+@@ -6157,28 +8230,90 @@
+ d 80861036 82801CAM (ICH3) 82562EH Ethernet Controller 0
+ d 80861037 82801CAM (ICH3) Chipset Ethernet Controller 0
+ d 80861038 82801CAM (ICH3) PRO/100 VM (KM) Ethernet Controller 0
+-d 80861039 82801BD PRO/100 VE (LOM) Ethernet Controller 0
+-d 8086103a 82801BD PRO/100 VE (CNR) Ethernet Controller 0
+-d 8086103b 82801BD PRO/100 VM (LOM) Ethernet Controller 0
+-d 8086103c 82801BD PRO/100 VM (CNR) Ethernet Controller 0
+-d 8086103d 82801BD PRO/100 VE (MOB) Ethernet Controller 0
+-d 8086103e 82801BD PRO/100 VM (MOB) Ethernet Controller 0
++d 80861039 82801DB PRO/100 VE (LOM) Ethernet Controller 0
++s 8086103910140267 NetVista A30p 0
++d 8086103a 82801DB PRO/100 VE (CNR) Ethernet Controller 0
++d 8086103b 82801DB PRO/100 VM (LOM) Ethernet Controller 0
++d 8086103c 82801DB PRO/100 VM (CNR) Ethernet Controller 0
++d 8086103d 82801DB PRO/100 VE (MOB) Ethernet Controller 0
++d 8086103e 82801DB PRO/100 VM (MOB) Ethernet Controller 0
++d 80861040 536EP Data Fax Modem 0
++s 8086104016be1040 V.9X DSP Data Fax Modem 0
++d 80861043 PRO/Wireless LAN 2100 3B Mini PCI Adapter 0
++s 8086104380862527 MIM2000/Centrino 0
++d 80861048 PRO/10GbE LR Server Adapter 0
++s 808610488086a01f PRO/10GbE LR Server Adapter 0
++s 808610488086a11f PRO/10GbE LR Server Adapter 0
++d 80861050 82562EZ 10/100 Ethernet Controller 0
++s 808610501462728c 865PE Neo2 (MS-6728) 0
++s 808610501462758c MS-6758 (875P Neo) 0
++s 8086105080863427 S875WP1-E mainboard 0
++d 80861051 82801EB/ER (ICH5/ICH5R) integrated LAN Controller 0
+ d 80861059 82551QM Ethernet Controller 0
++d 80861064 82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller 0 ICH-6 Component
++d 80861065 82562ET/EZ/GT/GZ - PRO/100 VE Ethernet Controller 0 ICH-6 Component
++d 80861066 82562 EM/EX/GX - PRO/100 VM (LOM) Ethernet Controller 0 ICH-6 Component
++d 80861067 82562 EM/EX/GX - PRO/100 VM Ethernet Controller 0 ICH-6 Component
++d 80861068 82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller Mobile 0 ICH-6 Component
++d 80861069 82562 EM/EX/GX - PRO/100 VM (LOM) Ethernet Controller Mobile 0 ICH-6 Component
++d 8086106a 82562G \t- PRO/100 VE (LOM) Ethernet Controller 0 ICH-6 Component
++d 8086106b 82562G \t- PRO/100 VE Ethernet Controller Mobile 0 ICH-6 Component
++d 80861075 82547GI Gigabit Ethernet Controller 0
++s 8086107510280165 PowerEdge 750 0
++s 8086107580860075 PRO/1000 CT Network Connection 0
++s 8086107580861075 PRO/1000 CT Network Connection 0
++d 80861076 82541GI/PI Gigabit Ethernet Controller 0
++s 8086107610280165 PowerEdge 750 0
++s 8086107680860076 PRO/1000 MT Network Connection 0
++s 8086107680861076 PRO/1000 MT Network Connection 0
++s 8086107680861176 PRO/1000 MT Desktop Adapter 0
++s 8086107680861276 PRO/1000 MT Desktop Adapter 0
++d 80861077 82541GI Gigabit Ethernet Controller 0
++s 8086107711790001 PRO/1000 MT Mobile Connection 0
++s 8086107780860077 PRO/1000 MT Mobile Connection 0
++s 8086107780861077 PRO/1000 MT Mobile Connection 0
++d 80861078 82541EI Gigabit Ethernet Controller 0
++s 8086107880861078 PRO/1000 MT Network Connection 0
++d 80861079 82546GB Gigabit Ethernet Controller 0
++s 80861079103c12a6 HP Dual Port 1000Base-T [A9900A] 0
++s 80861079103c12cf HP Core Dual Port 1000Base-T [AB352A] 0
++s 808610794c531090 Cx9 / Vx9 mainboard 0
++s 808610794c5310b0 CL9 mainboard 0
++s 8086107980860079 PRO/1000 MT Dual Port Network Connection 0
++s 8086107980861079 PRO/1000 MT Dual Port Network Connection 0
++s 8086107980861179 PRO/1000 MT Dual Port Network Connection 0
++s 808610798086117a PRO/1000 MT Dual Port Server Adapter 0
++d 8086107a 82546GB Gigabit Ethernet Controller 0
++s 8086107a103c12a8 HP Dual Port 1000base-SX [A9899A] 0
++s 8086107a8086107a PRO/1000 MF Dual Port Server Adapter 0
++s 8086107a8086127a PRO/1000 MF Dual Port Server Adapter 0
++d 8086107b 82546GB Gigabit Ethernet Controller 0
++s 8086107b8086007b PRO/1000 MB Dual Port Server Connection 0
++s 8086107b8086107b PRO/1000 MB Dual Port Server Connection 0
++d 80861107 PRO/1000 MF Server Adapter (LX) 0
+ d 80861130 82815 815 Chipset Host Bridge and Memory Controller Hub 0
++s 8086113010251016 Travelmate 612 TX 0
+ s 8086113010438027 TUSL2-C Mainboard 0
+ s 80861130104d80df Vaio PCG-FX403 0
++s 8086113080864532 D815EEA2 mainboard 0
++s 8086113080864557 D815EGEW Mainboard 0
+ d 80861131 82815 815 Chipset AGP Bridge 0
+ d 80861132 82815 CGC [Chipset Graphics Controller] 0
+ s 8086113210251016 Travelmate 612 TX 0
+ s 80861132104d80df Vaio PCG-FX403 0
++s 8086113280864532 D815EEA2 Mainboard 0
++s 8086113280864557 D815EGEW Mainboard 0
+ d 80861161 82806AA PCI64 Hub Advanced Programmable Interrupt Controller 0
+ s 8086116180861161 82806AA PCI64 Hub APIC 0
+ d 80861162 Xscale 80200 Big Endian Companion Chip 0
+ d 80861200 Intel IXP1200 Network Processor 0
+ s 80861200172a0000 AEP SSL Accelerator 0
+-d 80861209 82559ER 0
+-d 80861221 82092AA_0 0
+-d 80861222 82092AA_1 0
++d 80861209 8255xER/82551IT Fast Ethernet Controller 0
++s 808612094c531050 CT7 mainboard 0
++s 808612094c531051 CE7 mainboard 0
++s 808612094c531070 PC6 mainboard 0
++d 80861221 82092AA PCI to PCMCIA Bridge 0
++d 80861222 82092AA IDE Controller 0
+ d 80861223 SAA7116 0
+ d 80861225 82452KX/GX [Orion] 0
+ d 80861226 82596 PRO/10 PCI 0
+@@ -6214,16 +8349,17 @@
+ s 80861229101401f2 10/100 Ethernet Server Adapter 0
+ s 8086122910140207 Ethernet Pro/100 S 0
+ s 8086122910140232 10/100 Dual Port Server Adapter 0
+-s 808612291014023a ThinkPad R30 1
++s 808612291014023a ThinkPad R30 0
+ s 808612291014105c Netfinity 10/100 0
+-s 8086122910142205 ThinkPad A22p 1
++s 8086122910142205 ThinkPad A22p 0
+ s 808612291014305c 10/100 EtherJet Management Adapter 0
+ s 808612291014405c 10/100 EtherJet Adapter with Alert on LAN 0
+ s 808612291014505c 10/100 EtherJet Secure Management Adapter 0
+ s 808612291014605c 10/100 EtherJet Secure Management Adapter 0
+ s 808612291014705c 10/100 Netfinity 10/100 Ethernet Security Adapter 0
+ s 808612291014805c 10/100 Netfinity 10/100 Ethernet Security Adapter 0
+-s 808612291028009b PowerEdge 2550 1
++s 808612291028009b PowerEdge 2500/2550 0
++s 80861229102800ce PowerEdge 1400 0
+ s 8086122910338000 PC-9821X-B06 0
+ s 8086122910338016 PK-UG-X006 0
+ s 808612291033801f PK-UG-X006 0
+@@ -6246,9 +8382,11 @@
+ s 8086122912592560 AT-2560 100 0
+ s 8086122912592561 AT-2560 100 FX Ethernet Adapter 0
+ s 8086122912660001 NE10/100 Adapter 0
++s 8086122913e91000 6221L-4U 0
+ s 80861229144d2501 SEM-2000 MiniPCI LAN Adapter 0
+ s 80861229144d2502 SEM-2100IL MiniPCI LAN Adapter 0
+ s 8086122916681100 EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem) 0
++s 808612294c531080 CT8 mainboard 0
+ s 8086122980860001 EtherExpress PRO/100B (TX) 0
+ s 8086122980860002 EtherExpress PRO/100B (T4) 0
+ s 8086122980860003 EtherExpress PRO/10+ 0
+@@ -6333,6 +8471,7 @@
+ s 8086122980863010 EtherExpress PRO/100 S Network Connection 0
+ s 8086122980863011 EtherExpress PRO/100 S Network Connection 0
+ s 8086122980863012 EtherExpress PRO/100 Network Connection 0
++s 8086122980863411 SDS2 Mainboard 0
+ d 8086122d 430FX - 82437FX TSC [Triton I] 0
+ d 8086122e 82371FB PIIX ISA [Triton I] 0
+ d 80861230 82371FB PIIX IDE [Triton I] 0
+@@ -6340,13 +8479,14 @@
+ d 80861234 430MX - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX) 0
+ d 80861235 430MX - 82437MX Mob. System Ctrlr (MTSC) & 82438MX Data Path (MTDP) 0
+ d 80861237 440FX - 82441FX PMC [Natoma] 0
+-d 80861239 82371FB 0
+-d 8086123b 82380PB 0
+-d 8086123c 82380AB 0
++d 80861239 82371FB PIIX IDE Interface 0
++d 8086123b 82380PB PCI to PCI Docking Bridge 0
++d 8086123c 82380AB (MISA) Mobile PCI-to-ISA Bridge 0
+ d 8086123d 683053 Programmable Interrupt Device 0
++d 8086123e 82466GX (IHPC) Integrated Hot-Plug Controller 0 in" hidden" mode
+ d 8086123f 82466GX Integrated Hot-Plug Controller (IHPC) 0
+-d 80861240 752 AGP 0
+-d 8086124b 82380FB 0
++d 80861240 82752 (752) AGP Graphics Accelerator 0
++d 8086124b 82380FB (MPCI2) Mobile Docking Controller 0
+ d 80861250 430HX - 82439HX TXC [Triton II] 0
+ d 80861360 82806AA PCI64 Hub PCI Bridge 0
+ d 80861361 82806AA PCI64 Hub Controller (HRes) 0
+@@ -6354,6 +8494,8 @@
+ s 8086136180868000 82806AA PCI64 Hub Controller (HRes) 0
+ d 80861460 82870P2 P64H2 Hub PCI Bridge 0
+ d 80861461 82870P2 P64H2 I/OxAPIC 0
++s 8086146115d93480 P4DP6 0
++s 808614614c531090 Cx9 / Vx9 mainboard 0
+ d 80861462 82870P2 P64H2 Hot Plug Controller 0
+ d 80861960 80960RP [i960RP Microprocessor] 0
+ s 80861960101e0431 MegaRAID 431 RAID Controller 0
+@@ -6376,12 +8518,17 @@
+ s 8086196011111111 MegaRAID 466, PowerEdge Expandable RAID Controller 2/SC 0
+ s 8086196011111112 PowerEdge Expandable RAID Controller 2/SC 0
+ s 80861960113c03a2 MegaRAID 0
++s 80861960e4bf1010 CG1-RADIO 0
++s 80861960e4bf1020 CU2-QUARTET 0
++s 80861960e4bf1040 CU1-CHORUS 0
++s 80861960e4bf3100 CX1-BAND 0
+ d 80861962 80960RM [i960RM Microprocessor] 0
+ s 80861962105a0000 SuperTrak SX6000 I2O CPU 0
+ d 80861a21 82840 840 (Carmel) Chipset Host Bridge (Hub A) 0
+ d 80861a23 82840 840 (Carmel) Chipset AGP Bridge 0
+ d 80861a24 82840 840 (Carmel) Chipset PCI Bridge (Hub B) 0
+ d 80861a30 82845 845 (Brookdale) Chipset Host Bridge 0
++s 80861a301028010e Optiplex GX240 0
+ d 80861a31 82845 845 (Brookdale) Chipset AGP Bridge 0
+ d 80862410 82801AA ISA Bridge (LPC) 0
+ d 80862411 82801AA IDE 0
+@@ -6405,23 +8552,41 @@
+ d 80862428 82801AB PCI Bridge 0
+ d 80862440 82801BA ISA Bridge (LPC) 0
+ d 80862442 82801BA/BAM USB (Hub #1) 0
++s 80862442101401c6 Netvista A40/A40p 0
++s 8086244210251016 Travelmate 612 TX 0
++s 808624421028010e Optiplex GX240 0
++s 8086244210438027 TUSL2-C Mainboard 0
+ s 80862442104d80df Vaio PCG-FX403 0
+ s 80862442147b0507 TH7II-RAID 0
++s 8086244280864532 D815EEA2 mainboard 0
++s 8086244280864557 D815EGEW Mainboard 0
+ d 80862443 82801BA/BAM SMBus 0
+-d 80862443 1
++s 80862443101401c6 Netvista A40/A40p 0
++s 8086244310251016 Travelmate 612 TX 0
++s 808624431028010e Optiplex GX240 0
+ s 8086244310438027 TUSL2-C Mainboard 0
+ s 80862443104d80df Vaio PCG-FX403 0
+ s 80862443147b0507 TH7II-RAID 0
++s 8086244380864532 D815EEA2 mainboard 0
++s 8086244380864557 D815EGEW Mainboard 0
+ d 80862444 82801BA/BAM USB (Hub #2) 0
++s 8086244410251016 Travelmate 612 TX 0
++s 808624441028010e Optiplex GX240 0
++s 8086244410438027 TUSL2-C Mainboard 0
+ s 80862444104d80df Vaio PCG-FX403 0
+ s 80862444147b0507 TH7II-RAID 0
++s 8086244480864532 D815EEA2 mainboard 0
+ d 80862445 82801BA/BAM AC'97 Audio 0
++s 80862445101401c6 Netvista A40/A40p 0
++s 8086244510251016 Travelmate 612 TX 0
+ s 80862445104d80df Vaio PCG-FX403 0
+ s 8086244514623370 STAC9721 AC 0
+ s 80862445147b0507 TH7II-RAID 0
++s 8086244580864557 D815EGEW Mainboard 0
+ d 80862446 82801BA/BAM AC'97 Modem 0
++s 8086244610251016 Travelmate 612 TX 0
+ s 80862446104d80df Vaio PCG-FX403 0
+-d 80862448 82801BAM/CAM PCI Bridge 0
++d 80862448 82801 Mobile PCI Bridge 0
+ d 80862449 82801BA/BAM/CA/CAM Ethernet Controller 0
+ s 808624490e110012 EtherExpress PRO/100 VM 0
+ s 808624490e110091 EtherExpress PRO/100 VE 0
+@@ -6436,8 +8601,12 @@
+ s 808624491014023d EtherExpress PRO/100 VE 0
+ s 8086244910140244 EtherExpress PRO/100 VE 0
+ s 8086244910140245 EtherExpress PRO/100 VE 0
++s 8086244910140265 PRO/100 VE Desktop Connection 0
++s 8086244910140267 PRO/100 VE Desktop Connection 0
++s 808624491014026a PRO/100 VE Desktop Connection 0
+ s 80862449109f315d EtherExpress PRO/100 VE 0
+ s 80862449109f3181 EtherExpress PRO/100 VE 0
++s 808624491179ff01 PRO/100 VE Network Connection 0
+ s 8086244911867801 EtherExpress PRO/100 VE 0
+ s 80862449144d2602 HomePNA 1M CNR 0
+ s 8086244980863010 EtherExpress PRO/100 VE 0
+@@ -6453,10 +8622,15 @@
+ s 8086244a10251016 Travelmate 612TX 0
+ s 8086244a104d80df Vaio PCG-FX403 0
+ d 8086244b 82801BA IDE U100 0
++s 8086244b101401c6 Netvista A40/A40p 0
++s 8086244b1028010e Optiplex GX240 0
+ s 8086244b10438027 TUSL2-C Mainboard 0
+ s 8086244b147b0507 TH7II-RAID 0
++s 8086244b80864532 D815EEA2 mainboard 0
++s 8086244b80864557 D815EGEW Mainboard 0
+ d 8086244c 82801BAM ISA Bridge (LPC) 0
+-d 8086244e 82801BA/CA/DB PCI Bridge 0
++d 8086244e 82801 PCI Bridge 0
++s 8086244e10140267 NetVista A30p 0
+ d 80862450 82801E ISA Bridge (LPC) 0
+ d 80862452 82801E USB 0
+ d 80862453 82801E SMBus 0
+@@ -6464,49 +8638,196 @@
+ d 8086245b 82801E IDE U100 0
+ d 8086245d 82801E Ethernet Controller 1 0
+ d 8086245e 82801E PCI Bridge 0
+-d 80862480 82801CA ISA Bridge (LPC) 0
++d 80862480 82801CA LPC Interface Controller 0
+ d 80862482 82801CA/CAM USB (Hub #1) 0
+-s 8086248210140220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248210140220 ThinkPad T23/A30p/T30 1
++s 8086248210140220 ThinkPad A/T/X Series 0
+ s 80862482104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+-d 80862483 82801CA/CAM SMBus 0
+-s 8086248310140220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248310140220 ThinkPad T23/A30p/T30 1
++s 8086248215d93480 P4DP6 0
++s 8086248280861958 vpr Matrix 170B4 0
++s 8086248280863424 SE7501HG2 Mainboard 0
++s 8086248280864541 Latitude C640 0
++d 80862483 82801CA/CAM SMBus Controller 0
++s 8086248310140220 ThinkPad A/T/X Series 0
+ s 80862483104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
++s 8086248315d93480 P4DP6 0
++s 8086248380861958 vpr Matrix 170B4 0
+ d 80862484 82801CA/CAM USB (Hub #2) 0
+-s 8086248410140220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248410140220 ThinkPad T23/A30p/T30 1
++s 8086248410140220 ThinkPad A/T/X Series 0
+ s 80862484104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+-d 80862485 82801CA/CAM AC'97 Audio 0
+-s 8086248510140222 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248510140508 ThinkPad T30 1
++s 8086248415d93480 P4DP6 0
++s 8086248480861958 vpr Matrix 170B4 0
++d 80862485 82801CA/CAM AC'97 Audio Controller 0
++s 8086248510135959 Crystal WMD Audio Codec 0
++s 8086248510140222 ThinkPad T23 (2647-4MG) or A30/A30p (2652/2653) 0
++s 8086248510140508 ThinkPad T30 0
++s 808624851014051c ThinkPad A/T/X Series 0
+ s 80862485104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+-d 80862486 82801CA/CAM AC'97 Modem 0
+-s 8086248610140223 ThinkPad A30p (2653-64G) 0
++s 80862485144dc006 vpr Matrix 170B4 0
++d 80862486 82801CA/CAM AC'97 Modem Controller 0
++s 8086248610140223 ThinkPad A/T/X Series 0
+ s 8086248610140503 ThinkPad R31 2656BBG 0
+-s 808624861014051a ThinkPad T30 1
++s 808624861014051a ThinkPad A/T/X Series 0
++s 80862486101f1025 Acer 620 Series 0
+ s 80862486104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
++s 8086248611790001 Toshiba Satellite 1110 Z15 internal Modem 0
+ s 80862486134d4c21 Dell Inspiron 2100 internal modem 0
+-s 8086248614f15421 Actiontec MD56ORD V.92 MDC Modem 1 Dell Inspiron 4100 internal modem
++s 80862486144d2115 vpr Matrix 170B4 internal modem 0
++s 8086248614f15421 MD56ORD V.92 MDC Modem 0
+ d 80862487 82801CA/CAM USB (Hub #3) 0
+-s 8086248710140220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248710140220 ThinkPad T23/A30p/T30 1
++s 8086248710140220 ThinkPad A/T/X Series 0
+ s 80862487104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
++s 8086248715d93480 P4DP6 0
++s 8086248780861958 vpr Matrix 170B4 0
+ d 8086248a 82801CAM IDE U100 0
+-s 8086248a10140220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
+-s 8086248a10140220 ThinkPad T23/A30p/T30 1
++s 8086248a10140220 ThinkPad A/T/X Series 0
+ s 8086248a104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+-d 8086248b 82801CA IDE U100 0
++s 8086248a80861958 vpr Matrix 170B4 0
++s 8086248a80864541 Latitude C640 0
++d 8086248b 82801CA Ultra ATA Storage Controller 0
++s 8086248b15d93480 P4DP6 0
+ d 8086248c 82801CAM ISA Bridge (LPC) 0
+-d 808624c0 82801DB ISA Bridge (LPC) 0
+-d 808624c2 82801DB USB (Hub #1) 0
+-d 808624c3 82801DB SMBus 0
+-d 808624c4 82801DB USB (Hub #2) 0
+-d 808624c5 82801DB AC'97 Audio 0
+-d 808624c6 82801DB AC'97 Modem 0
+-d 808624c7 82801DB USB (Hub #3) 0
+-d 808624cb 82801DB ICH4 IDE 0
+-d 808624cd 82801DB USB EHCI Controller 0
++d 808624c0 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge 0
++s 808624c010140267 NetVista A30p 0
++s 808624c014625800 845PE Max (MS-6580) 0
++d 808624c1 82801DBL (ICH4-L) IDE Controller 0
++d 808624c2 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1 0
++s 808624c210140267 NetVista A30p 0
++s 808624c21025005a TravelMate 290 0
++s 808624c210280126 Optiplex GX260 0
++s 808624c210280163 Latitude D505 0
++s 808624c2103c0890 NC6000 laptop 0
++s 808624c210718160 MIM2000 0
++s 808624c214625800 845PE Max (MS-6580) 0
++s 808624c215092990 Averatec 5110H laptop 0
++s 808624c24c531090 Cx9 / Vx9 mainboard 0
++d 808624c3 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller 0
++s 808624c310140267 NetVista A30p 0
++s 808624c31025005a TravelMate 290 0
++s 808624c310280126 Optiplex GX260 0
++s 808624c3103c0890 NC6000 laptop 0
++s 808624c310718160 MIM2000 0
++s 808624c3145824c2 GA-8PE667 Ultra 0
++s 808624c314625800 845PE Max (MS-6580) 0
++s 808624c34c531090 Cx9 / Vx9 mainboard 0
++d 808624c4 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2 0
++s 808624c410140267 NetVista A30p 0
++s 808624c41025005a TravelMate 290 0
++s 808624c410280126 Optiplex GX260 0
++s 808624c410280163 Latitude D505 0
++s 808624c4103c0890 NC6000 laptop 0
++s 808624c410718160 MIM2000 0
++s 808624c414625800 845PE Max (MS-6580) 0
++s 808624c415092990 Averatec 5110H 0
++s 808624c44c531090 Cx9 / Vx9 mainboard 0
++d 808624c5 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller 0
++s 808624c50e1100b8 Analog Devices Inc. codec [SoundMAX] 0
++s 808624c510140267 NetVista A30p 0
++s 808624c51025005a TravelMate 290 0
++s 808624c510280163 Latitude D505 0
++s 808624c5103c0890 NC6000 laptop 0
++s 808624c510718160 MIM2000 0
++s 808624c51458a002 GA-8PE667 Ultra 0
++s 808624c514625800 845PE Max (MS-6580) 0
++d 808624c6 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller 0
++s 808624c61025005a TravelMate 290 0
++s 808624c6103c0890 NC6000 laptop 0
++s 808624c610718160 MIM2000 0
++d 808624c7 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3 0
++s 808624c710140267 NetVista A30p 0
++s 808624c71025005a TravelMate 290 0
++s 808624c710280126 Optiplex GX260 0
++s 808624c710280163 Latitude D505 0
++s 808624c7103c0890 NC6000 laptop 0
++s 808624c710718160 MIM2000 0
++s 808624c714625800 845PE Max (MS-6580) 0
++s 808624c715092990 Averatec 5110H 0
++s 808624c74c531090 Cx9 / Vx9 mainboard 0
++d 808624ca 82801DBM (ICH4-M) IDE Controller 0
++s 808624ca1025005a TravelMate 290 0
++s 808624ca10280163 Latitude D505 0
++s 808624ca103c0890 NC6000 laptop 0
++s 808624ca10718160 MIM2000 0
++d 808624cb 82801DB (ICH4) IDE Controller 0
++s 808624cb10140267 NetVista A30p 0
++s 808624cb10280126 Optiplex GX260 0
++s 808624cb145824c2 GA-8PE667 Ultra 0
++s 808624cb14625800 845PE Max (MS-6580) 0
++s 808624cb4c531090 Cx9 / Vx9 mainboard 0
++d 808624cc 82801DBM (ICH4-M) LPC Interface Bridge 0
++d 808624cd 82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller 0
++s 808624cd10140267 NetVista A30p 0
++s 808624cd1025005a TravelMate 290 0
++s 808624cd10280126 Optiplex GX260 0
++s 808624cd10280163 Latitude D505 0
++s 808624cd103c0890 NC6000 laptop 0
++s 808624cd10718160 MIM2000 0
++s 808624cd14623981 845PE Max (MS-6580) 0
++s 808624cd15091968 Averatec 5110H 0
++s 808624cd4c531090 Cx9 / Vx9 mainboard 0
++d 808624d0 82801EB/ER (ICH5/ICH5R) LPC Interface Bridge 0
++d 808624d1 82801EB (ICH5) SATA Controller 0
++s 808624d1103c12bc d530 CMT (DG746A) 0
++s 808624d1145824d1 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624d114627280 865PE Neo2 (MS-6728) 0
++s 808624d180863427 S875WP1-E mainboard 0
++s 808624d18086524c D865PERL mainboard 0
++d 808624d2 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 0
++s 808624d2103c12bc d530 CMT (DG746A) 0
++s 808624d2104380a6 P4P800 Mainboard 0
++s 808624d2145824d2 GA-8KNXP motherboard (875P) 0
++s 808624d214627280 865PE Neo2 (MS-6728) 0
++s 808624d280863427 S875WP1-E mainboard 0
++s 808624d28086524c D865PERL mainboard 0
++d 808624d3 82801EB/ER (ICH5/ICH5R) SMBus Controller 0
++s 808624d3104380a6 P4P800 Mainboard 0
++s 808624d3145824d2 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624d314627280 865PE Neo2 (MS-6728) 0
++s 808624d380863427 S875WP1-E mainboard 0
++s 808624d38086524c D865PERL mainboard 0
++d 808624d4 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 0
++s 808624d4103c12bc d530 CMT (DG746A) 0
++s 808624d4104380a6 P4P800 Mainboard 0
++s 808624d4145824d2 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624d414627280 865PE Neo2 (MS-6728) 0
++s 808624d480863427 S875WP1-E mainboard 0
++s 808624d48086524c D865PERL mainboard 0
++d 808624d5 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller 0
++s 808624d5103c12bc Analog Devices codec [SoundMAX Integrated Digital Audio] 0
++s 808624d5104380f3 P4P800 Mainboard 0
++s 808624d51458a002 GA-8KNXP motherboard (875P) 0
++s 808624d514627280 865PE Neo2 (MS-6728) 0
++s 808624d58086a000 D865PERL mainboard 0
++d 808624d6 82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller 0
++d 808624d7 82801EB/ER (ICH5/ICH5R) USB UHCI #3 0
++s 808624d7103c12bc d530 CMT (DG746A) 0
++s 808624d7104380a6 P4P800 Mainboard 0
++s 808624d7145824d2 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624d714627280 865PE Neo2 (MS-6728) 0
++s 808624d780863427 S875WP1-E mainboard 0
++s 808624d78086524c D865PERL mainboard 0
++d 808624db 82801EB/ER (ICH5/ICH5R) IDE Controller 0
++s 808624db103c12bc d530 CMT (DG746A) 0
++s 808624db104380a6 P4P800 Mainboard 0
++s 808624db145824d2 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624db14627280 865PE Neo2 (MS-6728) 0
++s 808624db14627580 MSI 875P 0
++s 808624db80863427 S875WP1-E mainboard 0
++s 808624db8086524c D865PERL mainboard 0
++d 808624dc 82801EB (ICH5) LPC Interface Bridge 0
++d 808624dd 82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller 0
++s 808624dd103c12bc d530 CMT (DG746A) 0
++s 808624dd104380a6 P4P800 Mainboard 0
++s 808624dd14585006 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624dd14627280 865PE Neo2 (MS-6728) 0
++s 808624dd80863427 S875WP1-E mainboard 0
++s 808624dd8086524c D865PERL mainboard 0
++d 808624de 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4 0
++s 808624de104380a6 P4P800 Mainboard 0
++s 808624de145824d2 GA-8IPE1000 Pro2 motherboard (865PE) 0
++s 808624de14627280 865PE Neo2 (MS-6728) 0
++s 808624de80863427 S875WP1-E mainboard 0
++s 808624de8086524c D865PERL mainboard 0
++d 808624df 82801ER (ICH5R) SATA Controller 0
+ d 80862500 82820 820 (Camino) Chipset Host Bridge (MCH) 0
+ s 8086250010280095 Precision Workstation 220 Chipset 0
+ s 808625001043801c P3C-2000 system chipset 0
+@@ -6522,24 +8843,188 @@
+ d 80862532 82850 850 (Tehama) Chipset AGP Bridge 0
+ d 80862533 82860 860 (Wombat) Chipset AGP Bridge 0
+ d 80862534 82860 860 (Wombat) Chipset PCI Bridge 0
+-d 80862540 e7500 [Plumas] DRAM Controller 0
+-d 80862541 e7500 [Plumas] DRAM Controller Error Reporting 0
+-d 80862543 e7500 [Plumas] HI_B Virtual PCI Bridge (F0) 0
+-d 80862544 e7500 [Plumas] HI_B Virtual PCI Bridge (F1) 0
+-d 80862545 e7500 [Plumas] HI_C Virtual PCI Bridge (F0) 0
+-d 80862546 e7500 [Plumas] HI_C Virtual PCI Bridge (F1) 0
+-d 80862547 e7500 [Plumas] HI_D Virtual PCI Bridge (F0) 0
+-d 80862548 e7500 [Plumas] HI_D Virtual PCI Bridge (F1) 0
+-d 80862560 82845G/GL [Brookdale-G] Chipset Host Bridge 0
+-d 80862561 82845G/GL [Brookdale-G] Chipset AGP Bridge 0
+-d 80862562 82845G/GL [Brookdale-G] Chipset Integrated Graphics Device 0
++d 80862540 E7500 Memory Controller Hub 0
++s 8086254015d93480 P4DP6 0
++d 80862541 E7500/E7501 Host RASUM Controller 0
++s 8086254115d93480 P4DP6 0
++s 808625414c531090 Cx9 / Vx9 mainboard 0
++s 8086254180863424 SE7501HG2 Mainboard 0
++d 80862543 E7500/E7501 Hub Interface B PCI-to-PCI Bridge 0
++d 80862544 E7500/E7501 Hub Interface B RASUM Controller 0
++s 808625444c531090 Cx9 / Vx9 mainboard 0
++d 80862545 E7500/E7501 Hub Interface C PCI-to-PCI Bridge 0
++d 80862546 E7500/E7501 Hub Interface C RASUM Controller 0
++d 80862547 E7500/E7501 Hub Interface D PCI-to-PCI Bridge 0
++d 80862548 E7500/E7501 Hub Interface D RASUM Controller 0
++d 8086254c E7501 Memory Controller Hub 0
++s 8086254c4c531090 Cx9 / Vx9 mainboard 0
++s 8086254c80863424 SE7501HG2 Mainboard 0
++d 80862550 E7505 Memory Controller Hub 0
++d 80862551 E7505/E7205 Series RAS Controller 0
++d 80862552 E7505/E7205 PCI-to-AGP Bridge 0
++d 80862553 E7505 Hub Interface B PCI-to-PCI Bridge 0
++d 80862554 E7505 Hub Interface B PCI-to-PCI Bridge RAS Controller 0
++d 8086255d E7205 Memory Controller Hub 0
++d 80862560 82845G/GL[Brookdale-G]/GE/PE DRAM Controller/Host-Hub Interface 0
++s 8086256010280126 Optiplex GX260 0
++s 8086256014582560 GA-8PE667 Ultra 0
++s 8086256014625800 845PE Max (MS-6580) 0
++d 80862561 82845G/GL[Brookdale-G]/GE/PE Host-to-AGP Bridge 0
++d 80862562 82845G/GL[Brookdale-G]/GE Chipset Integrated Graphics Device 0
++s 8086256210140267 NetVista A30p 0
++d 80862570 82865G/PE/P DRAM Controller/Host-Hub Interface 0
++s 80862570104380f2 P4P800 Mainboard 0
++s 8086257014582570 GA-8IPE1000 Pro2 motherboard (865PE) 0
++d 80862571 82865G/PE/P PCI to AGP Controller 0
++d 80862572 82865G Integrated Graphics Device 0
++d 80862573 82865G/PE/P PCI to CSA Bridge 0
++d 80862576 82865G/PE/P Processor to I/O Memory Interface 0
++d 80862578 82875P/E7210 Memory Controller Hub 0
++s 8086257814582578 GA-8KNXP motherboard (875P) 0
++s 8086257814627580 MS-6758 (875P Neo) 0
++s 8086257815d94580 Super Micro Computer Inc. P4SCE 0 Motherboard P4SCE
++d 80862579 82875P Processor to AGP Controller 0
++d 8086257b 82875P/E7210 Processor to PCI to CSA Bridge 0
++d 8086257e 82875P/E7210 Processor to I/O Memory Interface 0
++d 80862580 915G/P/GV Processor to I/O Controller 0
++d 80862581 915G/P/GV PCI Express Root Port 0
++d 80862582 82915G Express Chipset Family Graphics Controller 0
++s 8086258210281079 Optiplex GX280 0
++d 80862584 925X/XE Memory Controller Hub 0
++d 80862585 925X/XE PCI Express Root Port 0
++d 80862588 E7220/E7221 Memory Controller Hub 0
++d 80862589 E7220/E7221 PCI Express Root Port 0
++d 8086258a E7221 Integrated Graphics Controller 0
++d 80862590 Mobile Memory Controller Hub 0
++d 80862591 Mobile Memory Controller Hub PCI Express Port 0
++d 80862592 Mobile Graphics Controller 0
++d 808625a1 6300ESB LPC Interface Controller 0
++d 808625a2 6300ESB PATA Storage Controller 0
++s 808625a24c5310b0 CL9 mainboard 0
++d 808625a3 6300ESB SATA Storage Controller 0
++s 808625a34c5310b0 CL9 mainboard 0
++d 808625a4 6300ESB SMBus Controller 0
++s 808625a44c5310b0 CL9 mainboard 0
++d 808625a6 6300ESB AC'97 Audio Controller 0
++s 808625a64c5310b0 CL9 mainboard 0
++d 808625a7 6300ESB AC'97 Modem Controller 0
++d 808625a9 6300ESB USB Universal Host Controller 0
++s 808625a94c5310b0 CL9 mainboard 0
++d 808625aa 6300ESB USB Universal Host Controller 0
++s 808625aa4c5310b0 CL9 mainboard 0
++d 808625ab 6300ESB Watchdog Timer 0
++s 808625ab4c5310b0 CL9 mainboard 0
++d 808625ac 6300ESB I/O Advanced Programmable Interrupt Controller 0
++s 808625ac4c5310b0 CL9 mainboard 0
++d 808625ad 6300ESB USB2 Enhanced Host Controller 0
++d 808625ae 6300ESB 64-bit PCI-X Bridge 0
++d 808625b0 6300ESB SATA RAID Controller 0
++d 80862600 Server Hub Interface 0
++d 80862601 Server Hub PCI Express x4 Port D 0
++d 80862602 Server Hub PCI Express x4 Port C0 0
++d 80862603 Server Hub PCI Express x4 Port C1 0
++d 80862604 Server Hub PCI Express x4 Port B0 0
++d 80862605 Server Hub PCI Express x4 Port B1 0
++d 80862606 Server Hub PCI Express x4 Port A0 0
++d 80862607 Server Hub PCI Express x4 Port A1 0
++d 80862608 Server Hub PCI Express x8 Port C 0
++d 80862609 Server Hub PCI Express x8 Port B 0
++d 8086260a Server Hub PCI Express x8 Port A 0
++d 8086260c Server Hub IMI Registers 0
++d 80862610 Server Hub System Bus, Boot, and Interrupt Registers 0
++d 80862611 Server Hub Address Mapping Registers 0
++d 80862612 Server Hub RAS Registers 0
++d 80862613 Server Hub Reserved Registers 0
++d 80862614 Server Hub Reserved Registers 0
++d 80862615 Server Hub Miscellaneous Registers 0
++d 80862617 Server Hub Reserved Registers 0
++d 80862618 Server Hub Reserved Registers 0
++d 80862619 Server Hub Reserved Registers 0
++d 8086261a Server Hub Reserved Registers 0
++d 8086261b Server Hub Reserved Registers 0
++d 8086261c Server Hub Reserved Registers 0
++d 8086261d Server Hub Reserved Registers 0
++d 8086261e Server Hub Reserved Registers 0
++d 80862620 External Memory Bridge 0
++d 80862621 External Memory Bridge Control Registers 0
++d 80862622 External Memory Bridge Memory Interleaving Registers 0
++d 80862623 External Memory Bridge DDR Initialization and Calibration 0
++d 80862624 External Memory Bridge Reserved Registers 0
++d 80862625 External Memory Bridge Reserved Registers 0
++d 80862626 External Memory Bridge Reserved Registers 0
++d 80862627 External Memory Bridge Reserved Registers 0
++d 80862640 82801FB/FR (ICH6/ICH6R) LPC Interface Bridge 0
++d 80862641 82801FBM (ICH6M) LPC Interface Bridge 0
++d 80862642 82801FW/FRW (ICH6W/ICH6RW) LPC Interface Bridge 0
++d 80862651 82801FB/FW (ICH6/ICH6W) SATA Controller 0
++s 8086265110280179 Optiplex GX280 0
++d 80862652 82801FR/FRW (ICH6R/ICH6RW) SATA Controller 0
++d 80862653 82801FBM (ICH6M) SATA Controller 0
++d 80862658 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1 0
++s 8086265810280179 Optiplex GX280 0
++d 80862659 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2 0
++s 8086265910280179 Optiplex GX280 0
++d 8086265a 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3 0
++s 8086265a10280179 Optiplex GX280 0
++d 8086265b 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4 0
++s 8086265b10280179 Optiplex GX280 0
++d 8086265c 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller 0
++s 8086265c10280179 Optiplex GX280 0
++d 80862660 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1 0
++d 80862662 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2 0
++d 80862664 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3 0
++d 80862666 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4 0
++d 80862668 82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller 0
++d 8086266a 82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller 0
++s 8086266a10280179 Optiplex GX280 0
++d 8086266c 82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller 0
++d 8086266d 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Modem Controller 0
++d 8086266e 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller 0
++s 8086266e10280179 Optiplex GX280 0
++d 8086266f 82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller 0
++d 80862782 82915G Express Chipset Family Graphics Controller 0
++d 80862792 Mobile Graphics Controller 0
+ d 80863092 Integrated RAID 0
++d 80863200 GD31244 PCI-X SATA HBA 0
++d 80863340 82855PM Processor to I/O Controller 0
++s 808633401025005a TravelMate 290 0
++s 80863340103c0890 NC6000 laptop 0
++d 80863341 82855PM Processor to AGP Controller 0
+ d 80863575 82830 830 Chipset Host Bridge 0
+-s 808635751014021d ThinkPad T23 (2647-4MG) or A30p (2653-64G) 0
++s 808635751014021d ThinkPad A/T/X Series 0
+ s 80863575104d80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0
+ d 80863576 82830 830 Chipset AGP Bridge 0
+ d 80863577 82830 CGC [Chipset Graphics Controller] 0
++s 8086357710140513 ThinkPad A/T/X Series 0
+ d 80863578 82830 830 Chipset Host Bridge 0
++d 80863580 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 0
++s 8086358010280163 Latitude D505 0
++s 808635804c5310b0 CL9 mainboard 0
++d 80863581 82852/82855 GM/GME/PM/GMV Processor to AGP Controller 0
++d 80863582 82852/855GM Integrated Graphics Device 0
++s 8086358210280163 Latitude D505 0
++s 808635824c5310b0 CL9 mainboard 0
++d 80863584 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 0
++s 8086358410280163 Latitude D505 0
++s 808635844c5310b0 CL9 mainboard 0
++d 80863585 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 0
++s 8086358510280163 Latitude D505 0
++s 808635854c5310b0 CL9 mainboard 0
++d 80863590 E7520 Memory Controller Hub 0
++d 80863591 E7525/E7520 Error Reporting Registers 0
++d 80863592 E7320 Memory Controller Hub 0
++d 80863593 E7320 Error Reporting Registers 0
++d 80863594 E7520 DMA Controller 0
++d 80863595 E7525/E7520/E7320 PCI Express Port A 0
++d 80863596 E7525/E7520/E7320 PCI Express Port A1 0
++d 80863597 E7525/E7520 PCI Express Port B 0
++d 80863598 E7520 PCI Express Port B1 0
++d 80863599 E7520 PCI Express Port C 0
++d 8086359a E7520 PCI Express Port C1 0
++d 8086359b E7525/E7520/E7320 Extended Configuration Registers 0
++d 8086359e E7525 Memory Controller Hub 0
++d 80864220 PRO/Wireless 2200BG 0
++d 80864223 PRO/Wireless 2915ABG MiniPCI Adapter 0
+ d 80865200 EtherExpress PRO/100 Intelligent Server 0
+ d 80865201 EtherExpress PRO/100 Intelligent Server 0
+ s 8086520180860001 EtherExpress PRO/100 Server Ethernet Adapter 0
+@@ -6548,13 +9033,23 @@
+ d 80867010 82371SB PIIX3 IDE [Natoma/Triton II] 0
+ d 80867020 82371SB PIIX3 USB [Natoma/Triton II] 0
+ d 80867030 430VX - 82437VX TVX [Triton VX] 0
++d 80867050 Intel Intercast Video Capture Card 0
+ d 80867100 430TX - 82439TX MTXC 0
+ d 80867110 82371AB/EB/MB PIIX4 ISA 0
++s 8086711015ad1976 virtualHW v3 0
+ d 80867111 82371AB/EB/MB PIIX4 IDE 0
++s 8086711115ad1976 virtualHW v3 0
+ d 80867112 82371AB/EB/MB PIIX4 USB 0
++s 8086711215ad1976 virtualHW v3 0
+ d 80867113 82371AB/EB/MB PIIX4 ACPI 0
++s 8086711315ad1976 virtualHW v3 0
+ d 80867120 82810 GMCH [Graphics Memory Controller Hub] 0
++s 808671204c531040 CL7 mainboard 0
++s 808671204c531060 PC7 mainboard 0
+ d 80867121 82810 CGC [Chipset Graphics Controller] 0
++s 808671214c531040 CL7 mainboard 0
++s 808671214c531060 PC7 mainboard 0
++s 8086712180864341 Cayman (CA810) Mainboard 0
+ d 80867122 82810 DC-100 GMCH [Graphics Memory Controller Hub] 0
+ d 80867123 82810 DC-100 CGC [Chipset Graphics Controller] 0
+ d 80867124 82810E DC-133 GMCH [Graphics Memory Controller Hub] 0
+@@ -6566,12 +9061,20 @@
+ d 80867181 440LX/EX - 82443LX/EX AGP bridge 0
+ d 80867190 440BX/ZX/DX - 82443BX/ZX/DX Host bridge 0
+ s 808671900e110500 Armada 1750 Laptop System Chipset 0
++s 808671900e11b110 Armada M700/E500 0
+ s 8086719011790001 Toshiba Tecra 8100 Laptop System Chipset 0
++s 8086719015ad1976 virtualHW v3 0
++s 808671904c531050 CT7 mainboard 0
++s 808671904c531051 CE7 mainboard 0
+ d 80867191 440BX/ZX/DX - 82443BX/ZX/DX AGP bridge 0
+ d 80867192 440BX/ZX/DX - 82443BX/ZX/DX Host bridge (AGP disabled) 0
+ s 808671920e110460 Armada 1700 Laptop System Chipset 0
++s 808671924c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
+ d 80867194 82440MX Host Bridge 0
++s 8086719410330000 Versa Note Vxi 0
++s 808671944c5310a0 CA3/CR3 mainboard 0
+ d 80867195 82440MX AC'97 Audio Controller 0
++s 80867195103380cc Versa Note VXi 0
+ s 8086719510cf1099 QSound_SigmaTel Stac97 PCI Audio 0
+ s 8086719511d40040 SoundMAX Integrated Digital Audio 0
+ s 8086719511d40048 SoundMAX Integrated Digital Audio 0
+@@ -6581,13 +9084,16 @@
+ d 8086719a 82440MX USB Universal Host Controller 0
+ d 8086719b 82440MX Power Management Controller 0
+ d 808671a0 440GX - 82443GX Host bridge 0
++s 808671a04c531050 CT7 mainboard 0
++s 808671a04c531051 CE7 mainboard 0
+ d 808671a1 440GX - 82443GX AGP bridge 0
+ d 808671a2 440GX - 82443GX Host bridge (AGP disabled) 0
++s 808671a24c531000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard 0
+ d 80867600 82372FB PIIX5 ISA 0
+ d 80867601 82372FB PIIX5 IDE 0
+ d 80867602 82372FB PIIX5 USB 0
+ d 80867603 82372FB PIIX5 SMBus 0
+-d 80867800 i740 0
++d 80867800 82740 (i740) AGP Graphics Accelerator 0
+ s 80867800003d0008 Starfighter AGP 0
+ s 80867800003d000b Starfighter AGP 0
+ s 8086780010920100 Stealth II G460 0
+@@ -6606,23 +9112,36 @@
+ d 808684e4 460GX - 84460GX Memory Data Controller (MDC) 0
+ d 808684e6 460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB) 0
+ d 808684ea 460GX - 84460GX AGP Bridge (GXB function 1) 0
++d 80868500 IXP4XX - Intel Network Processor family. IXP420, IXP421, IXP422, IXP425 and IXC1100 0
++d 80869000 IXP2000 Family Network Processor 0
++d 80869001 IXP2400 Network Processor 0
++d 80869004 IXP2800 Network Processor 0
+ d 80869621 Integrated RAID 0
+ d 80869622 Integrated RAID 0
+ d 80869641 Integrated RAID 0
+ d 808696a1 Integrated RAID 0
++d 8086a01f PRO/10GbE LR Server Adapter 0 retail verson
++d 8086a11f PRO/10GbE LR Server Adapter 0 OEM version
+ d 8086b152 21152 PCI-to-PCI Bridge 0
+ d 8086b154 21154 PCI-to-PCI Bridge 0 observed, and documented in Intel revision note; new mask of 1011:0026
+ d 8086b555 21555 Non transparent PCI-to-PCI Bridge 0
++s 8086b55512d9000a PCI VoIP Gateway 0
++s 8086b5554c531050 CT7 mainboard 0
++s 8086b5554c531051 CE7 mainboard 0
+ s 8086b555e4bf1000 CC8-1-BLUES 0
+ d 8086ffff 450NX/GX [Orion] - 82453KX/GX Memory controller [BUG] 0
++v 8401 TRENDware International Inc. 0
+ v 8800 Trigem Computer Inc. 0
+ d 88002008 Video assistent component 0
+ v 8866 T-Square Design Inc. 0
+ v 8888 Silicon Magic 0
++v 8c4a Winbond 0 8c4a is not Winbond but there is a board misprogrammed
++d 8c4a1980 W89C940 misprogrammed [ne2k] 0
+ v 8e0e Computone Corporation 0
+ v 8e2e KTI 0
+ d 8e2e3000 ET32P2 0
+ v 9004 Adaptec 0
++d 90040078 AHA-2940U_CN 0
+ d 90041078 AIC-7810 0
+ d 90041160 AIC-1160 [Family Fibre Channel Adapter] 0
+ d 90042178 AIC-7821 0
+@@ -6685,6 +9204,8 @@
+ d 90047478 AHA-2944/2944W / AIC-7874 0
+ d 90047578 AHA-3944/3944W / AIC-7875 0
+ d 90047678 AHA-4944W/UW / AIC-7876 0
++d 90047710 ANA-7711F Network Accelerator Card (NAC) - Optical 0
++d 90047711 ANA-7711C Network Accelerator Card (NAC) - Copper 0
+ d 90047778 AIC-787x 0
+ d 90047810 AIC-7810 0
+ d 90047815 AIC-7815 RAID+Memory Controller IC 0
+@@ -6733,11 +9254,13 @@
+ d 90050010 AHA-2940U2/U2W 0
+ s 9005001090052180 AHA-2940U2 SCSI Controller 0
+ s 9005001090058100 AHA-2940U2B SCSI Controller 0
++s 900500109005a100 AHA-2940U2B SCSI Controller 0
+ s 900500109005a180 AHA-2940U2W SCSI Controller 0
+ s 900500109005e100 AHA-2950U2B SCSI Controller 0
+ d 90050011 AHA-2930U2 0
+ d 90050013 78902 0
+ s 9005001390050003 AAA-131U2 Array1000 1 Channel RAID Controller 0
++s 900500139005000f AIC7890_ARO 0
+ d 9005001f AHA-2940U2/U2W / 7890/7891 0
+ s 9005001f9005000f 2940U2W SCSI Controller 0
+ s 9005001f9005a180 2940U2W SCSI Controller 0
+@@ -6747,6 +9270,7 @@
+ d 9005003f AIC-7890 0
+ d 90050050 AHA-3940U2x/395U2x 0
+ s 900500509005f500 AHA-3950U2B 0
++s 900500509005ffff AHA-3950U2B 0
+ d 90050051 AHA-3950U2D 0
+ s 900500519005b500 AHA-3950U2D 0
+ d 90050053 AIC-7896 SCSI Controller 0
+@@ -6754,6 +9278,7 @@
+ d 9005005f AIC-7896U2/7897U2 0
+ d 90050080 AIC-7892A U160/m 0
+ s 900500800e11e2a0 Compaq 64-Bit/66MHz Wide Ultra3 SCSI Adapter 0
++s 9005008090056220 AHA-29160C 0
+ s 90050080900562a0 29160N Ultra160 SCSI Controller 0
+ s 900500809005e220 29160LP Low Profile Ultra160 SCSI Controller 0
+ s 900500809005e2a0 29160 Ultra160 SCSI Controller 0
+@@ -6761,36 +9286,77 @@
+ s 90050081900562a1 19160 Ultra160 SCSI Controller 0
+ d 90050083 AIC-7892D U160/m 0
+ d 9005008f AIC-7892P U160/m 0
++s 9005008f11790001 Magnia Z310 0
++s 9005008f15d99005 Onboard SCSI Host Adapter 0
+ d 900500c0 AHA-3960D / AIC-7899A U160/m 0
+ s 900500c00e11f620 Compaq 64-Bit/66MHz Dual Channel Wide Ultra3 SCSI Adapter 0
+ s 900500c09005f620 AHA-3960D U160/m 0
+ d 900500c1 AIC-7899B U160/m 0
+ d 900500c3 AIC-7899D U160/m 0
+ d 900500c5 RAID subsystem HBA 0
+-s 900500c5102800c5 PowerEdge 2550 1
++s 900500c5102800c5 PowerEdge 2400,2500,2550,4400 0
+ d 900500cf AIC-7899P U160/m 0
+-s 900500cf102800d1 PowerEdge 2550 1
++s 900500cf102800ce PowerEdge 1400 0
++s 900500cf102800d1 PowerEdge 2550 0
++s 900500cf102800d9 PowerEdge 2500 0
++s 900500cf10f12462 Thunder K7 S2462 0
++s 900500cf15d99005 Onboard SCSI Host Adapter 0
++s 900500cf80863411 SDS2 Mainboard 0
+ d 90050250 ServeRAID Controller 0
+ s 9005025010140279 ServeRAID-xx 0
+ s 900502501014028c ServeRAID-xx 0
++d 90050279 ServeRAID 6M 0 from kernel sources
++d 90050283 AAC-RAID 0
++s 9005028390050283 Catapult 0
++d 90050284 AAC-RAID 0
++s 9005028490050284 Tomcat 0
+ d 90050285 AAC-RAID 0
++s 900502850e110295 SATA 6Ch (Bearcat) 0
+ s 9005028510280287 PowerEdge Expandable RAID Controller 320/DC 0
++s 9005028510280291 CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) 0
++s 9005028517aa0286 Legend S220 (Legend Crusader) 0
++s 9005028517aa0287 Legend S230 (Legend Vulcan) 0
++s 9005028590050285 2200S (Vulcan) 0
++s 9005028590050286 2120S (Crusader) 0
++s 9005028590050287 2200S (Vulcan-2m) 0
++s 9005028590050288 3230S (Harrier) 0
++s 9005028590050289 3240S (Tornado) 0
++s 900502859005028a ASR-2020S PCI-X ZCR (Skyhawk) 0
++s 900502859005028b ASR-2020S SO-DIMM PCI-X ZCR (Terminator) 0
++s 9005028590050290 AAR-2410SA PCI SATA 4ch (Jaguar II) 0
++s 9005028590050292 AAR-2810SA PCI SATA 8ch (Corsair-8) 0
++s 9005028590050293 AAR-21610SA PCI SATA 16ch (Corsair-16) 0
++s 9005028590050294 ESD SO-DIMM PCI-X SATA ZCR (Prowler) 0
++d 90050286 AAC-RAID (Rocket) 0
++s 900502869005028c ASR-2230S + ASR-2230SLP PCI-X (Lancer) 0
+ d 90058000 ASC-29320A U320 0
+ d 9005800f AIC-7901 U320 0
+ d 90058010 ASC-39320 U320 0
+ d 90058011 ASC-32320D U320 0
+-s 900580110e1100ac U320 0
++s 900580110e1100ac ASC-39320D U320 0
+ s 9005801190050041 ASC-39320D U320 0
+ d 90058012 ASC-29320 U320 0
+ d 90058013 ASC-29320B U320 0
+ d 90058014 ASC-29320LP U320 0
++d 90058015 ASC-39320B U320 0
++d 90058016 ASC-39320A U320 0
++d 90058017 ASC-29320ALP U320 0
++d 9005801c ASC-39320D U320 0
++d 9005801d AIC-7902B U320 0
+ d 9005801e AIC-7901A U320 0
+ d 9005801f AIC-7902 U320 0
++d 90058080 ASC-29320A U320 w/HostRAID 0
++d 9005808f AIC-7901 U320 w/HostRAID 0
+ d 90058090 ASC-39320 U320 w/HostRAID 0
+ d 90058091 ASC-39320D U320 w/HostRAID 0
+ d 90058092 ASC-29320 U320 w/HostRAID 0
+ d 90058093 ASC-29320B U320 w/HostRAID 0
+ d 90058094 ASC-29320LP U320 w/HostRAID 0
++d 90058095 ASC-39320(B) U320 w/HostRAID 0
++d 90058096 ASC-39320A U320 w/HostRAID 0
++d 90058097 ASC-29320ALP U320 w/HostRAID 0
++d 9005809c ASC-39320D(B) U320 w/HostRAID 0
++d 9005809d AIC-7902(B) U320 w/HostRAID 0
+ d 9005809e AIC-7901A U320 w/HostRAID 0
+ d 9005809f AIC-7902 U320 w/HostRAID 0
+ v 907f Atronics 0
+@@ -6801,8 +9367,21 @@
+ v 9699 Omni Media Technology Inc 0
+ d 96996565 6565 0
+ v 9710 NetMos Technology 0
+-d 97109815 VScom 021H-EP2 2 port parallel adaptor 0
+-d 97109835 222N-2 I/O Card (2S+1P) 0
++d 97107780 USB IRDA-port 0
++d 97109815 PCI 9815 Multi-I/O Controller 0
++s 9710981510000020 2P0S (2 port parallel adaptor) 0
++d 97109835 PCI 9835 Multi-I/O Controller 0
++s 9710983510000002 2S (16C550 UART) 0
++s 9710983510000012 1P2S 0
++d 97109845 PCI 9845 Multi-I/O Controller 0
++s 9710984510000004 0P4S (4 port 16550A serial card) 0
++s 9710984510000006 0P6S (6 port 16550a serial card) 0
++d 97109855 PCI 9855 Multi-I/O Controller 0
++s 9710985510000014 1P4S 0
++v 9902 Stargen Inc. 0
++d 99020001 SG2010 PCI over Starfabric Bridge 0
++d 99020002 SG2010 PCI to Starfabric Gateway 0
++d 99020003 SG1010 Starfabric Switch and PCI Bridge 0
+ v a0a0 AOPEN Inc. 0
+ v a0f1 UNISYS Corporation 0
+ v a200 NEC Corporation 0
+@@ -6810,10 +9389,13 @@
+ v a25b Hewlett Packard GmbH PL24-MKT 0
+ v a304 Sony 0
+ v a727 3Com Corporation 0
++d a7270013 3CRPAG175 Wireless PC Card 0
+ v aa42 Scitex Digital Video 0
+ v ac1e Digital Receiver Technology Inc 0
++v ac3d Actuality Systems 0
++v aecb Adrienne Electronics Corporation 0
+ v b1b3 Shiva Europe Limited 0
+-v bd11 Pinnacle Systems 1 11bd is probably wrong
++v bd11 Pinnacle Systems, Inc. (Wrong ID) 0 Pinnacle should be 11bd, but they got it wrong several times --mj
+ v c001 TSI Telsys 0
+ v c0a9 Micron/Crucial Technology 0
+ v c0de Motorola 0
+@@ -6823,7 +9405,7 @@
+ v cccc Catapult Communications 0
+ v cddd Tyzx, Inc. 0
+ d cddd0101 DeepSea 1 High Speed Stereo Vision Frame Grabber 0
+-d cddd0200 DeepSea 2 High Speed Stereo Vision Frame Grabber 1
++d cddd0200 DeepSea 2 High Speed Stereo Vision Frame Grabber 0
+ v d4d4 Dy4 Systems Inc 0
+ d d4d40601 PCI Mezzanine Card 0
+ v d531 I+ME ACTIA GmbH 0
+@@ -6831,20 +9413,18 @@
+ v dead Indigita Corporation 0
+ v e000 Winbond 0
+ d e000e000 W89C940 0
+-v e159 Tiger Jet Network Inc. 0
+-d e1590001 Model 300 128k 0
++v e159 Tiger Jet Network Inc. 0 see also : http://www.schoenfeld.de/inside/Inside_CWMK3.txt maybe a misuse of TJN id or it use the TJN 3XX chip for other applic
++d e1590001 Tiger3XX Modem/ISDN interface 0
+ s e159000100590001 128k ISDN-S/T Adapter 0
+ s e159000100590003 128k ISDN-U Adapter 0
+ d e1590002 Tiger100APC ISDN chipset 0
+ v e4bf EKF Elektronik GmbH 0
++v e55e Essence Technology, Inc. 0 Innovative and scalable network IC vendor
+ v ea01 Eagle Technology 0
+-v ea60 RME 1 The main chip of all these devices is by Xilinx -> It could also be a Xilinx ID.
+-d ea609896 Digi32 1
+-d ea609896 RME Digi32 1
+-d ea609897 RME Digi32 Pro 1
+-d ea609897 Digi32 Pro 1
+-d ea609898 Digi32/8 1
+-d ea609898 RME Digi32/8 1
++v ea60 RME 0 The main chip of all these devices is by Xilinx -> It could also be a Xilinx ID.
++d ea609896 Digi32 0
++d ea609897 Digi32 Pro 0
++d ea609898 Digi32/8 0
+ v eabb Aashima Technology B.V. 0
+ v eace Endace Measurement Systems, Ltd 0
+ d eace3100 DAG 3.10 OC-3/OC-12 0
+@@ -6860,22 +9440,32 @@
+ d eace422e DAG 4.2E Dual Gigabit Ethernet 0
+ v ec80 Belkin Corporation 0
+ d ec80ec00 F5D6000 0
+-v ecc0 Echo Corporation 0
++v ecc0 Echo Digital Audio Corporation 0
++d ecc00050 Gina24_301 0
++d ecc00051 Gina24_361 0
++d ecc00060 Layla24 0
++d ecc00070 Mona_301_80 0
++d ecc00071 Mona_301_66 0
++d ecc00072 Mona_361 0
++d ecc00080 Mia 0
+ v edd8 ARK Logic Inc 0
+ d edd8a091 1000PV [Stingray] 0
+ d edd8a099 2000PV [Stingray] 0
+ d edd8a0a1 2000MT 0
+ d edd8a0a9 2000MI 0
+ v f1d0 AJA Video 0
+-d f1d0cafe KONA SD SMPTE 259M I/O 1 All boards I have seen have this ID not efac, though all docs say efac...
++d f1d0cafe KONA SD SMPTE 259M I/O 0 All boards I have seen have this ID not efac, though all docs say efac...
+ d f1d0efac KONA SD SMPTE 259M I/O 0
+ d f1d0facd KONA HD SMPTE 292M I/O 0
+-v fa57 Fast Search & Transfer ASA 0
++v fa57 Interagon AS 0
++d fa570001 PMC [Pattern Matching Chip] 0
+ v febd Ultraview Corp. 0
+-v feda Epigram Inc 0
+-v feda Epigram Inc (Broadcom Inc) 1
+-d fedaa0fa BCM4210 iLine10 HomePNA 2.0 1
+-d fedaa10e BCM4230 iLine10 HomePNA 2.0 1
++v feda Broadcom Inc (nee Epigram) 0
++d fedaa0fa BCM4210 iLine10 HomePNA 2.0 0
++d fedaa10e BCM4230 iLine10 HomePNA 2.0 0
++v fede Fedetec Inc. 0 IT & Telecom company, develops PCI Trunk cards <www.fedetec.es>
++d fede0003 TABIC PCI v3 0
+ v fffe VMWare Inc 0
++d fffe0405 Virtual SVGA 4.0 0
+ d fffe0710 Virtual SVGA 0
+ v ffff Illegal Vendor ID 0
+--- ./src/video_out/macosx/Makefile.am 24 Oct 2004 14:37:51 -0000 1.7
++++ ./src/video_out/macosx/Makefile.am 3 Jan 2005 21:14:01 -0000 1.7.2.1
+@@ -15,7 +15,7 @@
+ # The "-Wl,-framework -Wl,..." is needed for libtool versions before
+ # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220)
+ libxineMacOSXVideo_la_LDFLAGS = -version-info \
+- $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++ $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
+ -Wl,-framework -Wl,Cocoa -framework Cocoa \
+ -Wl,-framework -Wl,OpenGL -framework OpenGL
+ libxine_MacOSXVideo_la_OBJCFLAGS = $(OBJCFLAGS)
+--- ./src/video_out/vidix/drivers/Makefile.am 20 Oct 2004 05:39:12 -0000 1.13
++++ ./src/video_out/vidix/drivers/Makefile.am 9 Feb 2005 19:39:43 -0000 1.13.2.1
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/misc/Makefile.common
+
+-EXTRA_DIST = genfb_vid.c nvidia_vid.c
++EXTRA_DIST = genfb_vid.c
+
+ libdir = $(XINE_PLUGINDIR)/vidix
+
+@@ -14,6 +14,8 @@
+ radeon_vid.la \
+ rage128_vid.la \
+ cyberblade_vid.la \
++ unichrome_vid.la \
++ nvidia_vid.la \
+ sis_vid.la
+ endif
+
+@@ -23,20 +25,9 @@
+ radeon_vid_la_LIBADD = -lm
+ radeon_vid_la_LDFLAGS = -avoid-version -module
+
+-rage128_vid.c:
+- @echo "$(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/radeon_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c"; \
+- $(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/radeon_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c
+-
+-rage128_vid.lo: $(rage128_vid_la_SOURCES)
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -DRAGE128 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+-
+-rage128_vid_la_SOURCES = rage128_vid.c
++rage128_vid_la_SOURCES = radeon_vid.c
+ rage128_vid_la_LDFLAGS = -avoid-version -module
++rage128_vid_la_CFLAGS = -DRAGE128 $(AM_CFLAGS)
+
+ pm2_vid_la_SOURCES = pm2_vid.c
+ pm2_vid_la_LDFLAGS = -avoid-version -module
+@@ -44,12 +35,6 @@
+ pm3_vid_la_SOURCES = pm3_vid.c
+ pm3_vid_la_LDFLAGS = -avoid-version -module
+
+-mach64_vid.lo:
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+-
+ mach64_vid_la_SOURCES = mach64_vid.c
+ mach64_vid_la_LDFLAGS = -avoid-version -module
+
+@@ -57,30 +42,25 @@
+ mga_vid_la_LIBADD = -lm
+ mga_vid_la_LDFLAGS = -avoid-version -module
+
+-mga_crtc2_vid.c:
+- @echo "$(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/mga_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c"; \
+- $(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/mga_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c
+-
+-mga_crtc2_vid.lo: $(mga_crtc2_vid_la_SOURCES)
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -DCRTC2 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+-
+-mga_crtc2_vid_la_SOURCES = mga_crtc2_vid.c
++mga_crtc2_vid_la_SOURCES = mga_vid.c
+ mga_crtc2_vid_la_LIBADD = -lm
+ mga_crtc2_vid_la_LDFLAGS = -avoid-version -module
++mga_crtc2_vid_la_CFLAGS = -DCRTC2 $(AM_CFLAGS)
+
+ cyberblade_vid_la_SOURCES = cyberblade_vid.c
+ cyberblade_vid_la_LDFLAGS = -avoid-version -module
+
++unichrome_vid_la_SOURCES = unichrome_vid.c
++unichrome_vid_la_LDFLAGS = -avoid-version -module
++
++nvidia_vid_la_SOURCES = nvidia_vid.c
++nvidia_vid_la_LDFLAGS = -avoid-version -module
++
+ sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
+ sis_vid_la_LDFLAGS = -avoid-version -module
+
+ noinst_HEADERS = mach64.h nvidia.h glint_regs.h pm3_regs.h radeon.h \
+- cyberblade_regs.h sis_defs.h sis_regs.h
++ cyberblade_regs.h unichrome_regs.h nvidia.h sis_defs.h sis_regs.h
+
+ AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+ -I$(top_srcdir)/src/video_out/libdha \
+--- ./src/video_out/vidix/drivers/mga_vid.c 16 Nov 2003 17:18:10 -0000 1.12
++++ ./src/video_out/vidix/drivers/mga_vid.c 9 Feb 2005 19:39:43 -0000 1.12.2.1
+@@ -50,6 +50,13 @@
+
+ #define MGA_DEFAULT_FRAMES 64
+
++#define BES
++
++#ifdef MGA_TV
++#undef BES
++#define CRTC2
++#endif
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -365,6 +372,7 @@
+ if (mga_irq == -1)
+ #endif
+ {
++#ifdef BES
+ //we don't need the vcount protection as we're only hitting
+ //one register (and it doesn't seem to be double buffered)
+ regs.besctl = (regs.besctl & ~0x07000000) + (mga_next_frame << 25);
+@@ -372,6 +380,7 @@
+
+ // writel( regs.besglobctl + ((readl(VCOUNT)+2)<<16),
+ writel(BESGLOBCTL, regs.besglobctl + (MGA_VSYNC_POS<<16));
++#endif
+ #ifdef CRTC2
+ crtc2_frame_sel(mga_next_frame);
+ #endif
+@@ -383,6 +392,7 @@
+
+ static void mga_vid_write_regs(int restore)
+ {
++#ifdef BES
+ //Make sure internal registers don't get updated until we're done
+ writel(BESGLOBCTL, (readl(VCOUNT)-1)<<16);
+
+@@ -552,7 +562,10 @@
+ printf(MGA_MSG" BESGLOBCTL = 0x%08x\n", readl(BESGLOBCTL));
+ printf(MGA_MSG" BESSTATUS= 0x%08x\n", readl(BESSTATUS));
+ }
++#endif
++
+ #ifdef CRTC2
++#if 0
+ if (cregs_save.c2ctl == 0)
+ {
+ //int i;
+@@ -572,6 +585,7 @@
+ writel(C2MISC, cregs_save.c2misc);
+ return;
+ }
++#endif
+ // writel(C2CTL, cregs.c2ctl);
+
+ writel(C2CTL, ((readl(C2CTL) & ~0x03e00000) + (cregs.c2ctl & 0x03e00000)));
+@@ -584,9 +598,9 @@
+ // writeb(XMISCCTRL, (readb(XMISCCTRL) & 0x19) | 0x92);
+ // writeb(XMISCCTRL, (readb(XMISCCTRL) & ~0xe9) + 0xa2);
+ writel(C2DATACTL, cregs.c2datactl);
+- writel(C2HPARAM, cregs.c2hparam);
++// writel(C2HPARAM, cregs.c2hparam);
+ writel(C2HSYNC, cregs.c2hsync);
+- writel(C2VPARAM, cregs.c2vparam);
++// writel(C2VPARAM, cregs.c2vparam);
+ writel(C2VSYNC, cregs.c2vsync);
+ //xx
+ //writel(C2MISC, cregs.c2misc);
+@@ -604,11 +618,30 @@
+
+ //xx
+ //writel(C2SPICSTARTADD1, cregs.c2spicstartadd1);
+- //writel(C2SUBPICLUT, cregs.c2subpiclut);
++
++ //set Color Lookup Table for Subpicture Layer
++ {
++ unsigned char r, g, b, y, cb, cr;
++ int i;
++ for (i = 0; i < 16; i++) {
++
++ r = (i & 0x8) ? 0xff : 0x00;
++ g = (i & 0x4) ? ((i & 0x2) ? 0xff : 0xaa) : ((i & 0x2) ? 0x55 : 0x00);
++ b = (i & 0x1) ? 0xff : 0x00;
++
++ y = ((r * 16829 + g * 33039 + b * 6416 + 0x8000) >> 16) + 16;
++ cb = ((r * -9714 + g * -19071 + b * 28784 + 0x8000) >> 16) + 128;
++ cr = ((r * 28784 + g * -24103 + b * -4681 + 0x8000) >> 16) + 128;
++
++ cregs.c2subpiclut = (cr << 24) | (cb << 16) | (y << 8) | i;
++ writel(C2SUBPICLUT, cregs.c2subpiclut);
++ }
++ }
++
+ //writel(C2PRELOAD, cregs.c2preload);
+
+ // finaly enable everything
+- writel(C2CTL, cregs.c2ctl);
++// writel(C2CTL, cregs.c2ctl);
+ // printf("c2ctl:0x%08x c2datactl:0x%08x\n",readl(C2CTL), readl(C2DATACTL));
+ // printf("c2misc:0x%08x\n", readl(C2MISC));
+ #endif
+@@ -740,7 +773,7 @@
+ {
+ /*FIXME: this driver can use more frames but we need to apply
+ some tricks to avoid RGB-memory hits*/
+- mga_src_base = ((mga_ram_size/2)*0x100000-config->num_frames*config->frame_size);
++ mga_src_base = ((mga_ram_size/2)*0x100000-(config->num_frames+1)*config->frame_size);
+ mga_src_base &= (~0xFFFF); /* 64k boundary */
+ if(mga_src_base>=0) break;
+ }
+@@ -793,7 +826,7 @@
+ // config->offsets[1] = config->frame_size;
+ // config->offsets[2] = 2*config->frame_size;
+ // config->offsets[3] = 3*config->frame_size;
+- for (i = 1; i < config->num_frames+1; i++)
++ for (i = 1; i < config->num_frames+2; i++)
+ config->offsets[i] = i*config->frame_size;
+
+ config->offset.y=0;
+@@ -985,7 +1018,7 @@
+ cregs.c2datactl = 1 // disable dither - propably not needed, we are already in YUV mode
+ + (1<<1) // Y filter enable
+ + (1<<2) // CbCr filter enable
+- + (0<<3) // subpicture enable (disabled)
++ + (1<<3) // subpicture enable (enabled)
+ + (0<<4) // NTSC enable (disabled - PAL)
+ + (0<<5) // C2 static subpicture enable (disabled)
+ + (0<<6) // C2 subpicture offset division (disabled)
+@@ -1043,7 +1076,7 @@
+ cregs.c2datactl = 1 // disable dither - propably not needed, we are already in YUV mode
+ + (1<<1) // Y filter enable
+ + (1<<2) // CbCr filter enable
+- + (0<<3) // subpicture enable (disabled)
++ + (1<<3) // subpicture enable (enabled)
+ + (0<<4) // NTSC enable (disabled - PAL)
+ + (0<<5) // C2 static subpicture enable (disabled)
+ + (0<<6) // C2 subpicture offset division (disabled)
+@@ -1099,7 +1132,7 @@
+ cregs.c2datactl = 0 // enable dither - propably not needed, we are already in YUV mode
+ + (1<<1) // Y filter enable
+ + (1<<2) // CbCr filter enable
+- + (0<<3) // subpicture enable (disabled)
++ + (1<<3) // subpicture enable (enabled)
+ + (0<<4) // NTSC enable (disabled - PAL)
+ + (0<<5) // C2 static subpicture enable (disabled)
+ + (0<<6) // C2 subpicture offset division (disabled)
+@@ -1151,7 +1184,8 @@
+
+ cregs.c2preload=(vsyncstart << 16) | (hsyncstart); // from
+
+- cregs.c2spicstartadd0=0; // not used
++ memset(config->dga_addr + config->offsets[config->num_frames], 0, config->frame_size); // clean spic area
++ cregs.c2spicstartadd0=(uint32_t) mga_src_base + baseadrofs + config->num_frames*config->frame_size;
+ //cregs.c2spicstartadd1=0; // not used
+
+ cregs.c2startadd0=regs.besa1org;
+@@ -1506,8 +1540,9 @@
+ }
+
+ regs.beslumactl = luma;
+-
++#ifdef BES
+ writel(BESLUMACTL, regs.beslumactl);
++#endif
+ return(0);
+ }
+
+--- ./src/video_out/vidix/drivers/nvidia_vid.c 13 Jan 2004 21:56:15 -0000 1.5
++++ ./src/video_out/vidix/drivers/nvidia_vid.c 9 Feb 2005 19:39:44 -0000 1.5.2.1
+@@ -1,330 +1,976 @@
++/*
++ nvidia_vid - VIDIX based video driver for NVIDIA chips
++ Copyrights 2003 - 2004 Sascha Sommer. This file is based on sources from
++ RIVATV (rivatv.sf.net)
++ Licence: GPL
++ WARNING: THIS DRIVER IS IN BETA STAGE
++
++ multi buffer support and TNT2 fixes by Dmitry Baryshkov
++*/
++
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <math.h>
+ #include <inttypes.h>
++#include <unistd.h>
++
+
+ #include "vidix.h"
+ #include "fourcc.h"
+-#include "libdha/libdha.h"
+-#include "libdha/pci_ids.h"
+-#include "libdha/pci_names.h"
+-
+-#include "nvidia.h"
+-
+-#define VIDIX_STATIC nvidia_
+-
+-static void *ctrl_base = 0;
+-static void *fb_base = 0;
+-//static int32_t overlay_offset = 0;
+-static uint32_t ram_size = 0;
+-
+-static unsigned int *PFB;
+-static unsigned int *PCIO;
+-static unsigned int *PGRAPH;
+-static unsigned int *PRAMIN;
+-static unsigned int *FIFO;
+-static unsigned int *PMC;
+-
+-typedef unsigned char U008;
+-
+-#define NVIDIA_MSG "[nvidia-unworking-driver] "
+-
+-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d))
+-
+-unsigned int nv_fifo_space = 0;
+-
+-void CRTCout(unsigned char index, unsigned char val)
+-{
+- NV_WR08(PCIO, 0x3d4, index);
+- NV_WR08(PCIO, 0x3d5, val);
+-}
+-
+-volatile RivaScaledImage *ScaledImage;
+-
+-#define CARD_FLAGS_NONE 0x00
+-#define CARD_FLAGS_NOTSUPPORTED 0x01
+-
+-struct nv_card_id_s
+-{
+- const unsigned int id ;
+- const char name[32];
+- const int core;
+- const int flags;
+-};
++#include "libdha.h"
++#include "pci_ids.h"
++#include "pci_names.h"
++#include "bswap.h"
+
+-static struct nv_card_id_s nv_card_id;
+
+-static const struct nv_card_id_s nv_card_ids[]=
+-{
+- { DEVICE_NVIDIA_NV5_RIVA_TNT2, "nVidia TNT2 (NV5) ", 5, CARD_FLAGS_NOTSUPPORTED},
+- { DEVICE_NVIDIA_NV6_VANTA, "nVidia Vanta (NV6.1)", 6, CARD_FLAGS_NOTSUPPORTED},
+- { DEVICE_NVIDIA_RIVA_TNT2_MODEL, "nVidia Vanta (NV6.2)", 6, CARD_FLAGS_NOTSUPPORTED}
+-};
++pciinfo_t pci_info;
+
+-static int find_chip(unsigned int chip_id)
+-{
+- unsigned int i;
+-
+- for (i = 0; i < sizeof(nv_card_ids)/sizeof(struct nv_card_id_s); i++)
+- if (chip_id == nv_card_ids[i].id)
+- return(i);
+- return(-1);
+-}
+
+-static pciinfo_t pci_info;
+-static int probed = 0;
++#define MAX_FRAMES 3
++#define NV04_BES_SIZE 1024*2000*4
+
+-/* VIDIX exports */
+
+-static vidix_capability_t nvidia_cap =
+-{
+- "NVIDIA driver for VIDIX",
+- "alex",
++static vidix_capability_t nvidia_cap = {
++ "NVIDIA RIVA OVERLAY DRIVER",
++ "Sascha Sommer <saschasommer@freenet.de>",
+ TYPE_OUTPUT,
+ { 0, 0, 0, 0 },
+ 2046,
+- 2047,
++ 2046,
+ 4,
+ 4,
+ -1,
+- FLAG_NONE,
+- VENDOR_NVIDIA,
+- 0,
++ FLAG_UPSCALER|FLAG_DOWNSCALER,
++ VENDOR_NVIDIA2,
++ -1,
+ { 0, 0, 0, 0 }
+ };
+
+-unsigned int VIDIX_NAME(vixGetVersion)(void)
+-{
++
++unsigned int vixGetVersion(void){
+ return(VIDIX_VERSION);
+ }
+
+-int VIDIX_NAME(vixProbe)(int verbose,int force)
+-{
++
++#define NV_ARCH_03 0x03
++#define NV_ARCH_04 0x04
++#define NV_ARCH_10 0x10
++#define NV_ARCH_20 0x20
++#define NV_ARCH_30 0x30
++
++struct nvidia_cards {
++ unsigned short chip_id;
++ unsigned short arch;
++};
++
++static struct nvidia_cards nvidia_card_ids[] = {
++ /*NV03*/
++ {DEVICE_NVIDIA2_RIVA128, NV_ARCH_03},
++ {DEVICE_NVIDIA2_RIVA128ZX,NV_ARCH_03},
++ /*NV04*/
++ {DEVICE_NVIDIA_NV4_RIVA_TNT,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV5_RIVA_TNT2,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV5_RIVA_TNT22,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV5_RIVA_TNT23,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV6_VANTA,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV6_VANTA2,NV_ARCH_04},
++ {DEVICE_NVIDIA2_TNT,NV_ARCH_04},
++ {DEVICE_NVIDIA2_TNT2,NV_ARCH_04},
++ {DEVICE_NVIDIA2_VTNT2,NV_ARCH_04},
++ {DEVICE_NVIDIA2_UTNT2 ,NV_ARCH_04},
++ {DEVICE_NVIDIA2_ITNT2,NV_ARCH_04},
++ {DEVICE_NVIDIA_NV5_ALADDIN_TNT2,NV_ARCH_30},
++ /*NV10*/
++ {DEVICE_NVIDIA_NV18_GEFORCE_PCX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV10_GEFORCE_256,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV10DDR_GEFORCE_256,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV10GL_QUADRO,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV11_GEFORCE2_MX_MX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV11DDR_GEFORCE2_MX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV11_GEFORCE2_GO,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV11GL_QUADRO2_MXR_EX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV15_GEFORCE2_GTS_PRO,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV15DDR_GEFORCE2_TI,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV15BR_GEFORCE2_ULTRA,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV15GL_QUADRO2_PRO,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_MX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_MX2,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_MX3,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_MX4,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_440,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_420,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_4202,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17GL_QUADRO4_550,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_4402,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17GL_QUADRO4_200_400,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17GL_QUADRO4_5502,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17GL_QUADRO4_5503,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV17_GEFORCE4_410,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18_GEFORCE4_MX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18_GEFORCE4_MX2,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18_GEFORCE4_MX3,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18_GEFORCE4_MX4,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18M_GEFORCE4_448,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18M_GEFORCE4_488,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18GL_QUADRO4_580,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18GL_QUADRO4_NVS,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18GL_QUADRO4_380,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18M_GEFORCE4_4482,NV_ARCH_10},
++ {DEVICE_NVIDIA_NVCRUSH11_GEFORCE2_MX,NV_ARCH_10},
++ {DEVICE_NVIDIA_NFORCE2_AGP_DIFFERENT,NV_ARCH_10},
++ {DEVICE_NVIDIA_NFORCE2_AGP,NV_ARCH_10},
++ {DEVICE_NVIDIA_NV18_GEFORCE4_MX5,NV_ARCH_10},
++ /*NV20*/
++ {DEVICE_NVIDIA_NV20_GEFORCE3,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV20_GEFORCE3_TI,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV20_GEFORCE3_TI2,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV20DCC_QUADRO_DCC,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25_GEFORCE4_TI,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25_GEFORCE4_TI2,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25_GEFORCE4_TI3,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25_GEFORCE4_TI4,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25GL_QUADRO4_900,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25GL_QUADRO4_750,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV25GL_QUADRO4_700,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28_GEFORCE4_TI,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28_GEFORCE4_TI2,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28_GEFORCE4_TI3,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28_GEFORCE4_TI4,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28GL_QUADRO4_980,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28GL_QUADRO4_780,NV_ARCH_20},
++ {DEVICE_NVIDIA_NV28GLM_QUADRO4_700,NV_ARCH_20},
++ /*NV30*/
++ {DEVICE_NVIDIA_NV30_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV30_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV30_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV30GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV30GL_QUADRO_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV312,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV313,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31M_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV31M_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NVIDIA_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV314,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV315,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV316,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX4,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34M_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34M_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX5,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX6,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34M_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34M_GEFORCE_FX4,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34GL_QUADRO_NVS,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34GLM_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34_GEFORCE_FX7,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV34,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV38_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35_GEFORCE_FX4,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35GL_QUADRO_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_1_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_2_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_4_GEFORCE_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_5,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_GEFORCE_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_GEFORCE_FX3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV362,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36GL,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV36_GEFORCE_PCX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV35_GEFORCE_PCX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV37GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV37GL_QUADRO_FX2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV38GL_QUADRO_FX,NV_ARCH_30},
++ /* FIXME are they different? */
++ {DEVICE_NVIDIA_NV40_GEFORCE_6800,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_GEFORCE_68002,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_3,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_GEFORCE_68003,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40GL,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV41_0,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV41_1,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV41_2,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV41_8,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV41GL,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_GEFORCE_6800_GEFORCE,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV43_GEFORCE_6600_GEFORCE,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV43_GEFORCE_6600,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV45GL_QUADRO_FX,NV_ARCH_30},
++ {DEVICE_NVIDIA_NV40_GEFORCE_68004,NV_ARCH_30}
++};
++
++
++static int find_chip(unsigned chip_id){
++ unsigned i;
++ for(i = 0;i < sizeof(nvidia_card_ids)/sizeof(struct nvidia_cards);i++)
++ {
++ if(chip_id == nvidia_card_ids[i].chip_id)return i;
++ }
++ return -1;
++}
++
++int vixProbe(int verbose, int force){
+ pciinfo_t lst[MAX_PCI_DEVICES];
+- unsigned int i, num_pci;
++ unsigned i,num_pci;
+ int err;
+-
+- printf(NVIDIA_MSG"probe\n");
+
+- err = pci_scan(lst, &num_pci);
+- if (err)
+- {
+- printf(NVIDIA_MSG"Error occured during pci scan: %s\n", strerror(err));
++ if (force)
++ printf("[nvidia_vid]: warning: forcing not supported yet!\n");
++ err = pci_scan(lst,&num_pci);
++ if(err){
++ printf("[nvidia_vid] Error occurred during pci scan: %s\n",strerror(err));
+ return err;
+ }
+- else
+- {
++ else {
+ err = ENXIO;
+-
+- for (i = 0; i < num_pci; i++)
+- {
+- if (lst[i].vendor == VENDOR_NVIDIA)
+- {
++ for(i=0; i < num_pci; i++){
++ if(lst[i].vendor == VENDOR_NVIDIA2 || lst[i].vendor == VENDOR_NVIDIA){
+ int idx;
+-
++ const char *dname;
+ idx = find_chip(lst[i].device);
+- if (idx == -1)
++ if(idx == -1)
+ continue;
+- if (nv_card_ids[idx].flags & CARD_FLAGS_NOTSUPPORTED)
+- {
+- printf(NVIDIA_MSG"Found chip: %s, but not supported!\n",
+- nv_card_ids[idx].name);
+- continue;
+- }
+- else
+-
+- printf(NVIDIA_MSG"Found chip: %s\n", nv_card_ids[idx].name);
+-
+- memcpy(&nv_card_id, &nv_card_ids[idx], sizeof(struct nv_card_id_s));
+- nvidia_cap.device_id = nv_card_ids[idx].id;
++ dname = pci_device_name(lst[i].vendor, lst[i].device);
++ dname = dname ? dname : "Unknown chip";
++ printf("[nvidia_vid] Found chip: %s\n", dname);
++ nvidia_cap.device_id = lst[i].device;
+ err = 0;
+ memcpy(&pci_info, &lst[i], sizeof(pciinfo_t));
+- probed = 1;
+-
+- printf(NVIDIA_MSG"bus:card:func = %x:%x:%x\n",
+- pci_info.bus, pci_info.card, pci_info.func);
+- printf(NVIDIA_MSG"vendor:device = %x:%x\n",
+- pci_info.vendor, pci_info.device);
+- printf(NVIDIA_MSG"base0:base1:base2:baserom = %lx:%lx:%lx:%lx\n",
+- pci_info.base0, pci_info.base1, pci_info.base2,
+- pci_info.baserom);
+ break;
+ }
+ }
+ }
+-
+- if (err)
+- printf(NVIDIA_MSG"No chip found\n");
+- return(err);
++ if(err && verbose) printf("[nvidia_vid] Can't find chip\n");
++ return err;
+ }
+
+-int VIDIX_NAME(vixInit)(const char *args)
+-{
+- unsigned long card_option;
+-
+- printf(NVIDIA_MSG"init\n");
+-
+- pci_config_read(pci_info.bus, pci_info.card, pci_info.func, 0x40,
+- 4, &card_option);
+- printf(NVIDIA_MSG"card_option: %lx\n", card_option);
+-
+- if (!probed)
+- {
+- printf(NVIDIA_MSG"Driver was not probed but is being initialized\n");
+- return(EINTR);
+- }
+-
+- ctrl_base = map_phys_mem(pci_info.base0, 0x00800000);
+- if (ctrl_base == (void *)-1)
+- return(ENOMEM);
+- fb_base = map_phys_mem(pci_info.base1, 0x01000000);
+- if (fb_base == (void *)-1)
+- return(ENOMEM);
+-
+- printf(NVIDIA_MSG"ctrl_base: %p, fb_base: %p\n", ctrl_base, fb_base);
+-
+- PFB = ctrl_base+0x00100000;
+- PGRAPH = ctrl_base+0x00400000;
+- PRAMIN = ctrl_base+0x00710000;
+- FIFO = ctrl_base+0x00800000;
+- PCIO = ctrl_base+0x00601000;
+- PMC = ctrl_base+0x00000000;
+- printf(NVIDIA_MSG"pfb: %p, pgraph: %p, pramin: %p, fifo: %p, pcio: %p\n",
+- PFB, PGRAPH, PRAMIN, FIFO, PCIO);
+-
+- ScaledImage = FIFO+0x8000/4;
+- printf(NVIDIA_MSG"ScaledImage: %p\n", ScaledImage);
+
+- /* unlock */
+- CRTCout(0x11, 0xff);
+
+- printf(NVIDIA_MSG"fifo_free: %d\n", ScaledImage->fifo_free);
+
+- RIVA_FIFO_FREE(ScaledImage, 10);
+-
+- dump_scaledimage(ScaledImage);
+-
+- /* create scaled image object */
+- *(PRAMIN+0x518) = 0x0100A037;
+- *(PRAMIN+0x519) = 0x00000C02;
+-
+- /* put scaled image object into subchannel */
+- *(FIFO+0x2000) = 0x80000011;
++/*
++ * PCI-Memory IO access macros.
++ */
++#define VID_WR08(p,i,val) (((uint8_t *)(p))[(i)]=(val))
++#define VID_RD08(p,i) (((uint8_t *)(p))[(i)])
+
+- /* ram size detection */
+- switch(nv_card_id.core)
+- {
+- case 5:
+- {
+- if (*(PFB+0x0) & 0x00000100)
+- {
+- printf(NVIDIA_MSG"first ver\n");
+- ram_size = ((*(PFB+0x0) >> 12) & 0x0f) * 1024 * 2 + 1024 * 2;
+- }
+- else
+- {
+- printf("second ver (code: %d)\n",
+- *(PFB+0x0) & 0x00000003);
+- switch(*(PFB+0x0) & 0x00000003)
+- {
+- case 0:
+- ram_size = 1024*32;
++#define VID_WR32(p,i,val) (((uint32_t *)(p))[(i)/4]=(val))
++#define VID_RD32(p,i) (((uint32_t *)(p))[(i)/4])
++
++#ifndef USE_RMW_CYCLES
++/*
++ * Can be used to inhibit READ-MODIFY-WRITE cycles. On by default.
++ */
++
++#define MEM_BARRIER() __asm__ __volatile__ ("" : : : "memory")
++
++#undef VID_WR08
++#define VID_WR08(p,i,val) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]=(val); })
++#undef VID_RD08
++#define VID_RD08(p,i) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]; })
++
++#undef VID_WR32
++#define VID_WR32(p,i,val) ({ MEM_BARRIER(); ((uint32_t *)(p))[(i)/4]=(val); })
++#undef VID_RD32
++#define VID_RD32(p,i) ({ MEM_BARRIER(); ((uint32_t *)(p))[(i)/4]; })
++#endif /* USE_RMW_CYCLES */
++
++#define VID_AND32(p,i,val) VID_WR32(p,i,VID_RD32(p,i)&(val))
++#define VID_OR32(p,i,val) VID_WR32(p,i,VID_RD32(p,i)|(val))
++#define VID_XOR32(p,i,val) VID_WR32(p,i,VID_RD32(p,i)^(val))
++
++
++
++
++
++
++struct rivatv_chip {
++ volatile uint32_t *PMC; /* general control */
++ volatile uint32_t *PME; /* multimedia port */
++ volatile uint32_t *PFB; /* framebuffer control */
++ volatile uint32_t *PVIDEO; /* overlay control */
++ volatile uint8_t *PCIO; /* SVGA (CRTC, ATTR) registers */
++ volatile uint8_t *PVIO; /* SVGA (MISC, GRAPH, SEQ) registers */
++ volatile uint32_t *PRAMIN; /* instance memory */
++ volatile uint32_t *PRAMHT; /* hash table */
++ volatile uint32_t *PRAMFC; /* fifo context table */
++ volatile uint32_t *PRAMRO; /* fifo runout table */
++ volatile uint32_t *PFIFO; /* fifo control region */
++ volatile uint32_t *FIFO; /* fifo channels (USER) */
++ volatile uint32_t *PGRAPH; /* graphics engine */
++
++ unsigned long fbsize; /* framebuffer size */
++ int arch; /* compatible NV_ARCH_XX define */
++ int realarch; /* real architecture */
++ void (* lock) (struct rivatv_chip *, int);
++};
++typedef struct rivatv_chip rivatv_chip;
++
++
++struct rivatv_info {
++ unsigned int use_colorkey;
++ unsigned int colorkey; /* saved xv colorkey*/
++ unsigned int vidixcolorkey; /*currently used colorkey*/
++ unsigned int depth;
++ unsigned int format;
++ unsigned int pitch;
++ unsigned int width,height;
++ unsigned int d_width,d_height; /*scaled width && height*/
++ unsigned int wx,wy; /*window x && y*/
++ unsigned int screen_x; /*screen width*/
++ unsigned int screen_y; /*screen height*/
++ unsigned long buffer_size; /* size of the image buffer */
++ struct rivatv_chip chip; /* NV architecture structure */
++ void* video_base; /* virtual address of control region */
++ void* control_base; /* virtual address of fb region */
++ unsigned long picture_base; /* direct pointer to video picture */
++ unsigned long picture_offset; /* offset of video picture in frame buffer */
++// struct rivatv_dma dma; /* DMA structure */
++ unsigned int cur_frame;
++ unsigned int num_frames; /* number of buffers */
++ int bps; /* bytes per line */
++};
++typedef struct rivatv_info rivatv_info;
++
++//framebuffer size funcs
++static unsigned long rivatv_fbsize_nv03 (struct rivatv_chip *chip){
++ if (VID_RD32 (chip->PFB, 0) & 0x00000020) {
++ if (((VID_RD32 (chip->PMC, 0) & 0xF0) == 0x20)
++ && ((VID_RD32 (chip->PMC, 0) & 0x0F) >= 0x02)) {
++ /* SDRAM 128 ZX. */
++ return ((1 << (VID_RD32 (chip->PFB, 0) & 0x03)) * 1024 * 1024);
++ }
++ else {
++ return 1024 * 1024 * 8;
++ }
++ }
++ else {
++ /* SGRAM 128. */
++ switch (chip->PFB[0x00000000] & 0x00000003) {
++ case 0:
++ return 1024 * 1024 * 8;
+ break;
+- case 1:
+- ram_size = 1024*4;
++ case 2:
++ return 1024 * 1024 * 4;
+ break;
+- case 2:
+- ram_size = 1024*8;
++ default:
++ return 1024 * 1024 * 2;
+ break;
+- case 3:
+- ram_size = 1024*16;
++ }
++ }
++}
++static unsigned long rivatv_fbsize_nv04 (struct rivatv_chip *chip){
++ if (VID_RD32 (chip->PFB, 0) & 0x00000100) {
++ return ((VID_RD32 (chip->PFB, 0) >> 12) & 0x0F) * 1024 * 1024 * 2
++ + 1024 * 1024 * 2;
++ } else {
++ switch (VID_RD32 (chip->PFB, 0) & 0x00000003) {
++ case 0:
++ return 1024 * 1024 * 32;
++ break;
++ case 1:
++ return 1024 * 1024 * 4;
+ break;
+- default:
+- printf(NVIDIA_MSG"Unknown ram size code: %d\n",
+- *(PFB+0x0) & 0x00000003);
++ case 2:
++ return 1024 * 1024 * 8;
++ break;
++ case 3:
++ default:
++ return 1024 * 1024 * 16;
+ break;
+ }
+- }
+- break;
+ }
+- default:
+- printf(NVIDIA_MSG"Unknown core: %d\n", nv_card_id.core);
++}
++
++static unsigned long rivatv_fbsize_nv10 (struct rivatv_chip *chip){
++ return ((VID_RD32 (chip->PFB, 0x20C) >> 20) & 0x000000FF) * 1024 * 1024;
++}
++
++//lock funcs
++static void rivatv_lock_nv03 (struct rivatv_chip *chip, int LockUnlock){
++ VID_WR08 (chip->PVIO, 0x3C4, 0x06);
++ VID_WR08 (chip->PVIO, 0x3C5, LockUnlock ? 0x99 : 0x57);
++}
++
++static void rivatv_lock_nv04 (struct rivatv_chip *chip, int LockUnlock){
++ VID_WR08 (chip->PCIO, 0x3C4, 0x06);
++ VID_WR08 (chip->PCIO, 0x3C5, LockUnlock ? 0x99 : 0x57);
++ VID_WR08 (chip->PCIO, 0x3D4, 0x1F);
++ VID_WR08 (chip->PCIO, 0x3D5, LockUnlock ? 0x99 : 0x57);
++}
++
++
++
++
++/* Enable PFB (Framebuffer), PVIDEO (Overlay unit) and PME (Mediaport) if neccessary. */
++static void rivatv_enable_PMEDIA (struct rivatv_info *info){
++ uint32_t reg;
++
++ /* switch off interrupts once for a while */
++// VID_WR32 (info->chip.PME, 0x200140, 0x00);
++// VID_WR32 (info->chip.PMC, 0x000140, 0x00);
++
++ reg = VID_RD32 (info->chip.PMC, 0x000200);
++
++ /* NV3 (0x10100010): NV03_PMC_ENABLE_PMEDIA, NV03_PMC_ENABLE_PFB, NV03_PMC_ENABLE_PVIDEO */
++
++ if ((reg & 0x10100010) != 0x10100010) {
++ printf("PVIDEO and PFB disabled, enabling...\n");
++ VID_OR32 (info->chip.PMC, 0x000200, 0x10100010);
++ }
++
++ /* save the current colorkey */
++ switch (info->chip.arch ) {
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++ /* NV_PVIDEO_COLOR_KEY */
++ info->colorkey = VID_RD32 (info->chip.PVIDEO, 0xB00);
++ break;
++ case NV_ARCH_03:
++ case NV_ARCH_04:
++ /* NV_PVIDEO_KEY */
++ info->colorkey = VID_RD32 (info->chip.PVIDEO, 0x240);
++ break;
++ }
++
++
++ /* re-enable interrupts again */
++// VID_WR32 (info->chip.PMC, 0x000140, 0x01);
++// VID_WR32 (info->chip.PME, 0x200140, 0x01);
++}
++
++/* Stop overlay video. */
++static void rivatv_overlay_stop (struct rivatv_info *info) {
++ switch (info->chip.arch ) {
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++ /* NV_PVIDEO_COLOR_KEY */
++ /* Xv-Extension-Hack: Restore previously saved value. */
++ VID_WR32 (info->chip.PVIDEO, 0xB00, info->colorkey);
++ /* NV_PVIDEO_STOP */
++ VID_OR32 (info->chip.PVIDEO, 0x704, 0x11);
++ /* NV_PVIDEO_BUFFER */
++ VID_AND32 (info->chip.PVIDEO, 0x700, ~0x11);
++ /* NV_PVIDEO_INTR_EN_BUFFER */
++// VID_AND32 (info->chip.PVIDEO, 0x140, ~0x11);
++ break;
++ case NV_ARCH_03:
++ case NV_ARCH_04:
++ /* NV_PVIDEO_KEY */
++ VID_WR32 (info->chip.PVIDEO, 0x240, info->colorkey);
++ /* NV_PVIDEO_OVERLAY_VIDEO_OFF */
++ VID_AND32 (info->chip.PVIDEO, 0x244, ~0x01);
++ /* NV_PVIDEO_INTR_EN_0_NOTIFY */
++// VID_AND32 (info->chip.PVIDEO, 0x140, ~0x01);
++ /* NV_PVIDEO_OE_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x224, 0);
++ /* NV_PVIDEO_SU_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x228, 0);
++ /* NV_PVIDEO_RM_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x22C, 0);
++ break;
++ }
++}
++
++/* Get pan offset of the physical screen. */
++static uint32_t rivatv_overlay_pan (struct rivatv_info *info){
++ uint32_t pan;
++ info->chip.lock (&info->chip, 0);
++ VID_WR08 (info->chip.PCIO, 0x3D4, 0x0D);
++ pan = VID_RD08 (info->chip.PCIO, 0x3D5);
++ VID_WR08 (info->chip.PCIO, 0x3D4, 0x0C);
++ pan |= VID_RD08 (info->chip.PCIO, 0x3D5) << 8;
++ VID_WR08 (info->chip.PCIO, 0x3D4, 0x19);
++ pan |= (VID_RD08 (info->chip.PCIO, 0x3D5) & 0x1F) << 16;
++ VID_WR08 (info->chip.PCIO, 0x3D4, 0x2D);
++ pan |= (VID_RD08 (info->chip.PCIO, 0x3D5) & 0x60) << 16;
++ return pan << 2;
++}
++
++/* Compute and set colorkey depending on the colour depth. */
++static void rivatv_overlay_colorkey (rivatv_info* info, unsigned int chromakey){
++ uint32_t r, g, b, key = 0;
++
++ r = (chromakey & 0x00FF0000) >> 16;
++ g = (chromakey & 0x0000FF00) >> 8;
++ b = chromakey & 0x000000FF;
++ switch (info->depth) {
++ case 15:
++ key = ((r >> 3) << 10) | ((g >> 3) << 5) | ((b >> 3));
++#ifndef WIN32
++ key = key | 0x00008000;
++#endif
++ break;
++ case 16: // XXX unchecked
++ key = ((r >> 3) << 11) | ((g >> 2) << 5) | ((b >> 3));
++#ifndef WIN32
++ key = key | 0x00008000;
++#endif
++ break;
++ case 24: // XXX unchecked, maybe swap order of masking - FIXME Can the card be in 24 bit mode anyway?
++ key = (chromakey & 0x00FFFFFF) | 0x00800000;
++ break;
++ case 32:
++ key = chromakey;
++#ifndef WIN32
++ key = key | 0x80000000;
++#endif
++ break;
++ }
++ //printf("[nvidia_vid] depth=%d %08X \n", info->depth, chromakey);
++ switch (info->chip.arch) {
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++ VID_WR32 (info->chip.PVIDEO, 0xB00, key);
++ break;
++ case NV_ARCH_03:
++ case NV_ARCH_04:
++ VID_WR32 (info->chip.PVIDEO, 0x240, key);
++ break;
+ }
++}
+
+- printf(NVIDIA_MSG"ram_size: %d\n", ram_size);
+- return 0;
++static void nv_getscreenproperties(struct rivatv_info *info){
++ uint32_t bpp=0;
++ info->chip.lock(&info->chip, 0);
++ /*get screen depth*/
++ VID_WR08(info->chip.PCIO, 0x03D4,0x28);
++ bpp = VID_RD08(info->chip.PCIO,0x03D5)&0x3;
++ if(bpp==3)bpp=4;
++ if((bpp == 2) && (info->chip.PVIDEO[0x00000600/4] & 0x00001000) == 0x0)info->depth=15;
++ else info->depth = bpp*8;
++ /*get screen width*/
++ VID_WR08(info->chip.PCIO, 0x03D4, 0x1);
++ info->screen_x = (1 + VID_RD08(info->chip.PCIO, 0x3D5)) * 8;
++ /*get screen height*/
++ /* get first 8 bits in VT_DISPLAY_END*/
++ VID_WR08(info->chip.PCIO, 0x03D4, 0x12);
++ info->screen_y = VID_RD08(info->chip.PCIO,0x03D5);
++ VID_WR08(info->chip.PCIO,0x03D4,0x07);
++ /* get 9th bit in CRTC_OVERFLOW*/
++ info->screen_y |= (VID_RD08(info->chip.PCIO,0x03D5) &0x02)<<7;
++ /* and the 10th in CRTC_OVERFLOW*/
++ info->screen_y |=(VID_RD08(info->chip.PCIO,0x03D5) &0x40)<<3;
++ ++info->screen_y;
+ }
+
+-void VIDIX_NAME(vixDestroy)(void)
+-{
+- printf(NVIDIA_MSG"destory\n");
++
++
++
++/* Start overlay video. */
++static void rivatv_overlay_start (struct rivatv_info *info,int bufno){
++ uint32_t base, size, offset, xscale, yscale, pan;
++ uint32_t value;
++ int x=info->wx?info->wx:8, y=info->wy?info->wy:8;
++ int lwidth=info->d_width, lheight=info->d_height;
++ int bps;
++ int i;
++
++ size = info->buffer_size;
++ base = info->picture_offset;
++ offset = bufno*size;
++ /*update depth & dimensions here because it may change with vo vesa or vo fbdev*/
++ nv_getscreenproperties(info);
++
++ if(info->depth){
++// bps = info->screen_x * ((info->depth+1)/8);
++ /* get pan offset of the physical screen */
++ pan = rivatv_overlay_pan (info);
++ /* adjust window position depending on the pan offset */
++ bps = 0;
++ info->chip.lock (&info->chip, 0);
++ for (i = 0; (i < 1024) && (bps == 0); i++)
++ {
++ if (info->chip.arch != NV_ARCH_03)
++ bps = info->chip.PGRAPH[0x00000670/4];
++ else
++ bps = info->chip.PGRAPH[0x00000650/4];
++ }
++ if (bps == 0)
++ {
++ fprintf(stderr, "[nvidia_vid] reading bps returned 0!!!\n");
++ if (info->bps != 0)
++ bps = info->bps;
++ }
++ else
++ {
++ info->bps = bps;
++ }
++
++ if (bps != 0)
++ {
++ x = info->wx - (pan % bps) * 8 / info->depth;
++ y = info->wy - (pan / bps);
++ }
++ }
++
++ /* adjust negative output window variables */
++ if (x < 0) {
++ lwidth = info->d_width + x;
++ offset += (-x * info->width / info->d_width) << 1;
++// offset += (-window->x * port->vld_width / window->width) << 1;
++ x = 0;
++ }
++ if (y < 0) {
++ lheight = info->d_height + y;
++ offset += (-y * info->height / info->d_height * info->width) << 1;
++// offset += (-window->y * port->vld_height / window->height * port->org_width) << 1;
++ y = 0;
++ }
++
++ switch (info->chip.arch) {
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++
++ /* NV_PVIDEO_BASE */
++ VID_WR32 (info->chip.PVIDEO, 0x900 + 0, base + offset);
++ //VID_WR32 (info->chip.PVIDEO, 0x900 + 4, base);
++ /* NV_PVIDEO_LIMIT */
++ VID_WR32 (info->chip.PVIDEO, 0x908 + 0, base + offset + size - 1);
++ //VID_WR32 (info->chip.PVIDEO, 0x908 + 4, base + size - 1);
++
++ /* extra code for NV20 && NV30 architectures */
++ if (info->chip.arch == NV_ARCH_20 || info->chip.arch == NV_ARCH_30) {
++ VID_WR32 (info->chip.PVIDEO, 0x800 + 0, base + offset);
++ //VID_WR32 (info->chip.PVIDEO, 0x800 + 4, base);
++ VID_WR32 (info->chip.PVIDEO, 0x808 + 0, base + offset + size - 1);
++ //VID_WR32 (info->chip.PVIDEO, 0x808 + 4, base + size - 1);
++ }
++
++ /* NV_PVIDEO_LUMINANCE */
++ VID_WR32 (info->chip.PVIDEO, 0x910 + 0, 0x00001000);
++ //VID_WR32 (info->chip.PVIDEO, 0x910 + 4, 0x00001000);
++ /* NV_PVIDEO_CHROMINANCE */
++ VID_WR32 (info->chip.PVIDEO, 0x918 + 0, 0x00001000);
++ //VID_WR32 (info->chip.PVIDEO, 0x918 + 4, 0x00001000);
++
++ /* NV_PVIDEO_OFFSET */
++ VID_WR32 (info->chip.PVIDEO, 0x920 + 0, 0x0);
++ //VID_WR32 (info->chip.PVIDEO, 0x920 + 4, offset + pitch);
++ /* NV_PVIDEO_SIZE_IN */
++ VID_WR32 (info->chip.PVIDEO, 0x928 + 0, ((info->height) << 16) | info->width);
++ //VID_WR32 (info->chip.PVIDEO, 0x928 + 4, ((port->org_height/2) << 16) | port->org_width);
++ /* NV_PVIDEO_POINT_IN */
++ VID_WR32 (info->chip.PVIDEO, 0x930 + 0, 0x00000000);
++ //VID_WR32 (info->chip.PVIDEO, 0x930 + 4, 0x00000000);
++ /* NV_PVIDEO_DS_DX_RATIO */
++ VID_WR32 (info->chip.PVIDEO, 0x938 + 0, (info->width << 20) / info->d_width);
++ //VID_WR32 (info->chip.PVIDEO, 0x938 + 4, (port->org_width << 20) / window->width);
++ /* NV_PVIDEO_DT_DY_RATIO */
++ VID_WR32 (info->chip.PVIDEO, 0x940 + 0, ((info->height) << 20) / info->d_height);
++ //VID_WR32 (info->chip.PVIDEO, 0x940 + 4, ((port->org_height/2) << 20) / window->height);
++
++ /* NV_PVIDEO_POINT_OUT */
++ VID_WR32 (info->chip.PVIDEO, 0x948 + 0, ((y + 0) << 16) | x);
++ //VID_WR32 (info->chip.PVIDEO, 0x948 + 4, ((y + 0) << 16) | x);
++ /* NV_PVIDEO_SIZE_OUT */
++ VID_WR32 (info->chip.PVIDEO, 0x950 + 0, (lheight << 16) | lwidth);
++ //VID_WR32 (info->chip.PVIDEO, 0x950 + 4, (height << 16) | width);
++
++ /* NV_PVIDEO_FORMAT */
++ value = info->pitch;
++ if(info->use_colorkey)value |= 1 << 20;
++ if(info->format == IMGFMT_YUY2)value |= 1 << 16;
++ VID_WR32 (info->chip.PVIDEO, 0x958 + 0, value);
++ //VID_WR32 (info->chip.PVIDEO, 0x958 + 4, (pitch << 1) | 0x00100000);
++
++ /* NV_PVIDEO_INTR_EN_BUFFER */
++// VID_OR32 (info->chip.PVIDEO, 0x140, 0x01/*0x11*/);
++ /* NV_PVIDEO_STOP */
++ VID_WR32 (info->chip.PVIDEO, 0x704,0x0);
++ /* NV_PVIDEO_BUFFER */
++ VID_WR32 (info->chip.PVIDEO, 0x700, 0x01/*0x11*/);
++ break;
++
++ case NV_ARCH_03:
++ case NV_ARCH_04:
++
++
++ /* NV_PVIDEO_OE_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x224, 0);
++ /* NV_PVIDEO_SU_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x228, 0);
++ /* NV_PVIDEO_RM_STATE */
++ VID_WR32 (info->chip.PVIDEO, 0x22C, 0);
++
++ /* NV_PVIDEO_BUFF0_START_ADDRESS */
++ VID_WR32 (info->chip.PVIDEO, 0x20C + 0, base + offset + 0);
++ VID_WR32 (info->chip.PVIDEO, 0x20C + 4, base + offset + 0);
++ /* NV_PVIDEO_BUFF0_PITCH_LENGTH */
++ VID_WR32 (info->chip.PVIDEO, 0x214 + 0, info->pitch);
++ VID_WR32 (info->chip.PVIDEO, 0x214 + 4, info->pitch);
++
++ /* NV_PVIDEO_WINDOW_START */
++ VID_WR32 (info->chip.PVIDEO, 0x230, (y << 16) | x);
++ /* NV_PVIDEO_WINDOW_SIZE */
++ VID_WR32 (info->chip.PVIDEO, 0x234, (lheight << 16) | lwidth);
++ /* NV_PVIDEO_STEP_SIZE */
++ yscale = ((info->height - 1) << 11) / (info->d_height - 1);
++ xscale = ((info->width - 1) << 11) / (info->d_width - 1);
++ VID_WR32 (info->chip.PVIDEO, 0x200, (yscale << 16) | xscale);
++
++ /* NV_PVIDEO_RED_CSC_OFFSET */
++ VID_WR32 (info->chip.PVIDEO, 0x280, 0x69);
++ /* NV_PVIDEO_GREEN_CSC_OFFSET */
++ VID_WR32 (info->chip.PVIDEO, 0x284, 0x3e);
++ /* NV_PVIDEO_BLUE_CSC_OFFSET */
++ VID_WR32 (info->chip.PVIDEO, 0x288, 0x89);
++ /* NV_PVIDEO_CSC_ADJUST */
++ VID_WR32 (info->chip.PVIDEO, 0x28C, 0x00000); /* No colour correction! */
++
++ /* NV_PVIDEO_CONTROL_Y (BLUR_ON, LINE_HALF) */
++ VID_WR32 (info->chip.PVIDEO, 0x204, 0x001);
++ /* NV_PVIDEO_CONTROL_X (WEIGHT_HEAVY, SHARPENING_ON, SMOOTHING_ON) */
++ VID_WR32 (info->chip.PVIDEO, 0x208, 0x111); /*directx overlay 0x110 */
++
++ /* NV_PVIDEO_FIFO_BURST_LENGTH */
++ VID_WR32 (info->chip.PVIDEO, 0x23C, 0x03);
++ /* NV_PVIDEO_FIFO_THRES_SIZE */
++ VID_WR32 (info->chip.PVIDEO, 0x238, 0x38); /*windows uses 0x40*/
++
++ /* NV_PVIDEO_BUFF0_OFFSET */
++ VID_WR32 (info->chip.PVIDEO, 0x21C + 0, 0);
++ VID_WR32 (info->chip.PVIDEO, 0x21C + 4, 0);
++
++ /* NV_PVIDEO_INTR_EN_0_NOTIFY_ENABLED */
++// VID_OR32 (info->chip.PVIDEO, 0x140, 0x01);
++
++ /* NV_PVIDEO_OVERLAY (KEY_ON, VIDEO_ON, FORMAT_CCIR) */
++ value = 0x1; /*video on*/
++ if(info->format==IMGFMT_YUY2)value |= 0x100;
++ if(info->use_colorkey)value |=0x10;
++ VID_WR32 (info->chip.PVIDEO, 0x244, value);
++
++ /* NV_PVIDEO_SU_STATE */
++ VID_XOR32 (info->chip.PVIDEO, 0x228, 1 << 16);
++ break;
++ }
++ /*set colorkey*/
++ rivatv_overlay_colorkey(info,info->vidixcolorkey);
++
+ }
+
+-int VIDIX_NAME(vixGetCapability)(vidix_capability_t *to)
+-{
+- memcpy(to, &nvidia_cap, sizeof(vidix_capability_t));
+- return(0);
++
++
++
++
++
++
++static rivatv_info* info;
++
++
++
++
++int vixInit(const char *args){
++ int mtrr;
++ info = (rivatv_info*)calloc(1,sizeof(rivatv_info));
++ info->control_base = map_phys_mem(pci_info.base0, 0x00C00000 + 0x00008000);
++ info->chip.arch = nvidia_card_ids[find_chip(pci_info.device)].arch;
++ printf("[nvidia_vid] arch %x register base %x\n",info->chip.arch,(unsigned int)info->control_base);
++ info->chip.PFIFO = (uint32_t *) (info->control_base + 0x00002000);
++ info->chip.FIFO = (uint32_t *) (info->control_base + 0x00800000);
++ info->chip.PMC = (uint32_t *) (info->control_base + 0x00000000);
++ info->chip.PFB = (uint32_t *) (info->control_base + 0x00100000);
++ info->chip.PME = (uint32_t *) (info->control_base + 0x00000000);
++ info->chip.PCIO = (uint8_t *) (info->control_base + 0x00601000);
++ info->chip.PVIO = (uint8_t *) (info->control_base + 0x000C0000);
++ info->chip.PGRAPH = (uint32_t *) (info->control_base + 0x00400000);
++ /* setup chip specific functions */
++ switch (info->chip.arch) {
++ case NV_ARCH_03:
++ info->chip.lock = rivatv_lock_nv03;
++ info->chip.fbsize = rivatv_fbsize_nv03 (&info->chip);
++ info->chip.PVIDEO = (uint32_t *) (info->control_base + 0x00680000);
++ break;
++ case NV_ARCH_04:
++ info->chip.lock = rivatv_lock_nv04;
++ info->chip.fbsize = rivatv_fbsize_nv04 (&info->chip);
++ info->chip.PRAMIN = (uint32_t *) (info->control_base + 0x00700000);
++ info->chip.PVIDEO = (uint32_t *) (info->control_base + 0x00680000);
++ break;
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++ info->chip.lock = rivatv_lock_nv04;
++ info->chip.fbsize = rivatv_fbsize_nv10 (&info->chip);
++ info->chip.PRAMIN = (uint32_t *) (info->control_base + 0x00700000);
++ info->chip.PVIDEO = (uint32_t *) (info->control_base + 0x00008000);
++ break;
++ }
++ switch (info->chip.arch) {
++ case NV_ARCH_03:
++ {
++ /* This maps framebuffer @6MB, thus 2MB are left for video. */
++ info->video_base = map_phys_mem(pci_info.base1, info->chip.fbsize);
++ /* This may trash your screen for resolutions greater than 1024x768, sorry. */
++ info->picture_offset = 1024*768* 4 * ((info->chip.fbsize > 4194304)?2:1);
++ info->picture_base = (uint32_t) info->video_base + info->picture_offset;
++ info->chip.PRAMIN = (uint32_t *) (info->video_base + 0x00C00000);
++ break;
++ }
++ case NV_ARCH_04:
++ case NV_ARCH_10:
++ case NV_ARCH_20:
++ case NV_ARCH_30:
++ {
++ info->video_base = map_phys_mem(pci_info.base1, info->chip.fbsize);
++ info->picture_offset = info->chip.fbsize - NV04_BES_SIZE;
++// info->picture_base = (unsigned long)map_phys_mem(pci_info.base1+info->picture_offset,NV04_BES_SIZE);
++ info->picture_base = (uint32_t) info->video_base + info->picture_offset;
++ break;
++ }
++ }
++
++ printf("[nvidia_vid] detected memory size %u MB\n",(uint32_t)(info->chip.fbsize /1024/1024));
++
++ if ((mtrr = mtrr_set_type(pci_info.base1, info->chip.fbsize, MTRR_TYPE_WRCOMB))!= 0)
++ printf("[nvidia_vid] unable to setup MTRR: %s\n", strerror(mtrr));
++ else
++ printf("[nvidia_vid] MTRR set up\n");
++
++ nv_getscreenproperties(info);
++ if(!info->depth)printf("[nvidia_vid] text mode: %ux%u\n",info->screen_x,info->screen_y);
++ else printf("[nvidia_vid] video mode: %ux%u@%u\n",info->screen_x,info->screen_y, info->depth);
++
++
++ rivatv_enable_PMEDIA(info);
++ info->cur_frame = 0;
++ info->use_colorkey = 0;
++
++ return 0;
++}
++
++void vixDestroy(void){
++ unmap_phys_mem(info->control_base ,0x00C00000 + 0x00008000);
++ unmap_phys_mem(info->video_base, info->chip.fbsize);
++ free(info);
+ }
+
+-int VIDIX_NAME(vixQueryFourcc)(vidix_fourcc_t *to)
+-{
+- printf(NVIDIA_MSG"query fourcc (%x)\n", to->fourcc);
+- to->flags = 0;
+- to->depth = VID_DEPTH_32BPP;
++int vixGetCapability(vidix_capability_t *to){
++ memcpy(to, &nvidia_cap, sizeof(vidix_capability_t));
+ return 0;
+ }
+
+-int VIDIX_NAME(vixConfigPlayback)(vidix_playback_t *info)
++inline static int is_supported_fourcc(uint32_t fourcc)
+ {
+- int fb_pixel_size = 32/8;
+- int fb_line_len = 1280*4;
+- char buffer = 0;
+- int offset = 0;
+- int x,y,h,w;
+- int bpp = 32 >> 3;
+- int size;
++ if (fourcc == IMGFMT_UYVY || fourcc == IMGFMT_YUY2)
++ return 1;
++ else
++ return 0;
++}
++
++int vixQueryFourcc(vidix_fourcc_t *to){
++ if(is_supported_fourcc(to->fourcc)){
++ to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP |
++ VID_DEPTH_4BPP | VID_DEPTH_8BPP |
++ VID_DEPTH_12BPP| VID_DEPTH_15BPP|
++ VID_DEPTH_16BPP| VID_DEPTH_24BPP|
++ VID_DEPTH_32BPP;
++ to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
++ return 0;
++ }
++ else to->depth = to->flags = 0;
++ return ENOSYS;
++}
+
+- printf(NVIDIA_MSG"config playback\n");
+-
+- x = info->src.x;
+- y = info->src.y;
+- h = info->src.h;
+- w = info->src.w;
+-
+- w = (w + 1) & ~1;
+-
+- size = h * (((w << 1) + 63) & ~63) / bpp;
+-
+-
+- PMC[(0x8900/4)+buffer] = offset;
+- PMC[(0x8928/4)+buffer] = (h << 16) | w;
+- PMC[(0x8930/4)+buffer] = ((y << 4) & 0xffff0000) | (x >> 12);
+- PMC[(0x8938/4)+buffer] = (w << 20) / info->dest.w;
+- PMC[(0x8938/4)+buffer] = (h << 20) / info->dest.h;
++int vixConfigPlayback(vidix_playback_t *vinfo){
++ uint32_t i;
++ printf("called %s\n", __FUNCTION__);
++ if (! is_supported_fourcc(vinfo->fourcc))
++ return ENOSYS;
++
++ info->width = vinfo->src.w;
++ info->height = vinfo->src.h;
++
++ info->d_width = vinfo->dest.w;
++ info->d_height = vinfo->dest.h;
++ info->wx = vinfo->dest.x;
++ info->wy = vinfo->dest.y;
++ info->format = vinfo->fourcc;
++
++ printf("[nvidia_vid] setting up a %dx%d-%dx%d video window (src %dx%d), format 0x%X\n",
++ info->d_width, info->d_height, info->wx, info->wy, info->width, info->height, vinfo->fourcc);
+
+- info->dga_addr = fb_base + (info->dest.w - info->src.w) * fb_pixel_size /
+- 2 + (info->dest.h - info->src.h) * fb_line_len / 2;
+
+- info->num_frames = 1;
+- info->frame_size = info->src.w*info->src.h+(info->src.w*info->src.h)/2;
+- info->offsets[0] = 0;
+- info->offset.y = 0;
+- info->offset.v = ((info->src.w + 31) & ~31) * info->src.h;
+- info->offset.u = info->offset.v+((info->src.w + 31) & ~31) * info->src.h / 4;
+-// info->dga_addr = malloc(info->num_frames*info->frame_size);
++ vinfo->dga_addr=(void*)(info->picture_base);
++
++ switch (vinfo->fourcc)
++ {
++ case IMGFMT_YUY2:
++ case IMGFMT_UYVY:
++
++ vinfo->dest.pitch.y = 16;
++ vinfo->dest.pitch.u = 0;
++ vinfo->dest.pitch.v = 0;
++
++ vinfo->offset.y = 0;
++ vinfo->offset.v = 0;
++ vinfo->offset.u = 0;
++ info->pitch = ((info->width << 1) + (vinfo->dest.pitch.y-1)) & ~(vinfo->dest.pitch.y-1);
++ vinfo->frame_size = info->pitch * info->height;
++ break;
++ }
++ info->buffer_size = vinfo->frame_size;
++ info->num_frames = vinfo->num_frames= (info->chip.fbsize - info->picture_offset)/vinfo->frame_size;
++ if(vinfo->num_frames > MAX_FRAMES)vinfo->num_frames = MAX_FRAMES;
++// vinfo->num_frames = 1;
++// printf("[nvidia_vid] Number of frames %i\n",vinfo->num_frames);
++ for(i=0;i <vinfo->num_frames;i++)vinfo->offsets[i] = vinfo->frame_size*i;
+ return 0;
+ }
+
+-int VIDIX_NAME(vixPlaybackOn)(void)
+-{
+- printf(NVIDIA_MSG"playback on\n");
++int vixPlaybackOn(void){
++ rivatv_overlay_start(info,info->cur_frame);
+ return 0;
+ }
+
+-int VIDIX_NAME(vixPlaybackOff)(void)
+-{
+- printf(NVIDIA_MSG"playback off\n");
++int vixPlaybackOff(void){
++ rivatv_overlay_stop(info);
+ return 0;
+ }
++
++int vixSetGrKeys( const vidix_grkey_t * grkey){
++ if (grkey->ckey.op == CKEY_FALSE)
++ {
++ info->use_colorkey = 0;
++ printf("[nvidia_vid] colorkeying disabled\n");
++ }
++ else {
++ info->use_colorkey = 1;
++ info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
++ printf("[nvidia_vid] set colorkey 0x%x\n",info->vidixcolorkey);
++ }
++ if(info->d_width && info->d_height)rivatv_overlay_start(info,0);
++ return 0;
++}
++
++int vixPlaybackFrameSelect(unsigned int frame){
++// printf("selecting buffer %d\n", frame);
++ rivatv_overlay_start(info, frame);
++ if (info->num_frames >= 1)
++ info->cur_frame = frame/*(frame+1)%info->num_frames*/;
++ return 0;
++}
++
+--- ./src/video_out/vidix/drivers/radeon_vid.c 13 Jan 2004 21:56:15 -0000 1.15
++++ ./src/video_out/vidix/drivers/radeon_vid.c 9 Feb 2005 19:39:44 -0000 1.15.2.1
+@@ -340,17 +340,17 @@
+ { DEVICE_ATI_RADEON_R100_QE, R_100|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_R100_QF, R_100|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_R100_QG, R_100|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RS100_IGP320, R_150|R_OVL_SHIFT|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS100_MOBILITY, R_150|R_OVL_SHIFT|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_VE_QY, R_120|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_VE_QZ, R_120|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_IGP_320, R_150|R_OVL_SHIFT|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_MOBILITY_U1, R_150|R_OVL_SHIFT|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_RV100_QY, R_120|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_RV100_QZ, R_120|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_MOBILITY_M7, R_150|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_MOBILITY_M72, R_150|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_RV200_LX, R_150|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_MOBILITY_M6, R_120|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_MOBILITY_M62, R_120|R_OVL_SHIFT },
+ /* Radeon2 (indeed: Rage 512 Pro ;) */
+- { DEVICE_ATI_RADEON_R200_BB, R_200 },
+- { DEVICE_ATI_RADEON_R200_BC, R_200 },
++ { DEVICE_ATI_R200_BB_RADEON, R_200 },
++ { DEVICE_ATI_R200_BC_RADEON, R_200 },
+ { DEVICE_ATI_RADEON_R200_QH, R_200 },
+ { DEVICE_ATI_RADEON_R200_QI, R_200 },
+ { DEVICE_ATI_RADEON_R200_QJ, R_200 },
+@@ -366,59 +366,52 @@
+ { DEVICE_ATI_RADEON_R200_QL2, R_200 },
+ { DEVICE_ATI_RADEON_RV200_QW, R_150|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV200_QX, R_150|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RS200_IGP330_340_350,R_200|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS200_MOBILITY, R_200|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_R250_IG, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RS250_7000, R_250|R_OVL_SHIFT|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS250_MOBILITY, R_250|R_OVL_SHIFT|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_IGP330_340_350,R_200|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_IGP_330M_340M_350M,R_200|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_RV250_IG, R_250|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_7000_IGP, R_250|R_OVL_SHIFT|R_INTEGRATED },
++ { DEVICE_ATI_RADEON_MOBILITY_7000, R_250|R_OVL_SHIFT|R_INTEGRATED },
+ { DEVICE_ATI_RADEON_RV250_ID, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV250_IE, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV250_IF, R_250|R_OVL_SHIFT },
+ { DEVICE_ATI_RADEON_RV250_IG, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RV250_LD, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RV250_LE, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RV250_LF, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RV250_LG, R_250|R_OVL_SHIFT },
+- { DEVICE_ATI_RADEON_RV280_9200, R_280 },
+- { DEVICE_ATI_RADEON_RV280_92002, R_280 },
+- { DEVICE_ATI_RADEON_RV280_92003, R_280 },
+- { DEVICE_ATI_RADEON_RV280_92004, R_280 },
+- { DEVICE_ATI_RADEON_RV280_M9, R_280 },
+- { DEVICE_ATI_RADEON_RV280_M92, R_280 },
+- { DEVICE_ATI_RADEON_RV280_M93, R_280 },
+- { DEVICE_ATI_RADEON_RV280_M94, R_280 },
++ { DEVICE_ATI_RADEON_R250_LD, R_250|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_R250_LE, R_250|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_R250_LF, R_250|R_OVL_SHIFT },
++ { DEVICE_ATI_RADEON_R250_LG, R_250|R_OVL_SHIFT },
++ { DEVICE_ATI_RV280_RADEON_92003, R_280 },
++ { DEVICE_ATI_RV280_RADEON_92004, R_280 },
++ { DEVICE_ATI_RV280_RADEON_92005, R_280 },
+ /* Radeon3 (indeed: Rage 1024 Pro ;) */
+- { DEVICE_ATI_RADEON_R300, R_300 },
++ { DEVICE_ATI_R300_AG_FIREGL, R_300 },
+ { DEVICE_ATI_RADEON_R300_ND, R_300 },
+ { DEVICE_ATI_RADEON_R300_NE, R_300 },
+- { DEVICE_ATI_RADEON_R300_NF, R_300 },
++ { DEVICE_ATI_RV350_NF_RADEON, R_300 },
+ { DEVICE_ATI_RADEON_R300_NG, R_300 },
+- { DEVICE_ATI_RADEON_RV300_9500, R_300 },
+- { DEVICE_ATI_RADEON_RV300_95002, R_300 },
+- { DEVICE_ATI_RADEON_RV300_9600TX, R_300 },
+- { DEVICE_ATI_RADEON_RS300_9000, R_300|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS300_MOBILITY, R_300|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS300_5836, R_300|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_RS300_5837, R_300|R_INTEGRATED },
+- { DEVICE_ATI_RADEON_R350, R_350 },
+- { DEVICE_ATI_RADEON_R3502, R_350 },
+- { DEVICE_ATI_RADEON_R3503, R_350 },
+- { DEVICE_ATI_RADEON_R3504, R_350 },
+- { DEVICE_ATI_RADEON_R350_NH, R_350 },
+- { DEVICE_ATI_RADEON_R350_NI, R_350 },
+- { DEVICE_ATI_RADEON_R360_NJ, R_350 },
+- { DEVICE_ATI_RADEON_R350_NK, R_350 },
+- { DEVICE_ATI_RADEON_RV350_9600, R_350 },
+- { DEVICE_ATI_RADEON_RV350_9600SE, R_350 },
+- { DEVICE_ATI_RADEON_RV360_9600XT, R_350 },
+- { DEVICE_ATI_RADEON_RV350_FIREGL, R_350 },
+- { DEVICE_ATI_RADEON_RV360_FIREGL, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NP, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NQ, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NR, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NS, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NT, R_350 },
+- { DEVICE_ATI_RADEON_RV350_NV, R_350 }
++ { DEVICE_ATI_R300_AD_RADEON, R_300 },
++ { DEVICE_ATI_R300_AE_RADEON, R_300 },
++ { DEVICE_ATI_R300_AF_RADEON, R_300 },
++ { DEVICE_ATI_RADEON_9100_IGP2, R_300|R_OVL_SHIFT|R_INTEGRATED },
++ { DEVICE_ATI_RS300M_AGP_RADEON, R_300|R_INTEGRATED },
++ { DEVICE_ATI_R350_AH_RADEON, R_350 },
++ { DEVICE_ATI_R350_AI_RADEON, R_350 },
++ { DEVICE_ATI_R350_AJ_RADEON, R_350 },
++ { DEVICE_ATI_R350_AK_FIRE, R_350 },
++ { DEVICE_ATI_RADEON_R350_RADEON2, R_350 },
++ { DEVICE_ATI_RADEON_R350_RADEON3, R_350 },
++ { DEVICE_ATI_RV350_NJ_RADEON, R_350 },
++ { DEVICE_ATI_R350_NK_FIRE, R_350 },
++ { DEVICE_ATI_RV350_AP_RADEON, R_350 },
++ { DEVICE_ATI_RV350_AQ_RADEON, R_350 },
++ { DEVICE_ATI_RV350_AR_RADEON, R_350 },
++ { DEVICE_ATI_RV350_AT_FIRE, R_350 },
++ { DEVICE_ATI_RV350_AV_FIRE, R_350 },
++ { DEVICE_ATI_RV350_MOBILITY_RADEON,R_350 },
++ { DEVICE_ATI_M10_NQ_RADEON, R_350 },
++ { DEVICE_ATI_RV350_MOBILITY_RADEON2,R_350 },
++ { DEVICE_ATI_M10_NS_RADEON, R_350 },
++ { DEVICE_ATI_M10_NT_FIREGL, R_350 },
++ { DEVICE_ATI_M11_NV_FIREGL, R_350 }
+ #endif
+ };
+
+@@ -984,7 +977,7 @@
+ static int find_chip(unsigned chip_id)
+ {
+ unsigned i;
+- for(i = 0;i < sizeof(ati_card_ids)/sizeof(unsigned short);i++)
++ for(i = 0;i < sizeof(ati_card_ids)/sizeof(ati_card_ids_t);i++)
+ {
+ if(chip_id == ati_card_ids[i].id) return i;
+ }
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/video_out/vidix/drivers/unichrome_regs.h 9 Feb 2005 19:39:44 -0000 1.1.2.1
+@@ -0,0 +1,635 @@
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/via/via.h,v 1.5 2004/01/05 00:34:17 dawes Exp $ */
++/*
++ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
++ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
++ * copy of this software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute, sub license,
++ * and/or sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice (including the
++ * next paragraph) shall be included in all copies or substantial portions
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
++ * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++ * DEALINGS IN THE SOFTWARE.
++ */
++
++#ifndef _VIA_H_
++#define _VIA_H_ 1
++
++/* Video status flag */
++
++#define VIDEO_SHOW 0x80000000 /*Video on*/
++#define VIDEO_HIDE 0x00000000 /*Video off*/
++#define VIDEO_MPEG_INUSE 0x08000000 /*Video is used with MPEG */
++#define VIDEO_HQV_INUSE 0x04000000 /*Video is used with HQV*/
++#define VIDEO_CAPTURE0_INUSE 0x02000000 /*Video is used with CAPTURE 0*/
++#define VIDEO_CAPTURE1_INUSE 0x00000000 /*Video is used with CAPTURE 1*/
++#define VIDEO_1_INUSE 0x01000000 /*Video 1 is used with software flip*/
++#define VIDEO_3_INUSE 0x00000000 /*Video 3 is used with software flip*/
++#define MPEG_USE_V1 0x00010000 /*[16] : 1:MPEG use V1, 0:MPEG use V3*/
++#define MPEG_USE_V3 0x00000000 /*[16] : 1:MPEG use V1, 0:MPEG use V3*/
++#define MPEG_USE_HQV 0x00020000 /*[17] : 1:MPEG use HQV,0:MPEG not use HQV*/
++#define MPEG_USE_HW_FLIP 0x00040000 /*[18] : 1:MPEG use H/W flip,0:MPEG use S/W flip*/
++#define MPEG_USE_SW_FLIP 0x00000000 /*[18] : 1:MPEG use H/W flip,0:MPEG use S/W flip*/
++#define CAP0_USE_V1 0x00001000 /*[12] : 1:Capture 0 use V1, 0:Capture 0 use V3*/
++#define CAP0_USE_V3 0x00000000 /*[12] : 1:Capture 0 use V1, 0:Capture 0 use V3*/
++#define CAP0_USE_HQV 0x00002000 /*[13] : 1:Capture 0 use HQV,0:Capture 0 not use HQV*/
++#define CAP0_USE_HW_FLIP 0x00004000 /*[14] : 1:Capture 0 use H/W flip,0:Capture 0 use S/W flip*/
++#define CAP0_USE_CCIR656 0x00008000 /*[15] : 1:Capture 0 use CCIR656,0:Capture 0 CCIR601*/
++#define CAP1_USE_V1 0x00000100 /*[ 8] : 1:Capture 1 use V1, 0:Capture 1 use V3*/
++#define CAP1_USE_V3 0x00000000 /*[ 8] : 1:Capture 1 use V1, 0:Capture 1 use V3*/
++#define CAP1_USE_HQV 0x00000200 /*[ 9] : 1:Capture 1 use HQV,0:Capture 1 not use HQV*/
++#define CAP1_USE_HW_FLIP 0x00000400 /*[10] : 1:Capture 1 use H/W flip,0:Capture 1 use S/W flip */
++#define SW_USE_V1 0x00000010 /*[ 4] : 1:Capture 1 use V1, 0:Capture 1 use V3 */
++#define SW_USE_V3 0x00000000 /*[ 4] : 1:Capture 1 use V1, 0:Capture 1 use V3 */
++#define SW_USE_HQV 0x00000020 /*[ 5] : 1:Capture 1 use HQV,0:Capture 1 not use HQV */
++
++/*
++#define VIDEO1_INUSE 0x00000010 //[ 4] : 1:Video 1 is used with S/W flip
++#define VIDEO1_USE_HQV 0x00000020 //[ 5] : 1:Video 1 use HQV with S/W flip
++#define VIDEO3_INUSE 0x00000001 //[ 0] : 1:Video 3 is used with S/W flip
++#define VIDEO3_USE_HQV 0x00000002 //[ 1] : 1:Video 3 use HQV with S/W flip
++*/
++
++/* H/W registers for Video Engine */
++
++/*
++ * bus master
++ */
++#define PCI_MASTER_ENABLE 0x01
++#define PCI_MASTER_SCATTER 0x00
++#define PCI_MASTER_SINGLE 0x02
++#define PCI_MASTER_GUI 0x00
++#define PCI_MASTER_VIDEO 0x04
++#define PCI_MASTER_INPUT 0x00
++#define PCI_MASTER_OUTPUT 0x08
++
++/*
++ * video registers
++ */
++#define V_FLAGS 0x00
++#define V_CAP_STATUS 0x04
++#define V_FLIP_STATUS 0x04
++#define V_ALPHA_WIN_START 0x08
++#define V_ALPHA_WIN_END 0x0C
++#define V_ALPHA_CONTROL 0x10
++#define V_CRT_STARTADDR 0x14
++#define V_CRT_STARTADDR_2 0x18
++#define V_ALPHA_STRIDE 0x1C
++#define V_COLOR_KEY 0x20
++#define V_ALPHA_STARTADDR 0x24
++#define V_CHROMAKEY_LOW 0x28
++#define V_CHROMAKEY_HIGH 0x2C
++#define V1_CONTROL 0x30
++#define V12_QWORD_PER_LINE 0x34
++#define V1_STARTADDR_1 0x38
++#define V1_STARTADDR_Y1 V1_STARTADDR_1
++#define V1_STRIDE 0x3C
++#define V1_WIN_START_Y 0x40
++#define V1_WIN_START_X 0x42
++#define V1_WIN_END_Y 0x44
++#define V1_WIN_END_X 0x46
++#define V1_STARTADDR_2 0x48
++#define V1_STARTADDR_Y2 V1_STARTADDR_2
++#define V1_ZOOM_CONTROL 0x4C
++#define V1_MINI_CONTROL 0x50
++#define V1_STARTADDR_0 0x54
++#define V1_STARTADDR_Y0 V1_STARTADDR_0
++#define V_FIFO_CONTROL 0x58
++#define V1_STARTADDR_3 0x5C
++#define V1_STARTADDR_Y3 V1_STARTADDR_3
++#define HI_CONTROL 0x60
++#define SND_COLOR_KEY 0x64
++#define ALPHA_V3_PREFIFO_CONTROL 0x68
++#define V1_SOURCE_HEIGHT 0x6C
++#define HI_TRANSPARENT_COLOR 0x70
++#define V_DISPLAY_TEMP 0x74 /* No use */
++#define ALPHA_V3_FIFO_CONTROL 0x78
++#define V3_SOURCE_WIDTH 0x7C
++#define V3_COLOR_KEY 0x80
++#define V1_ColorSpaceReg_1 0x84
++#define V1_ColorSpaceReg_2 0x88
++#define V1_STARTADDR_CB0 0x8C
++#define V1_OPAQUE_CONTROL 0x90 /* To be deleted */
++#define V3_OPAQUE_CONTROL 0x94 /* To be deleted */
++#define V_COMPOSE_MODE 0x98
++#define V3_STARTADDR_2 0x9C
++#define V3_CONTROL 0xA0
++#define V3_STARTADDR_0 0xA4
++#define V3_STARTADDR_1 0xA8
++#define V3_STRIDE 0xAC
++#define V3_WIN_START_Y 0xB0
++#define V3_WIN_START_X 0xB2
++#define V3_WIN_END_Y 0xB4
++#define V3_WIN_END_X 0xB6
++#define V3_ALPHA_QWORD_PER_LINE 0xB8
++#define V3_ZOOM_CONTROL 0xBC
++#define V3_MINI_CONTROL 0xC0
++#define V3_ColorSpaceReg_1 0xC4
++#define V3_ColorSpaceReg_2 0xC8
++#define V3_DISPLAY_TEMP 0xCC /* No use */
++#define V1_STARTADDR_CB1 0xE4
++#define V1_STARTADDR_CB2 0xE8
++#define V1_STARTADDR_CB3 0xEC
++#define V1_STARTADDR_CR0 0xF0
++#define V1_STARTADDR_CR1 0xF4
++#define V1_STARTADDR_CR2 0xF8
++#define V1_STARTADDR_CR3 0xFC
++
++/* Video Capture Engine Registers
++ * Capture Port 1
++ */
++#define CAP0_MASKS 0x100
++#define CAP1_MASKS 0x104
++#define CAP0_CONTROL 0x110
++#define CAP0_H_RANGE 0x114
++#define CAP0_V_RANGE 0x118
++#define CAP0_SCAL_CONTROL 0x11C
++#define CAP0_VBI_H_RANGE 0x120
++#define CAP0_VBI_V_RANGE 0x124
++#define CAP0_VBI_STARTADDR 0x128
++#define CAP0_VBI_STRIDE 0x12C
++#define CAP0_ANCIL_COUNT 0x130
++#define CAP0_MAXCOUNT 0x134
++#define CAP0_VBIMAX_COUNT 0x138
++#define CAP0_DATA_COUNT 0x13C
++#define CAP0_FB_STARTADDR0 0x140
++#define CAP0_FB_STARTADDR1 0x144
++#define CAP0_FB_STARTADDR2 0x148
++#define CAP0_STRIDE 0x150
++/* Capture Port 2 */
++#define CAP1_CONTROL 0x154
++#define CAP1_SCAL_CONTROL 0x160
++#define CAP1_VBI_H_RANGE 0x164 /*To be deleted*/
++#define CAP1_VBI_V_RANGE 0x168 /*To be deleted*/
++#define CAP1_VBI_STARTADDR 0x16C /*To be deleted*/
++#define CAP1_VBI_STRIDE 0x170 /*To be deleted*/
++#define CAP1_ANCIL_COUNT 0x174 /*To be deleted*/
++#define CAP1_MAXCOUNT 0x178
++#define CAP1_VBIMAX_COUNT 0x17C /*To be deleted*/
++#define CAP1_DATA_COUNT 0x180
++#define CAP1_FB_STARTADDR0 0x184
++#define CAP1_FB_STARTADDR1 0x188
++#define CAP1_STRIDE 0x18C
++
++/* SUBPICTURE Registers */
++#define SUBP_CONTROL_STRIDE 0x1C0
++#define SUBP_STARTADDR 0x1C4
++#define RAM_TABLE_CONTROL 0x1C8
++#define RAM_TABLE_READ 0x1CC
++
++/* HQV Registers */
++#define HQV_CONTROL 0x1D0
++#define HQV_SRC_STARTADDR_Y 0x1D4
++#define HQV_SRC_STARTADDR_U 0x1D8
++#define HQV_SRC_STARTADDR_V 0x1DC
++#define HQV_SRC_FETCH_LINE 0x1E0
++#define HQV_FILTER_CONTROL 0x1E4
++#define HQV_MINIFY_CONTROL 0x1E8
++#define HQV_DST_STARTADDR0 0x1EC
++#define HQV_DST_STARTADDR1 0x1F0
++#define HQV_DST_STARTADDR2 0x1FC
++#define HQV_DST_STRIDE 0x1F4
++#define HQV_SRC_STRIDE 0x1F8
++
++
++/*
++ * Video command definition
++ */
++/* #define V_ALPHA_CONTROL 0x210 */
++#define ALPHA_WIN_EXPIRENUMBER_4 0x00040000
++#define ALPHA_WIN_CONSTANT_FACTOR_4 0x00004000
++#define ALPHA_WIN_CONSTANT_FACTOR_12 0x0000c000
++#define ALPHA_WIN_BLENDING_CONSTANT 0x00000000
++#define ALPHA_WIN_BLENDING_ALPHA 0x00000001
++#define ALPHA_WIN_BLENDING_GRAPHIC 0x00000002
++#define ALPHA_WIN_PREFIFO_THRESHOLD_12 0x000c0000
++#define ALPHA_WIN_FIFO_THRESHOLD_8 0x000c0000
++#define ALPHA_WIN_FIFO_DEPTH_16 0x00100000
++
++/* V_CHROMAKEY_LOW 0x228 */
++#define V_CHROMAKEY_V3 0x80000000
++
++/* V1_CONTROL 0x230 */
++#define V1_ENABLE 0x00000001
++#define V1_FULL_SCREEN 0x00000002
++#define V1_YUV422 0x00000000
++#define V1_RGB32 0x00000004
++#define V1_RGB15 0x00000008
++#define V1_RGB16 0x0000000C
++#define V1_YCbCr420 0x00000010
++#define V1_COLORSPACE_SIGN 0x00000080
++#define V1_SRC_IS_FIELD_PIC 0x00000200
++#define V1_SRC_IS_FRAME_PIC 0x00000000
++#define V1_BOB_ENABLE 0x00400000
++#define V1_FIELD_BASE 0x00000000
++#define V1_FRAME_BASE 0x01000000
++#define V1_SWAP_SW 0x00000000
++#define V1_SWAP_HW_HQV 0x02000000
++#define V1_SWAP_HW_CAPTURE 0x04000000
++#define V1_SWAP_HW_MC 0x06000000
++/* #define V1_DOUBLE_BUFFERS 0x00000000 */
++/* #define V1_QUADRUPLE_BUFFERS 0x18000000 */
++#define V1_EXPIRE_NUM 0x00050000
++#define V1_EXPIRE_NUM_A 0x000a0000
++#define V1_EXPIRE_NUM_F 0x000f0000 /* jason */
++#define V1_FIFO_EXTENDED 0x00200000
++#define V1_ON_CRT 0x00000000
++#define V1_ON_SND_DISPLAY 0x80000000
++#define V1_FIFO_32V1_32V2 0x00000000
++#define V1_FIFO_48V1_32V2 0x00200000
++
++/* V12_QWORD_PER_LINE 0x234 */
++#define V1_FETCH_COUNT 0x3ff00000
++#define V1_FETCHCOUNT_ALIGNMENT 0x0000000f
++#define V1_FETCHCOUNT_UNIT 0x00000004 /* Doubld QWORD */
++
++/* V1_STRIDE */
++#define V1_STRIDE_YMASK 0x00001fff
++#define V1_STRIDE_UVMASK 0x1ff00000
++
++/* V1_ZOOM_CONTROL 0x24C */
++#define V1_X_ZOOM_ENABLE 0x80000000
++#define V1_Y_ZOOM_ENABLE 0x00008000
++
++/* V1_MINI_CONTROL 0x250 */
++#define V1_X_INTERPOLY 0x00000002 /* X interpolation */
++#define V1_Y_INTERPOLY 0x00000001 /* Y interpolation */
++#define V1_YCBCR_INTERPOLY 0x00000004 /* Y, Cb, Cr all interpolation */
++#define V1_X_DIV_2 0x01000000
++#define V1_X_DIV_4 0x03000000
++#define V1_X_DIV_8 0x05000000
++#define V1_X_DIV_16 0x07000000
++#define V1_Y_DIV_2 0x00010000
++#define V1_Y_DIV_4 0x00030000
++#define V1_Y_DIV_8 0x00050000
++#define V1_Y_DIV_16 0x00070000
++
++/* V1_STARTADDR0 0x254 */
++#define SW_FLIP_ODD 0x08000000
++
++/* V_FIFO_CONTROL 0x258
++ * IA2 has 32 level FIFO for packet mode video format
++ * 32 level FIFO for planar mode video YV12. with extension reg 230 bit 21 enable
++ * 16 level FIFO for planar mode video YV12. with extension reg 230 bit 21 disable
++ * BCos of 128 bits. 1 level in IA2 = 2 level in VT3122
++ */
++#define V1_FIFO_DEPTH12 0x0000000B
++#define V1_FIFO_DEPTH16 0x0000000F
++#define V1_FIFO_DEPTH32 0x0000001F
++#define V1_FIFO_DEPTH48 0x0000002F
++#define V1_FIFO_DEPTH64 0x0000003F
++#define V1_FIFO_THRESHOLD6 0x00000600
++#define V1_FIFO_THRESHOLD8 0x00000800
++#define V1_FIFO_THRESHOLD12 0x00000C00
++#define V1_FIFO_THRESHOLD16 0x00001000
++#define V1_FIFO_THRESHOLD24 0x00001800
++#define V1_FIFO_THRESHOLD32 0x00002000
++#define V1_FIFO_THRESHOLD40 0x00002800
++#define V1_FIFO_THRESHOLD48 0x00003000
++#define V1_FIFO_THRESHOLD56 0x00003800
++#define V1_FIFO_THRESHOLD61 0x00003D00
++#define V1_FIFO_PRETHRESHOLD10 0x0A000000
++#define V1_FIFO_PRETHRESHOLD12 0x0C000000
++#define V1_FIFO_PRETHRESHOLD29 0x1d000000
++#define V1_FIFO_PRETHRESHOLD40 0x28000000
++#define V1_FIFO_PRETHRESHOLD44 0x2c000000
++#define V1_FIFO_PRETHRESHOLD56 0x38000000
++#define V1_FIFO_PRETHRESHOLD61 0x3D000000
++
++/* ALPHA_V3_FIFO_CONTROL 0x278
++ * IA2 has 32 level FIFO for packet mode video format
++ * 32 level FIFO for planar mode video YV12. with extension reg 230 bit 21 enable
++ * 16 level FIFO for planar mode video YV12. with extension reg 230 bit 21 disable
++ * 8 level FIFO for ALPHA
++ * BCos of 128 bits. 1 level in IA2 = 2 level in VT3122
++ */
++#define V3_FIFO_DEPTH16 0x0000000F
++#define V3_FIFO_DEPTH24 0x00000017
++#define V3_FIFO_DEPTH32 0x0000001F
++#define V3_FIFO_DEPTH48 0x0000002F
++#define V3_FIFO_DEPTH64 0x0000003F
++#define V3_FIFO_THRESHOLD8 0x00000800
++#define V3_FIFO_THRESHOLD12 0x00000C00
++#define V3_FIFO_THRESHOLD16 0x00001000
++#define V3_FIFO_THRESHOLD24 0x00001800
++#define V3_FIFO_THRESHOLD32 0x00002000
++#define V3_FIFO_THRESHOLD40 0x00002800
++#define V3_FIFO_THRESHOLD48 0x00003000
++#define V3_FIFO_THRESHOLD56 0x00003800
++#define V3_FIFO_THRESHOLD61 0x00003D00
++#define V3_FIFO_PRETHRESHOLD10 0x0000000A
++#define V3_FIFO_PRETHRESHOLD12 0x0000000C
++#define V3_FIFO_PRETHRESHOLD29 0x0000001d
++#define V3_FIFO_PRETHRESHOLD40 0x00000028
++#define V3_FIFO_PRETHRESHOLD44 0x0000002c
++#define V3_FIFO_PRETHRESHOLD56 0x00000038
++#define V3_FIFO_PRETHRESHOLD61 0x0000003D
++#define V3_FIFO_MASK 0x0000007F
++#define ALPHA_FIFO_DEPTH8 0x00070000
++#define ALPHA_FIFO_THRESHOLD4 0x04000000
++#define ALPHA_FIFO_MASK 0xffff0000
++#define ALPHA_FIFO_PRETHRESHOLD4 0x00040000
++
++/* IA2 */
++#define ColorSpaceValue_1 0x140020f2
++#define ColorSpaceValue_2 0x0a0a2c00
++
++#define ColorSpaceValue_1_3123C0 0x13000DED
++#define ColorSpaceValue_2_3123C0 0x13171000
++
++/* For TV setting */
++#define ColorSpaceValue_1TV 0x140020f2
++#define ColorSpaceValue_2TV 0x0a0a2c00
++
++/* V_COMPOSE_MODE 0x298 */
++#define SELECT_VIDEO_IF_COLOR_KEY 0x00000001 /* select video if (color key),otherwise select graphics */
++#define SELECT_VIDEO3_IF_COLOR_KEY 0x00000020 /* For 3123C0, select video3 if (color key),otherwise select graphics */
++#define SELECT_VIDEO_IF_CHROMA_KEY 0x00000002 /* 0x0000000a //select video if (chroma key ),otherwise select graphics */
++#define ALWAYS_SELECT_VIDEO 0x00000000 /* always select video,Chroma key and Color key disable */
++#define COMPOSE_V1_V3 0x00000000 /* V1 on top of V3 */
++#define COMPOSE_V3_V1 0x00100000 /* V3 on top of V1 */
++#define COMPOSE_V1_TOP 0x00000000
++#define COMPOSE_V3_TOP 0x00100000
++#define V1_COMMAND_FIRE 0x80000000 /* V1 commands fire */
++#define V3_COMMAND_FIRE 0x40000000 /* V3 commands fire */
++#define V_COMMAND_LOAD 0x20000000 /* Video register always loaded */
++#define V_COMMAND_LOAD_VBI 0x10000000 /* Video register always loaded at vbi without waiting source flip */
++#define V3_COMMAND_LOAD 0x08000000 /* CLE_C0 Video3 register always loaded */
++#define V3_COMMAND_LOAD_VBI 0x00000100 /* CLE_C0 Video3 register always loaded at vbi without waiting source flip */
++#define SECOND_DISPLAY_COLOR_KEY_ENABLE 0x00010000
++
++/* V3_ZOOM_CONTROL 0x2bc */
++#define V3_X_ZOOM_ENABLE 0x80000000
++#define V3_Y_ZOOM_ENABLE 0x00008000
++
++/* V3_MINI_CONTROL 0x2c0 */
++#define V3_X_INTERPOLY 0x00000002 /* X interpolation */
++#define V3_Y_INTERPOLY 0x00000001 /* Y interpolation */
++#define V3_YCBCR_INTERPOLY 0x00000004 /* Y, Cb, Cr all interpolation */
++#define V3_X_DIV_2 0x01000000
++#define V3_X_DIV_4 0x03000000
++#define V3_X_DIV_8 0x05000000
++#define V3_X_DIV_16 0x07000000
++#define V3_Y_DIV_2 0x00010000
++#define V3_Y_DIV_4 0x00030000
++#define V3_Y_DIV_8 0x00050000
++#define V3_Y_DIV_16 0x00070000
++
++/* SUBP_CONTROL_STRIDE 0x3c0 */
++#define SUBP_HQV_ENABLE 0x00010000
++#define SUBP_IA44 0x00020000
++#define SUBP_AI44 0x00000000
++#define SUBP_STRIDE_MASK 0x00001fff
++#define SUBP_CONTROL_MASK 0x00070000
++
++/* RAM_TABLE_CONTROL 0x3c8 */
++#define RAM_TABLE_RGB_ENABLE 0x00000007
++
++/* CAPTURE0_CONTROL 0x310 */
++#define C0_ENABLE 0x00000001
++#define BUFFER_2_MODE 0x00000000
++#define BUFFER_3_MODE 0x00000004
++#define BUFFER_4_MODE 0x00000006
++#define SWAP_YUYV 0x00000000
++#define SWAP_UYVY 0x00000100
++#define SWAP_YVYU 0x00000200
++#define SWAP_VYUY 0x00000300
++#define IN_601_8 0x00000000
++#define IN_656_8 0x00000010
++#define IN_601_16 0x00000020
++#define IN_656_16 0x00000030
++#define DEINTER_ODD 0x00000000
++#define DEINTER_EVEN 0x00001000
++#define DEINTER_ODD_EVEN 0x00002000
++#define DEINTER_FRAME 0x00003000
++#define VIP_1 0x00000000
++#define VIP_2 0x00000400
++#define H_FILTER_2 0x00010000
++#define H_FILTER_4 0x00020000
++#define H_FILTER_8_1331 0x00030000
++#define H_FILTER_8_12221 0x00040000
++#define VIP_ENABLE 0x00000008
++#define EN_FIELD_SIG 0x00000800
++#define VREF_INVERT 0x00100000
++#define FIELD_INPUT_INVERSE 0x00400000
++#define FIELD_INVERSE 0x40000000
++
++#define C1_H_MINI_EN 0x00000800
++#define C0_H_MINI_EN 0x00000800
++#define C1_V_MINI_EN 0x04000000
++#define C0_V_MINI_EN 0x04000000
++#define C1_H_MINI_2 0x00000400
++
++/* CAPTURE1_CONTROL 0x354 */
++#define C1_ENABLE 0x00000001
++
++/* V3_CONTROL 0x2A0 */
++#define V3_ENABLE 0x00000001
++#define V3_FULL_SCREEN 0x00000002
++#define V3_YUV422 0x00000000
++#define V3_RGB32 0x00000004
++#define V3_RGB15 0x00000008
++#define V3_RGB16 0x0000000C
++#define V3_COLORSPACE_SIGN 0x00000080
++#define V3_EXPIRE_NUM 0x00040000
++#define V3_EXPIRE_NUM_F 0x000f0000
++#define V3_BOB_ENABLE 0x00400000
++#define V3_FIELD_BASE 0x00000000
++#define V3_FRAME_BASE 0x01000000
++#define V3_SWAP_SW 0x00000000
++#define V3_SWAP_HW_HQV 0x02000000
++#define V3_FLIP_HW_CAPTURE0 0x04000000
++#define V3_FLIP_HW_CAPTURE1 0x06000000
++
++/* V3_ALPHA_FETCH_COUNT 0x2B8 */
++#define V3_FETCH_COUNT 0x3ff00000
++#define ALPHA_FETCH_COUNT 0x000003ff
++
++/* HQV_CONTROL 0x3D0 */
++#define HQV_RGB32 0x00000000
++#define HQV_RGB16 0x20000000
++#define HQV_RGB15 0x30000000
++#define HQV_YUV422 0x80000000
++#define HQV_YUV420 0xC0000000
++#define HQV_ENABLE 0x08000000
++#define HQV_SRC_SW 0x00000000
++#define HQV_SRC_MC 0x01000000
++#define HQV_SRC_CAPTURE0 0x02000000
++#define HQV_SRC_CAPTURE1 0x03000000
++#define HQV_FLIP_EVEN 0x00000000
++#define HQV_FLIP_ODD 0x00000020
++#define HQV_SW_FLIP 0x00000010 /* Write 1 to flip HQV buffer */
++#define HQV_DEINTERLACE 0x00010000 /* First line of odd field will be repeated 3 times */
++#define HQV_FIELD_2_FRAME 0x00020000 /* Src is field. Display each line 2 times */
++#define HQV_FRAME_2_FIELD 0x00040000 /* Src is field. Display field */
++#define HQV_FRAME_UV 0x00000000 /* Src is Non-interleaved */
++#define HQV_FIELD_UV 0x00100000 /* Src is interleaved */
++#define HQV_IDLE 0x00000008
++#define HQV_FLIP_STATUS 0x00000001
++#define HQV_DOUBLE_BUFF 0x00000000
++#define HQV_TRIPLE_BUFF 0x04000000
++#define HQV_SUBPIC_FLIP 0x00008000
++#define HQV_FIFO_STATUS 0x00001000
++
++/* HQV_FILTER_CONTROL 0x3E4 */
++#define HQV_H_LOWPASS_2TAP 0x00000001
++#define HQV_H_LOWPASS_4TAP 0x00000002
++#define HQV_H_LOWPASS_8TAP1 0x00000003 /* To be deleted */
++#define HQV_H_LOWPASS_8TAP2 0x00000004 /* To be deleted */
++#define HQV_H_HIGH_PASS 0x00000008
++#define HQV_H_LOW_PASS 0x00000000
++#define HQV_V_LOWPASS_2TAP 0x00010000
++#define HQV_V_LOWPASS_4TAP 0x00020000
++#define HQV_V_LOWPASS_8TAP1 0x00030000
++#define HQV_V_LOWPASS_8TAP2 0x00040000
++#define HQV_V_HIGH_PASS 0x00080000
++#define HQV_V_LOW_PASS 0x00000000
++#define HQV_H_HIPASS_F1_DEFAULT 0x00000040
++#define HQV_H_HIPASS_F2_DEFAULT 0x00000000
++#define HQV_V_HIPASS_F1_DEFAULT 0x00400000
++#define HQV_V_HIPASS_F2_DEFAULT 0x00000000
++#define HQV_H_HIPASS_F1_2TAP 0x00000050
++#define HQV_H_HIPASS_F2_2TAP 0x00000100
++#define HQV_V_HIPASS_F1_2TAP 0x00500000
++#define HQV_V_HIPASS_F2_2TAP 0x01000000
++#define HQV_H_HIPASS_F1_4TAP 0x00000060
++#define HQV_H_HIPASS_F2_4TAP 0x00000200
++#define HQV_V_HIPASS_F1_4TAP 0x00600000
++#define HQV_V_HIPASS_F2_4TAP 0x02000000
++#define HQV_H_HIPASS_F1_8TAP 0x00000080
++#define HQV_H_HIPASS_F2_8TAP 0x00000400
++#define HQV_V_HIPASS_F1_8TAP 0x00800000
++#define HQV_V_HIPASS_F2_8TAP 0x04000000
++/* IA2 NEW */
++#define HQV_V_FILTER2 0x00080000
++#define HQV_H_FILTER2 0x00000008
++#define HQV_H_TAP2_11 0x00000041
++#define HQV_H_TAP4_121 0x00000042
++#define HQV_H_TAP4_1111 0x00000401
++#define HQV_H_TAP8_1331 0x00000221
++#define HQV_H_TAP8_12221 0x00000402
++#define HQV_H_TAP16_1991 0x00000159
++#define HQV_H_TAP16_141041 0x0000026A
++#define HQV_H_TAP32 0x0000015A
++#define HQV_V_TAP2_11 0x00410000
++#define HQV_V_TAP4_121 0x00420000
++#define HQV_V_TAP4_1111 0x04010000
++#define HQV_V_TAP8_1331 0x02210000
++#define HQV_V_TAP8_12221 0x04020000
++#define HQV_V_TAP16_1991 0x01590000
++#define HQV_V_TAP16_141041 0x026A0000
++#define HQV_V_TAP32 0x015A0000
++#define HQV_V_FILTER_DEFAULT 0x00420000
++#define HQV_H_FILTER_DEFAULT 0x00000040
++
++
++
++
++/* HQV_MINI_CONTROL 0x3E8 */
++#define HQV_H_MINIFY_ENABLE 0x00000800
++#define HQV_V_MINIFY_ENABLE 0x08000000
++#define HQV_VDEBLOCK_FILTER 0x80000000
++#define HQV_HDEBLOCK_FILTER 0x00008000
++
++
++#define CHROMA_KEY_LOW 0x00FFFFFF
++#define CHROMA_KEY_HIGH 0x00FFFFFF
++
++/* V_CAP_STATUS */
++#define V_ST_UPDATE_NOT_YET 0x00000003
++#define V1_ST_UPDATE_NOT_YET 0x00000001
++#define V3_ST_UPDATE_NOT_YET 0x00000008
++
++#define VBI_STATUS 0x00000002
++
++/*
++ * Macros for Video MMIO
++ */
++#ifndef V4L2
++#define VIDInB(port) *((volatile CARD8 *)(pVia->VidMapBase + (port)))
++#define VIDInW(port) *((volatile CARD16 *)(pVia->VidMapBase + (port)))
++#define VIDInD(port) *((volatile CARD32 *)(pVia->VidMapBase + (port)))
++#define VIDOutB(port, data) *((volatile CARD8 *)(pVia->VidMapBase + (port))) = (data)
++#define VIDOutW(port, data) *((volatile CARD16 *)(pVia->VidMapBase + (port))) = (data)
++#define VIDOutD(port, data) *((volatile CARD32 *)(pVia->VidMapBase + (port))) = (data)
++#define MPGOutD(port, data) *((volatile CARD32 *)(lpMPEGMMIO +(port))) = (data)
++#define MPGInD(port) *((volatile CARD32 *)(lpMPEGMMIO +(port)))
++#endif
++
++/*
++ * Macros for GE MMIO
++ */
++#define GEInW(port) *((volatile CARD16 *)(lpGEMMIO + (port)))
++#define GEInD(port) *((volatile CARD32 *)(lpGEMMIO + (port)))
++#define GEOutW(port, data) *((volatile CARD16 *)(lpGEMMIO + (port))) = (data)
++#define GEOutD(port, data) *((volatile CARD32 *)(lpGEMMIO + (port))) = (data)
++
++/*
++ * MPEG 1/2 Slice Engine (at 0xC00 relative to base)
++ */
++
++#define MPG_CONTROL 0x00
++#define MPG_CONTROL_STRUCT 0x03
++#define MPG_CONTROL_STRUCT_TOP 0x01
++#define MPG_CONTROL_STRUCT_BOTTOM 0x02
++#define MPG_CONTROL_STRUCT_FRAME 0x03
++ /* Use TOP if interlaced */
++#define MPG_CONTROL_TYPE 0x3C
++#define MPG_CONTROL_TYPE_I (0x01 << 2)
++#define MPG_CONTROL_TYPE_B (0x02 << 2)
++#define MPG_CONTROL_TYPE_P (0x03 << 3)
++#define MPG_CONTROL_ALTSCAN 0x40
++#define MPG_BLOCK 0x08 /* Unsure */
++#define MPG_COMMAND 0x0C
++#define MPG_DATA1 0x10
++#define MPG_DATA2 0x14
++#define MPG_DATA3 0x18
++#define MPG_DATA4 0x1C
++
++#define MPG_YPHYSICAL(x) (0x20 + 12*(x))
++#define MPG_CbPHYSICAL(x) (0x24 + 12*(x))
++#define MPG_CrPHYSICAL(x) (0x28 + 12*(x))
++
++#define MPG_PITCH 0x50
++#define MPG_STATUS 0x54
++
++#define MPG_MATRIX_IDX 0x5C
++#define MPG_MATRIX_IDX_INTRA 0x00
++#define MPG_MATRIX_IDX_NON 0x01
++#define MPG_MATRIX_DATA 0x60
++
++#define MPG_SLICE_CTRL_1 0x90
++#define MPG_SLICE_MBAMAX 0x2FFF
++#define MPG_SLICE_PREDICTIVE_DCT 0x4000
++#define MPG_SLICE_TOP_FIRST 0x8000
++#define MPG_SLICE_MACROBLOCK_WIDTH(x) ((x)<<18) /* in 64's */
++#define MPG_SLICE_CTRL_2 0x94
++#define MPG_SLICE_CONCEAL_MVEC 0x0000001
++#define MPG_SLICE_QSCALE_TYPE 0x0000002
++#define MPG_SLICE_DCPRECISION 0x000000C
++#define MPG_SLICE_MACROBQUOT 0x0FFFFF0
++#define MPG_SLICE_INTRAVLC 0x1000000
++#define MPG_SLICE_CTRL_3 0x98
++#define MPG_SLICE_FHMVR 0x0000003
++#define MPG_SLICE_FVMVR 0x000000C
++#define MPG_SLICE_BHMVR 0x0000030
++#define MPG_SLICE_BVMVR 0x00000C0
++#define MPG_SLICE_SECOND_FIELD 0x0100000
++#define MPG_SLICE_RESET 0x0400000
++#define MPG_SLICE_LENGTH 0x9C
++#define MPG_SLICE_DATA 0xA0
++
++
++
++#endif /* _VIA_H_ */
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ ./src/video_out/vidix/drivers/unichrome_vid.c 9 Feb 2005 19:39:44 -0000 1.2.2.1
+@@ -0,0 +1,772 @@
++/*
++ Driver for VIA CLE266 Unichrome - Version 0.1.0
++
++ Copyright (C) 2004 by Timothy Lee
++
++ Based on Cyberblade/i driver by Alastair M. Robison.
++
++ Thanks to Gilles Frattini for bugfixes
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Changes:
++ 2004-03-10
++ Initial version
++
++ To Do:
++*/
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <inttypes.h>
++#include <unistd.h>
++
++#include "vidix.h"
++#include "fourcc.h"
++#include "libdha.h"
++#include "pci_ids.h"
++#include "pci_names.h"
++
++#include "unichrome_regs.h"
++
++pciinfo_t pci_info;
++
++uint8_t *uc_mem;
++static vidix_grkey_t uc_grkey;
++static int frames[VID_PLAY_MAXFRAMES];
++uint8_t *vio;
++uint8_t mclk_save[3];
++
++#define VIA_OUT(hwregs, reg, val) *(volatile uint32_t *)((hwregs) + (reg)) = (val)
++#define VIA_IN(hwregs, reg) *(volatile uint32_t *)((hwregs) + (reg))
++#define VGA_OUT8(hwregs, reg, val) *(volatile uint8_t *)((hwregs) + (reg) + 0x8000) = (val)
++#define VGA_IN8(hwregs, reg) *(volatile uint8_t *)((hwregs) + (reg) + 0x8000)
++#define VIDEO_OUT(hwregs, reg, val) VIA_OUT((hwregs)+0x200, reg, val)
++#define VIDEO_IN(hwregs, reg) VIA_IN((hwregs)+0x200, reg)
++
++#define outb(val,reg) OUTPORT8(reg,val)
++#define inb(reg) INPORT8(reg)
++
++#define ALIGN_TO(v, n) (((v) + (n-1)) & ~(n-1))
++#define UC_MAP_V1_FIFO_CONTROL(depth, pre_thr, thr) \
++ (((depth)-1) | ((thr) << 8) | ((pre_thr) << 24))
++
++#define FRAMEBUFFER_START 0x600000
++#define FRAMEBUFFER_SIZE 0x200000
++
++#ifdef DEBUG_LOGFILE
++FILE *logfile=0;
++#define LOGWRITE(x) {if(logfile) fprintf(logfile,x);}
++#else
++#define LOGWRITE(x)
++#endif
++
++
++static vidix_capability_t uc_cap =
++{
++ "VIA CLE266 Unichrome driver",
++ "Timothy Lee <timothy@siriushk.com>",
++ TYPE_OUTPUT,
++ { 0, 0, 0, 0 },
++ 4096,
++ 4096,
++ 4,
++ 4,
++ -1,
++ FLAG_UPSCALER|FLAG_DOWNSCALER,
++ VENDOR_VIA2,
++ -1,
++ { 0, 0, 0, 0 }
++};
++
++
++unsigned int vixGetVersion(void)
++{
++ return(VIDIX_VERSION);
++}
++
++
++static unsigned short uc_card_ids[] =
++{
++ DEVICE_VIA2_VT8623_APOLLO_CLE266
++};
++
++
++static int find_chip(unsigned chip_id)
++{
++ unsigned i;
++ for(i = 0;i < sizeof(uc_card_ids)/sizeof(unsigned short);i++)
++ {
++ if(chip_id == uc_card_ids[i]) return i;
++ }
++ return -1;
++}
++
++
++/**
++ * Map hw settings for vertical scaling.
++ *
++ * @param sh source height
++ * @param dh destination height
++ * @param zoom will hold vertical setting of zoom register.
++ * @param mini will hold vertical setting of mini register.
++ *
++ * @returns 1 if successful.
++ * 0 if the zooming factor is too large or small.
++ *
++ * @note Derived from VIA's V4L driver.
++ * See ddover.c, DDOVER_HQVCalcZoomHeight()
++ */
++
++static int uc_ovl_map_vzoom(int sh, int dh, uint32_t* zoom, uint32_t* mini)
++{
++ uint32_t sh1, tmp, d;
++ int zoom_ok = 1;
++
++ if (sh == dh) { // No zoom
++ // Do nothing
++ }
++ else if (sh < dh) { // Zoom in
++
++ tmp = (sh * 0x0400) / dh;
++ zoom_ok = !(tmp > 0x3ff);
++
++ *zoom |= (tmp & 0x3ff) | V1_Y_ZOOM_ENABLE;
++ *mini |= V1_Y_INTERPOLY | V1_YCBCR_INTERPOLY;
++ }
++ else { // sw > dh - Zoom out
++
++ // Find a suitable divider (1 << d) = {2, 4, 8 or 16}
++
++ sh1 = sh;
++ for (d = 1; d < 5; d++) {
++ sh1 >>= 1;
++ if (sh1 <= dh) break;
++ }
++ if (d == 5) { // Too small.
++ d = 4;
++ zoom_ok = 0;
++ }
++
++ *mini |= ((d<<1)-1) << 16; // <= {1,3,5,7} << 16
++
++ // Add scaling
++
++ if (sh1 < dh) {
++ tmp = (sh1 * 0x400) / dh;
++ *zoom |= ((tmp & 0x3ff) | V1_Y_ZOOM_ENABLE);
++ *mini |= V1_Y_INTERPOLY | V1_YCBCR_INTERPOLY;
++ }
++ }
++
++ return zoom_ok;
++}
++
++
++/**
++ * Map hw settings for horizontal scaling.
++ *
++ * @param sw source width
++ * @param dw destination width
++ *
++ * @param zoom will hold horizontal setting of zoom register.
++ * @param mini will hold horizontal setting of mini register.
++ * @param falign will hold fetch aligment
++ * @param dcount will hold display count
++ *
++ * @returns 1 if successful.
++ * 0 if the zooming factor is too large or small.
++ *
++ * @note Derived from VIA's V4L driver.
++ * See ddover.c, DDOVER_HQVCalcZoomWidth() and DDOver_GetDisplayCount()
++ */
++static int uc_ovl_map_hzoom(int sw, int dw, uint32_t* zoom, uint32_t* mini,
++ int* falign, int* dcount)
++{
++ uint32_t tmp, sw1, d;
++ int md; // Minify-divider
++ int zoom_ok = 1;
++
++ md = 1;
++ *falign = 0;
++
++ if (sw == dw) { // No zoom
++ // Do nothing
++ }
++ else if (sw < dw) { // Zoom in
++
++ tmp = (sw * 0x0800) / dw;
++ zoom_ok = !(tmp > 0x7ff);
++
++ *zoom |= ((tmp & 0x7ff) << 16) | V1_X_ZOOM_ENABLE;
++ *mini |= V1_X_INTERPOLY;
++ }
++ else { // sw > dw - Zoom out
++
++ // Find a suitable divider (1 << d) = {2, 4, 8 or 16}
++
++ sw1 = sw;
++ for (d = 1; d < 5; d++) {
++ sw1 >>= 1;
++ if (sw1 <= dw) break;
++ }
++ if (d == 5) { // Too small.
++ d = 4;
++ zoom_ok = 0;
++ }
++
++ md = 1 << d; // <= {2,4,8,16}
++ *falign = ((md<<1)-1) & 0xf; // <= {3,7,15,15}
++ *mini |= V1_X_INTERPOLY;
++ *mini |= ((d<<1)-1) << 24; // <= {1,3,5,7} << 24
++
++ // Add scaling
++
++ if (sw1 < dw) {
++ //CLE bug
++ //tmp = sw1*0x0800 / dw;
++ tmp = (sw1 - 2) * 0x0800 / dw;
++ *zoom |= ((tmp & 0x7ff) << 16) | V1_X_ZOOM_ENABLE;
++ }
++ }
++
++ *dcount = sw - md;
++
++ return zoom_ok;
++}
++
++
++/**
++ * @param format overlay pixel format
++ * @param sw source width
++ *
++ * @returns qword fetch register setting
++ *
++ * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetFetch()
++ * @note Only call after uc_ovl_map_hzoom()
++ */
++static uint32_t uc_ovl_map_qwfetch(uint32_t format, int sw)
++{
++ uint32_t fetch = 0;
++
++ switch (format) {
++ case IMGFMT_YV12:
++ case IMGFMT_I420:
++ fetch = ALIGN_TO(sw, 32) >> 4;
++ break;
++ case IMGFMT_UYVY:
++ case IMGFMT_YVYU:
++ case IMGFMT_YUY2:
++ fetch = (ALIGN_TO(sw << 1, 16) >> 4) + 1;
++ break;
++ case IMGFMT_BGR15:
++ case IMGFMT_BGR16:
++ fetch = (ALIGN_TO(sw << 1, 16) >> 4) + 1;
++ break;
++ case IMGFMT_BGR32:
++ fetch = (ALIGN_TO(sw << 2, 16) >> 4) + 1;
++ break;
++ default:
++ printf("[unichrome] Unexpected pixelformat!");
++ break;
++ }
++
++ if (fetch < 4)
++ fetch = 4;
++
++ return fetch;
++}
++
++
++/**
++ * Map pixel format.
++ *
++ * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetV1Format()
++ */
++static uint32_t uc_ovl_map_format(uint32_t format)
++{
++ switch (format) {
++ case IMGFMT_UYVY:
++ case IMGFMT_YVYU:
++ case IMGFMT_YUY2:
++ return V1_COLORSPACE_SIGN | V1_YUV422;
++ case IMGFMT_IYUV:
++ return V1_COLORSPACE_SIGN | V1_YCbCr420 | V1_SWAP_SW;
++ case IMGFMT_YV12:
++ case IMGFMT_I420:
++ return V1_COLORSPACE_SIGN | V1_YCbCr420;
++ case IMGFMT_BGR15:
++ return V1_RGB15;
++ case IMGFMT_BGR16:
++ return V1_RGB16;
++ case IMGFMT_BGR32:
++ return V1_RGB32;
++ default :
++ printf("[unichrome] Unexpected pixelformat!");
++ return V1_YUV422;
++ }
++}
++
++
++/**
++ * Calculate V1 control and fifo-control register values
++ * @param format pixel format
++ * @param sw source width
++ * @param hwrev CLE266 hardware revision
++ * @param extfifo_on set this 1 if the extended FIFO is enabled
++ * @param control will hold value for V1_CONTROL
++ * @param fifo will hold value for V1_FIFO_CONTROL
++ */
++static void uc_ovl_map_v1_control(uint32_t format, int sw,
++ int hwrev, int extfifo_on,
++ uint32_t* control, uint32_t* fifo)
++{
++ *control = V1_BOB_ENABLE | uc_ovl_map_format(format);
++
++ if (hwrev == 0x10) {
++ *control |= V1_EXPIRE_NUM_F;
++ }
++ else {
++ if (extfifo_on) {
++ *control |= V1_EXPIRE_NUM_A | V1_FIFO_EXTENDED;
++ }
++ else {
++ *control |= V1_EXPIRE_NUM;
++ }
++ }
++
++ if ((format == IMGFMT_YV12) || (format == IMGFMT_I420)) {
++ //Minified video will be skewed without this workaround.
++ if (sw <= 80) { //Fetch count <= 5
++ *fifo = UC_MAP_V1_FIFO_CONTROL(16,0,0);
++ }
++ else {
++ if (hwrev == 0x10)
++ *fifo = UC_MAP_V1_FIFO_CONTROL(64,56,56);
++ else
++ *fifo = UC_MAP_V1_FIFO_CONTROL(16,12,8);
++ }
++ }
++ else {
++ if (hwrev == 0x10) {
++ *fifo = UC_MAP_V1_FIFO_CONTROL(64,56,56); // Default rev 0x10
++ }
++ else {
++ if (extfifo_on)
++ *fifo = UC_MAP_V1_FIFO_CONTROL(48,40,40);
++ else
++ *fifo = UC_MAP_V1_FIFO_CONTROL(32,29,16); // Default
++ }
++ }
++}
++
++
++static void uc_ovl_setup_fifo(int *extfifo_on, int dst_w)
++{
++ if (dst_w <= 1024)
++ {
++ // Disable extended FIFO
++ outb(0x16, 0x3c4); outb(mclk_save[0], 0x3c5);
++ outb(0x17, 0x3c4); outb(mclk_save[1], 0x3c5);
++ outb(0x18, 0x3c4); outb(mclk_save[2], 0x3c5);
++ *extfifo_on = 0;
++ }
++ else
++ {
++ // Enable extended FIFO
++ outb(0x17, 0x3c4); outb(0x2f, 0x3c5);
++ outb(0x16, 0x3c4); outb((mclk_save[0] & 0xf0) | 0x14, 0x3c5);
++ outb(0x18, 0x3c4); outb(0x56, 0x3c5);
++ *extfifo_on = 1;
++ }
++}
++
++
++static void uc_ovl_vcmd_wait(volatile uint8_t* vio)
++{
++ while ((VIDEO_IN(vio, V_COMPOSE_MODE)
++ & (V1_COMMAND_FIRE | V3_COMMAND_FIRE)));
++}
++
++
++int vixProbe(int verbose, int force)
++{
++ pciinfo_t lst[MAX_PCI_DEVICES];
++ unsigned i,num_pci;
++ int err;
++ err = pci_scan(lst,&num_pci);
++ if(err)
++ {
++ printf("[unichrome] Error occurred during pci scan: %s\n",strerror(err));
++ return err;
++ }
++ else
++ {
++ err = ENXIO;
++ for(i=0; i < num_pci; i++)
++ {
++ if(lst[i].vendor == VENDOR_VIA2)
++ {
++ int idx;
++ const char *dname;
++ idx = find_chip(lst[i].device);
++ if(idx == -1)
++ continue;
++ dname = pci_device_name(VENDOR_VIA2, lst[i].device);
++ dname = dname ? dname : "Unknown chip";
++ printf("[unichrome] Found chip: %s\n", dname);
++ uc_cap.device_id = lst[i].device;
++ err = 0;
++ memcpy(&pci_info, &lst[i], sizeof(pciinfo_t));
++ break;
++ }
++ }
++ }
++
++ if(err && verbose) printf("[unichrome] Can't find chip\n");
++ return err;
++}
++
++
++int vixInit(const char *args)
++{
++ long tmp;
++ uc_mem = map_phys_mem(pci_info.base0, 0x800000);
++ enable_app_io();
++
++ outb(0x2f, 0x3c4);
++ tmp = inb(0x3c5) << 0x18;
++ vio = map_phys_mem(tmp,0x1000);
++
++ outb(0x16, 0x3c4); mclk_save[0] = inb(0x3c5);
++ outb(0x17, 0x3c4); mclk_save[1] = inb(0x3c5);
++ outb(0x18, 0x3c4); mclk_save[2] = inb(0x3c5);
++
++ uc_grkey.ckey.blue = 0x00;
++ uc_grkey.ckey.green = 0x00;
++ uc_grkey.ckey.red = 0x00;
++
++#ifdef DEBUG_LOGFILE
++ logfile=fopen("/tmp/uc_vidix.log","w");
++#endif
++ return 0;
++}
++
++void vixDestroy(void)
++{
++#ifdef DEBUG_LOGFILE
++ if(logfile)
++ fclose(logfile);
++#endif
++ outb(0x16, 0x3c4); outb(mclk_save[0], 0x3c5);
++ outb(0x17, 0x3c4); outb(mclk_save[1], 0x3c5);
++ outb(0x18, 0x3c4); outb(mclk_save[2], 0x3c5);
++
++ disable_app_io();
++ unmap_phys_mem(uc_mem, 0x800000);
++ unmap_phys_mem(vio, 0x1000);
++}
++
++
++int vixGetCapability(vidix_capability_t *to)
++{
++ memcpy(to, &uc_cap, sizeof(vidix_capability_t));
++ return 0;
++}
++
++
++static int is_supported_fourcc(uint32_t fourcc)
++{
++ switch(fourcc)
++ {
++ case IMGFMT_YV12:
++ case IMGFMT_I420:
++ case IMGFMT_UYVY:
++ case IMGFMT_YVYU:
++ case IMGFMT_YUY2:
++ case IMGFMT_BGR15:
++ case IMGFMT_BGR16:
++ case IMGFMT_BGR32:
++ return 1;
++ default:
++ return 0;
++ }
++}
++
++int vixQueryFourcc(vidix_fourcc_t *to)
++{
++ if(is_supported_fourcc(to->fourcc))
++ {
++ to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP |
++ VID_DEPTH_4BPP | VID_DEPTH_8BPP |
++ VID_DEPTH_12BPP| VID_DEPTH_15BPP|
++ VID_DEPTH_16BPP| VID_DEPTH_24BPP|
++ VID_DEPTH_32BPP;
++ to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
++ return 0;
++ }
++ else
++ to->depth = to->flags = 0;
++ return ENOSYS;
++}
++
++
++int vixGetGrKeys(vidix_grkey_t *grkey)
++{
++ memcpy(grkey, &uc_grkey, sizeof(vidix_grkey_t));
++ return(0);
++}
++
++
++int vixSetGrKeys(const vidix_grkey_t *grkey)
++{
++ unsigned long dwCompose = VIDEO_IN(vio, V_COMPOSE_MODE) & ~0x0f;
++ memcpy(&uc_grkey, grkey, sizeof(vidix_grkey_t));
++ if (uc_grkey.ckey.op != CKEY_FALSE)
++ {
++ // Set colorkey
++ // (how do I detect BPP in hardware??)
++ unsigned long ckey;
++ if (1) // Assume 16-bit graphics
++ {
++ ckey = (grkey->ckey.blue & 0x1f)
++ | ((grkey->ckey.green & 0x3f) << 5)
++ | ((grkey->ckey.red & 0x1f) << 11);
++ }
++ else
++ {
++ ckey = (grkey->ckey.blue)
++ | (grkey->ckey.green << 8)
++ | (grkey->ckey.red << 16);
++ }
++ VIDEO_OUT(vio, V_COLOR_KEY, ckey);
++ dwCompose |= SELECT_VIDEO_IF_COLOR_KEY;
++ }
++
++ // Execute the changes
++ VIDEO_OUT(vio, V_COMPOSE_MODE, dwCompose | V1_COMMAND_FIRE);
++ return(0);
++}
++
++
++vidix_video_eq_t equal =
++{
++ VEQ_CAP_BRIGHTNESS | VEQ_CAP_SATURATION | VEQ_CAP_HUE,
++ 300, 100, 0, 0, 0, 0, 0, 0
++};
++
++int vixPlaybackGetEq( vidix_video_eq_t * eq)
++{
++ memcpy(eq,&equal,sizeof(vidix_video_eq_t));
++ return 0;
++}
++
++int vixPlaybackSetEq( const vidix_video_eq_t * eq)
++{
++ return 0;
++}
++
++
++static int YOffs,UOffs,VOffs;
++
++int vixConfigPlayback(vidix_playback_t *info)
++{
++ int src_w, drw_w;
++ int src_h, drw_h;
++ long base0, pitch;
++ int uv_size, swap_uv;
++ unsigned int i;
++ int extfifo_on;
++
++ // Overlay register settings
++ uint32_t win_start, win_end;
++ uint32_t zoom, mini;
++ uint32_t dcount, falign, qwfetch;
++ uint32_t v_ctrl, fifo_ctrl;
++
++ if(!is_supported_fourcc(info->fourcc))
++ return -1;
++
++ src_w = info->src.w;
++ src_h = info->src.h;
++
++ drw_w = info->dest.w;
++ drw_h = info->dest.h;
++
++ // Setup FIFO
++ uc_ovl_setup_fifo(&extfifo_on, src_w);
++
++ // Get image format, FIFO size, etc.
++ uc_ovl_map_v1_control(info->fourcc, src_w, 3, extfifo_on,
++ &v_ctrl, &fifo_ctrl);
++
++ // Setup layer window
++ win_start = (info->dest.x << 16) | info->dest.y;
++ win_end = ((info->dest.x + drw_w - 1) << 16) |
++ (info->dest.y + drw_h - 1);
++
++ // Get scaling and data-fetch parameters
++ zoom = 0;
++ mini = 0;
++ uc_ovl_map_vzoom(src_h, drw_h, &zoom, &mini);
++ uc_ovl_map_hzoom(src_w, drw_w, &zoom, &mini, &falign, &dcount);
++ qwfetch = uc_ovl_map_qwfetch(info->fourcc, src_w);
++
++ // Calculate buffer sizes
++ swap_uv = 0;
++ switch(info->fourcc)
++ {
++ default:
++ case IMGFMT_YV12:
++ swap_uv = 1;
++ case IMGFMT_I420:
++ case IMGFMT_UYVY:
++ case IMGFMT_YVYU:
++ pitch = ALIGN_TO (src_w, 32);
++ uv_size = (pitch >> 1) * (src_h >> 1);
++ break;
++
++ case IMGFMT_YUY2:
++ case IMGFMT_BGR15:
++ case IMGFMT_BGR16:
++ pitch = ALIGN_TO (src_w << 1, 32);
++ uv_size = 0;
++ break;
++
++ case IMGFMT_BGR32:
++ pitch = ALIGN_TO (src_w << 2, 32);
++ uv_size = 0;
++ break;
++ }
++ if ((src_w > 4096) || (src_h > 4096) ||
++ (src_w < 32) || (src_h < 1) || (pitch > 0x1fff))
++ {
++ printf("[unichrome] Layer size out of bounds\n");
++ }
++
++ // Calculate offsets
++ info->offset.y = 0;
++ info->offset.v = info->offset.y + pitch * src_h;
++ info->offset.u = info->offset.v + uv_size;
++ info->frame_size = info->offset.u + uv_size;
++ YOffs = info->offset.y;
++ UOffs = (swap_uv ? info->offset.v : info->offset.u);
++ VOffs = (swap_uv ? info->offset.u : info->offset.v);
++
++ /* Assume we have 2 MB to play with */
++ info->num_frames = FRAMEBUFFER_SIZE / info->frame_size;
++ if(info->num_frames > VID_PLAY_MAXFRAMES)
++ info->num_frames = VID_PLAY_MAXFRAMES;
++
++ /* Start at 6 MB. Let's hope it's not in use. */
++ base0 = FRAMEBUFFER_START;
++ info->dga_addr = uc_mem + base0;
++
++ info->dest.pitch.y = 32;
++ info->dest.pitch.u = 32;
++ info->dest.pitch.v = 32;
++
++ for(i = 0; i < info->num_frames; i++)
++ {
++ info->offsets[i] = info->frame_size * i;
++ frames[i] = base0+info->offsets[i];
++ }
++
++ // Write to the hardware
++ uc_ovl_vcmd_wait(vio);
++
++ // Configure diy_pitchlay parameters now
++ if (v_ctrl & V1_COLORSPACE_SIGN)
++ {
++ VIDEO_OUT (vio, V1_ColorSpaceReg_2, ColorSpaceValue_2);
++ VIDEO_OUT (vio, V1_ColorSpaceReg_1, ColorSpaceValue_1);
++ }
++
++ VIDEO_OUT(vio, V1_CONTROL, v_ctrl);
++ VIDEO_OUT(vio, V_FIFO_CONTROL, fifo_ctrl);
++
++ VIDEO_OUT(vio, V1_WIN_START_Y, win_start);
++ VIDEO_OUT(vio, V1_WIN_END_Y, win_end);
++
++ VIDEO_OUT(vio, V1_SOURCE_HEIGHT, (src_h << 16) | dcount);
++
++ VIDEO_OUT(vio, V12_QWORD_PER_LINE, qwfetch << 20);
++ VIDEO_OUT(vio, V1_STRIDE, pitch | ((pitch >> 1) << 16));
++
++ VIDEO_OUT(vio, V1_MINI_CONTROL, mini);
++ VIDEO_OUT(vio, V1_ZOOM_CONTROL, zoom);
++
++ // Configure buffer address and execute the changes now!
++ vixPlaybackFrameSelect(0);
++
++ return 0;
++}
++
++
++int vixPlaybackOn(void)
++{
++ LOGWRITE("Enable overlay\n");
++
++ // Turn on overlay
++ VIDEO_OUT(vio, V1_CONTROL, VIDEO_IN(vio, V1_CONTROL) | V1_ENABLE);
++
++ // Execute the changes
++ VIDEO_OUT(vio, V_COMPOSE_MODE,
++ VIDEO_IN(vio, V_COMPOSE_MODE) | V1_COMMAND_FIRE);
++
++ return 0;
++}
++
++
++int vixPlaybackOff(void)
++{
++ LOGWRITE("Disable overlay\n");
++
++ uc_ovl_vcmd_wait(vio);
++
++ // Restore FIFO
++ VIDEO_OUT(vio, V_FIFO_CONTROL, UC_MAP_V1_FIFO_CONTROL(16,12,8));
++
++ // Turn off overlay
++ VIDEO_OUT(vio, V1_CONTROL, VIDEO_IN(vio, V1_CONTROL) & ~V1_ENABLE);
++
++ // Execute the changes
++ VIDEO_OUT(vio, V_COMPOSE_MODE,
++ VIDEO_IN(vio, V_COMPOSE_MODE) | V1_COMMAND_FIRE);
++
++ return 0;
++}
++
++
++int vixPlaybackFrameSelect(unsigned int frame)
++{
++ LOGWRITE("Frame select\n");
++
++ uc_ovl_vcmd_wait(vio);
++
++ // Configure buffer address
++ VIDEO_OUT(vio, V1_STARTADDR_Y0, frames[frame]+YOffs);
++ VIDEO_OUT(vio, V1_STARTADDR_CB0, frames[frame]+UOffs);
++ VIDEO_OUT(vio, V1_STARTADDR_CR0, frames[frame]+VOffs);
++
++ // Execute the changes
++ VIDEO_OUT(vio, V_COMPOSE_MODE,
++ VIDEO_IN(vio, V_COMPOSE_MODE) | V1_COMMAND_FIRE);
++
++ return 0;
++}
++
+--- ./src/xine-engine/Makefile.am 26 Nov 2004 06:00:32 -0000 1.103
++++ ./src/xine-engine/Makefile.am 3 Jan 2005 21:14:01 -0000 1.103.2.1
+@@ -40,7 +40,8 @@
+ $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS)
+
+ libxine_la_LDFLAGS = \
+- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags)
++ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
++ $(def_ldflags)
+
+
+ include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \
+--- ./src/xine-engine/audio_out.c 19 Dec 2004 20:24:30 -0000 1.189
++++ ./src/xine-engine/audio_out.c 9 Feb 2005 19:39:44 -0000 1.189.2.1
+@@ -17,7 +17,7 @@
+ * along with self program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: audio_out.c,v 1.189 2004/12/19 20:24:30 miguelfreitas Exp $
++ * $Id: audio_out.c,v 1.189.2.1 2005/02/09 19:39:44 mroi Exp $
+ *
+ * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
+ * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
+@@ -1679,7 +1679,7 @@
+ case AO_PROP_EQ_4000HZ:
+ case AO_PROP_EQ_8000HZ:
+ case AO_PROP_EQ_16000HZ:
+- ret = (100 * this->eq_gain[property - AO_PROP_EQ_30HZ]) / (1 << FP_FRBITS) ;
++ ret = (100.0 * this->eq_gain[property - AO_PROP_EQ_30HZ]) / (1 << FP_FRBITS) ;
+ break;
+
+ case AO_PROP_DISCARD_BUFFERS:
+@@ -1738,7 +1738,7 @@
+ int min_gain, max_gain, i;
+
+ this->eq_gain[property - AO_PROP_EQ_30HZ] = EQ_REAL(((float)value / 100.0)) ;
+-
++
+ /* calc pregain, find out if any gain != 0.0 - enable eq if that is the case */
+ min_gain = EQ_REAL(0.0);
+ max_gain = EQ_REAL(0.0);
+--- ./src/xine-engine/buffer.h 12 Dec 2004 22:01:30 -0000 1.145
++++ ./src/xine-engine/buffer.h 9 Feb 2005 19:39:46 -0000 1.145.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: buffer.h,v 1.145 2004/12/12 22:01:30 mroi Exp $
++ * $Id: buffer.h,v 1.145.2.1 2005/02/09 19:39:46 mroi Exp $
+ *
+ *
+ * contents:
+@@ -226,6 +226,7 @@
+ #define BUF_AUDIO_VMD 0x03320000
+ #define BUF_AUDIO_XAN_DPCM 0x03330000
+ #define BUF_AUDIO_ALAC 0x03340000
++#define BUF_AUDIO_MPC 0x03350000
+
+ /* spu buffer types: */
+
+--- ./src/xine-engine/buffer_types.c 30 Nov 2004 00:40:59 -0000 1.89
++++ ./src/xine-engine/buffer_types.c 9 Feb 2005 19:39:46 -0000 1.89.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: buffer_types.c,v 1.89 2004/11/30 00:40:59 tmattern Exp $
++ * $Id: buffer_types.c,v 1.89.2.1 2005/02/09 19:39:46 mroi Exp $
+ *
+ *
+ * contents:
+@@ -972,6 +972,13 @@
+ BUF_AUDIO_ALAC,
+ "Apple Lossless Audio Codec"
+ },
++{
++ {
++ 0
++ },
++ BUF_AUDIO_MPC,
++ "Musepack"
++},
+ { { 0 }, 0, "last entry" }
+ };
+
+--- ./src/xine-engine/configfile.c 20 Dec 2004 21:22:21 -0000 1.73
++++ ./src/xine-engine/configfile.c 15 Jan 2005 17:51:43 -0000 1.73.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: configfile.c,v 1.73 2004/12/20 21:22:21 mroi Exp $
++ * $Id: configfile.c,v 1.73.2.1 2005/01/15 17:51:43 mroi Exp $
+ *
+ * config object (was: file) management - implementation
+ *
+@@ -129,6 +129,7 @@
+ { "input.dvd_use_readahead", "media.dvd.readahead" },
+ { "input.file_hidden_files", "media.files.show_hidden_files" },
+ { "input.file_origin_path", "media.files.origin_path" },
++ { "input.http_no_proxy", "media.network.http_no_proxy" },
+ { "input.http_proxy_host", "media.network.http_proxy_host" },
+ { "input.http_proxy_password", "media.network.http_proxy_password" },
+ { "input.http_proxy_port", "media.network.http_proxy_port" },
+--- ./src/xine-engine/input_rip.c 12 Dec 2004 22:01:31 -0000 1.27
++++ ./src/xine-engine/input_rip.c 9 Feb 2005 19:39:46 -0000 1.27.2.1
+@@ -29,7 +29,7 @@
+ * - it's possible speeder saving streams in the xine without playing:
+ * xine stream_mrl#save:file.raw\;noaudio\;novideo
+ *
+- * $Id: input_rip.c,v 1.27 2004/12/12 22:01:31 mroi Exp $
++ * $Id: input_rip.c,v 1.27.2.1 2005/02/09 19:39:46 mroi Exp $
+ */
+
+ /* TODO:
+@@ -157,7 +157,7 @@
+ if (retlen > nread_orig) {
+ nwrite = retlen - nread_orig;
+ if (fwrite(buf + this->savepos - this->curpos, nwrite, 1, this->file) != 1) {
+- xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"), (intmax_t)(retlen - nread_orig), strerror(errno));
++ xine_log(this->stream->xine, XINE_LOG_MSG, _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"), (intmax_t)(retlen - nread_orig), strerror(errno));
+ return -1;
+ }
+ this->savepos += nwrite;
+@@ -286,7 +286,7 @@
+ nwrite = retlen - nread_orig;
+ if (fwrite(buf->content + this->savepos - this->curpos, nwrite, 1, this->file) != 1) {
+ xine_log(this->stream->xine, XINE_LOG_MSG,
+- _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"),
++ _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"),
+ (intmax_t)(retlen - nread_orig), strerror(errno));
+ return NULL;
+ }
+@@ -392,7 +392,7 @@
+ if ((pos = rip_seek_original(this, this->savepos)) == -1) return -1;
+ if (pos > this->savepos)
+ xine_log(this->stream->xine, XINE_LOG_MSG,
+- _("input_rip: %" PRIiMAX " bytes dropped\n"),
++ _("input_rip: %" PRIdMAX " bytes dropped\n"),
+ (intmax_t)(pos - this->savepos));
+ }
+ }
+@@ -638,7 +638,7 @@
+ if (this->preview && this->preview_size) {
+ if (fwrite(this->preview, this->preview_size, 1, this->file) != 1) {
+ xine_log(this->stream->xine, XINE_LOG_MSG,
+- _("input_rip: error writing to file %" PRIiMAX " bytes: %s\n"),
++ _("input_rip: error writing to file %" PRIdMAX " bytes: %s\n"),
+ (intmax_t)(this->preview_size), strerror(errno));
+ fclose(this->file);
+ free(this);
+--- ./src/xine-engine/load_plugins.c 22 Dec 2004 22:05:22 -0000 1.193
++++ ./src/xine-engine/load_plugins.c 9 Feb 2005 19:39:46 -0000 1.193.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: load_plugins.c,v 1.193 2004/12/22 22:05:22 mroi Exp $
++ * $Id: load_plugins.c,v 1.193.2.1 2005/02/09 19:39:46 mroi Exp $
+ *
+ *
+ * Load input/demux/audio_out/video_out/codec plugins
+@@ -1319,27 +1319,6 @@
+ return catalog->ids;
+ }
+
+-const char *xine_get_input_plugin_description (xine_t *this, const char *plugin_id) {
+-
+- plugin_catalog_t *catalog;
+- plugin_node_t *node;
+-
+- catalog = this->plugin_catalog;
+-
+- node = xine_list_first_content (catalog->input);
+- while (node) {
+-
+- if (!strcasecmp (node->info->id, plugin_id)) {
+-
+- input_class_t *ic = (input_class_t *) node->plugin_class;
+-
+- return ic->get_description(ic);
+- }
+- node = xine_list_next_content (catalog->input);
+- }
+- return NULL;
+-}
+-
+ /*
+ * video out plugins section
+ */
+@@ -1956,6 +1935,32 @@
+ return catalog->ids;
+ }
+
++#define GET_PLUGIN_DESC(NAME,TYPE,CATITEM) \
++ const char *xine_get_##NAME##_plugin_description (xine_t *this, const char *plugin_id) { \
++ plugin_catalog_t *catalog = this->plugin_catalog; \
++ plugin_node_t *node = xine_list_first_content (catalog->CATITEM); \
++ while (node) { \
++ if (!strcasecmp (node->info->id, plugin_id)) { \
++ TYPE##_class_t *ic = (TYPE##_class_t *) node->plugin_class; \
++ if (!ic) \
++ ic = node->plugin_class = \
++ _load_plugin_class (this, node->filename, node->info, NULL); \
++ return ic->get_description(ic); \
++ } \
++ node = xine_list_next_content (catalog->CATITEM); \
++ } \
++ return NULL; \
++ }
++
++GET_PLUGIN_DESC (input, input, input)
++GET_PLUGIN_DESC (demux, demux, demux)
++GET_PLUGIN_DESC (spu, spu_decoder, spu)
++GET_PLUGIN_DESC (audio, audio_decoder, audio)
++GET_PLUGIN_DESC (video, video_decoder, video)
++GET_PLUGIN_DESC (audio_driver, audio_driver, aout)
++GET_PLUGIN_DESC (video_driver, video_driver, vout)
++GET_PLUGIN_DESC (post, post, post)
++
+ xine_post_t *xine_post_init(xine_t *xine, const char *name, int inputs,
+ xine_audio_port_t **audio_target,
+ xine_video_port_t **video_target) {
+--- ./src/xine-engine/osd.c 12 Dec 2004 22:01:31 -0000 1.67
++++ ./src/xine-engine/osd.c 9 Feb 2005 19:39:46 -0000 1.67.2.1
+@@ -206,6 +206,10 @@
+ osd->y1 = osd->height;
+ if(osd->y2 > osd->height)
+ osd->y2 = osd->height;
++ if(osd->x1 < 0) osd->x1 = 0;
++ if(osd->x2 < 0) osd->x2 = 0;
++ if(osd->y1 < 0) osd->y1 = 0;
++ if(osd->y2 < 0) osd->y2 = 0;
+
+ #ifdef DEBUG_RLE
+ lprintf("osd_show %p rle starts\n", osd);
+@@ -990,6 +994,12 @@
+ uint16_t unicode;
+ size_t inbytesleft;
+
++#ifdef HAVE_FT2
++ FT_UInt previous = 0;
++ FT_Bool use_kerning = osd->ft2 && osd->ft2->useme && FT_HAS_KERNING(osd->ft2->face);
++ int first = 1;
++#endif
++
+ lprintf("osd=%p (%d,%d) \"%s\"\n", osd, x1, y1, text);
+
+ /* some sanity checks for the color indices */
+@@ -1031,90 +1041,108 @@
+ inbytesleft--;
+ #endif
+
++
+ #ifdef HAVE_FT2
+ if (osd->ft2 && osd->ft2->useme) {
+- i = FT_Get_Char_Index( osd->ft2->face, unicode );
+- } else {
+-#endif
+-
+- i = osd_search(font->fontchar, font->num_fontchars, unicode);
+
+- lprintf("font '%s' [%d, U+%04X == U+%04X] %dx%d -> %d,%d\n", font->name, i,
+- unicode, font->fontchar[i].code, font->fontchar[i].width,
+- font->fontchar[i].height, x1, y1);
++ FT_GlyphSlot slot = osd->ft2->face->glyph;
+
+-#ifdef HAVE_FT2
+- } /* !(osd->ft2 && osd->ft2->useme) */
+-#endif
++ i = FT_Get_Char_Index( osd->ft2->face, unicode );
++
++ /* add kerning relative to the previous letter */
++ if (use_kerning && previous && i) {
++ FT_Vector delta;
++ FT_Get_Kerning(osd->ft2->face, previous, i, FT_KERNING_DEFAULT, &delta);
++ x1 += delta.x / 64;
++ }
++ previous = i;
+
+-#ifdef HAVE_FT2
+- if (osd->ft2 && osd->ft2->useme) {
+- int gheight, gwidth;
+- FT_GlyphSlot slot = osd->ft2->face->glyph;
+-
+ if (FT_Load_Glyph(osd->ft2->face, i, FT_LOAD_DEFAULT)) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error loading glyph\n"));
+- continue;
++ continue;
+ }
+
+ if (slot->format != ft_glyph_format_bitmap) {
+- if (FT_Render_Glyph(osd->ft2->face->glyph, ft_render_mode_normal))
+- xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error in rendering glyph\n"));
++ if (FT_Render_Glyph(slot, ft_render_mode_normal))
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error in rendering glyph\n"));
+ }
+
+- dst = osd->area + y1 * osd->width + x1;
++ /* if the first letter has a bearing not on the basepoint shift, the
++ * whole output to be sure that we are inside the bounding box
++ */
++ if (first) x1 -= slot->bitmap_left;
++ first = 0;
++
++ /* we shift the whole glyph down by it's ascender so that the specified
++ * coordinate is the top left corner which is much more practical than
++ * the baseline as the user normally has no idea where the baseline is
++ */
++ dst = osd->area + (y1 + osd->ft2->face->size->metrics.ascender/64 - slot->bitmap_top) * osd->width;
+ src = (uint8_t*) slot->bitmap.buffer;
+- gheight = slot->bitmap.rows;
+- gwidth = slot->bitmap.width;
+
+- for( y = 0; y < gheight; y++ ) {
++ for (y = 0; y < slot->bitmap.rows; y++) {
+ uint8_t *s = src;
+- uint8_t *d = dst
+- - slot->bitmap_top * osd->width
+- + slot->bitmap_left;
+-
+- while (s < src + gwidth) {
+- if(d <= (osd->area + (osd->width * osd->height)))
+- *d = (uint8_t)(*s/26+1) + (uint8_t) color_base;
+-
+- d++;
+- s++;
+- }
++ uint8_t *d = dst + x1 + slot->bitmap_left;
++
++ if (d >= osd->area + osd->width*osd->height)
++ break;
++
++ if (dst > osd->area)
++ while (s < src + slot->bitmap.width) {
++ if ((d >= dst) && (d < dst + osd->width) && *s)
++ *d = (uint8_t)(*s/25) + (uint8_t) color_base;
++
++ d++;
++ s++;
++ }
++
+ src += slot->bitmap.pitch;
+ dst += osd->width;
++
+ }
+- x1 += slot->advance.x >> 6;
++
++ x1 += slot->advance.x / 64;
+ if( x1 > osd->x2 ) osd->x2 = x1;
+- if( y1 > osd->y2 ) osd->y2 = y1;
++ if( y1 + osd->ft2->face->size->metrics.height/64 > osd->y2 ) osd->y2 = y1 + osd->ft2->face->size->metrics.height/64;
+
+ } else {
++
+ #endif
+
+- if ( i != font->num_fontchars ) {
+- dst = osd->area + y1 * osd->width + x1;
+- src = font->fontchar[i].bmp;
++ i = osd_search(font->fontchar, font->num_fontchars, unicode);
++
++ lprintf("font '%s' [%d, U+%04X == U+%04X] %dx%d -> %d,%d\n", font->name, i,
++ unicode, font->fontchar[i].code, font->fontchar[i].width,
++ font->fontchar[i].height, x1, y1);
++
++ if ( i != font->num_fontchars ) {
++ dst = osd->area + y1 * osd->width;
++ src = font->fontchar[i].bmp;
++
++ for( y = 0; y < font->fontchar[i].height; y++ ) {
++ uint8_t *s = src;
++ uint8_t *d = dst + x1;
++
++ if (d >= osd->area + osd->width*osd->height)
++ break;
++
++ if (dst >= osd->area)
++ while (s < src + font->fontchar[i].width) {
++ if((d >= dst) && (d < dst + osd->width) && (*s > 1)) /* skip drawing transparency */
++ *d = *s + (uint8_t) color_base;
++
++ d++;
++ s++;
++ }
++ src += font->fontchar[i].width;
++ dst += osd->width;
++ }
++ x1 += font->fontchar[i].width - (font->fontchar[i].width * FONT_OVERLAP);
+
+- for( y = 0; y < font->fontchar[i].height; y++ ) {
+- int width = font->fontchar[i].width;
+- uint8_t *s = src, *d = dst;
+-
+- while (s < src + width) {
+- if(d <= (osd->area + (osd->width * osd->height))
+- && *s > 1) /* skip drawing transparency */
+- *d = *s + (uint8_t) color_base;
+-
+- d++;
+- s++;
+- }
+- src += font->fontchar[i].width;
+- dst += osd->width;
++ if( x1 > osd->x2 ) osd->x2 = x1;
++ if( y1 + font->fontchar[i].height > osd->y2 )
++ osd->y2 = y1 + font->fontchar[i].height;
+ }
+- x1 += font->fontchar[i].width - (font->fontchar[i].width * FONT_OVERLAP);
+-
+- if( x1 > osd->x2 ) osd->x2 = x1;
+- if( y1 + font->fontchar[i].height > osd->y2 )
+- osd->y2 = y1 + font->fontchar[i].height;
+- }
+
+ #ifdef HAVE_FT2
+ } /* !(osd->ft2 && osd->ft2->useme) */
+@@ -1139,6 +1167,13 @@
+ uint16_t unicode;
+ size_t inbytesleft;
+
++#ifdef HAVE_FT2
++ /* not all free type fonts provide kerning */
++ FT_Bool use_kerning = osd->ft2 && osd->ft2->useme && FT_HAS_KERNING(osd->ft2->face);
++ FT_UInt previous = 0;
++ int first_glyph = 1;
++#endif
++
+ lprintf("osd=%p \"%s\"\n", osd, text);
+
+ pthread_mutex_lock (&this->osd_mutex);
+@@ -1176,11 +1211,18 @@
+
+ #ifdef HAVE_FT2
+ if (osd->ft2 && osd->ft2->useme) {
+- int first = 1;
+ FT_GlyphSlot slot = osd->ft2->face->glyph;
+
+ i = FT_Get_Char_Index( osd->ft2->face, unicode);
+
++ /* kerning add the relative to the previous letter */
++ if (use_kerning && previous && i) {
++ FT_Vector delta;
++ FT_Get_Kerning(osd->ft2->face, previous, i, FT_KERNING_DEFAULT, &delta);
++ *width += delta.x / 64;
++ }
++ previous = i;
++
+ if (FT_Load_Glyph(osd->ft2->face, i, FT_LOAD_DEFAULT)) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error loading glyph %i\n"), i);
+ text++;
+@@ -1189,13 +1231,14 @@
+
+ if (slot->format != ft_glyph_format_bitmap) {
+ if (FT_Render_Glyph(osd->ft2->face->glyph, ft_render_mode_normal))
+- xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error in rendering\n"));
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("osd: error in rendering\n"));
+ }
+- if (first) *width += slot->bitmap_left;
+- first = 0;
+- *width += slot->advance.x >> 6;
+- /* font height from baseline to top */
+- *height = MAX(*height, slot->bitmap_top);
++ /* left shows the left edge relative to the base point. A positive value means the
++ * letter is shifted right, so we need to subtract the value from the width
++ */
++ if (first_glyph) *width -= slot->bitmap_left;
++ first_glyph = 0;
++ *width += slot->advance.x / 64;
+ text++;
+ } else {
+ #endif
+@@ -1211,6 +1254,23 @@
+ #endif
+ }
+
++#ifdef HAVE_FT2
++ if (osd->ft2 && osd->ft2->useme) {
++ /* if we have a true type font we need to do some corrections for the last
++ * letter. As this one is still in the gylph slot we can still work with
++ * it. For the last letter be must not use advance and width but the real
++ * width of the bitmap. We're right from the base point so we subtract the
++ * advance value that was added in the for-loop and add the width. We have
++ * to also add the left bearing because the letter might be shifted left or
++ * right and then the right edge is also shifted
++ */
++ *width -= osd->ft2->face->glyph->advance.x / 64;
++ *width += osd->ft2->face->glyph->bitmap.width;
++ *width += osd->ft2->face->glyph->bitmap_left;
++ *height = osd->ft2->face->size->metrics.height / 64;
++ }
++#endif
++
+ pthread_mutex_unlock (&this->osd_mutex);
+
+ return 1;
+--- ./src/xine-engine/xine.c 20 Dec 2004 21:22:21 -0000 1.306
++++ ./src/xine-engine/xine.c 9 Feb 2005 19:39:47 -0000 1.306.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xine.c,v 1.306 2004/12/20 21:22:21 mroi Exp $
++ * $Id: xine.c,v 1.306.2.1 2005/02/09 19:39:47 mroi Exp $
+ */
+
+ /*
+@@ -273,7 +273,8 @@
+
+ lprintf ("status before = %d\n", stream->status);
+
+- if (stream->status == XINE_STATUS_STOP) {
++ if ( stream->status == XINE_STATUS_IDLE ||
++ stream->status == XINE_STATUS_STOP ) {
+ _x_demux_control_end(stream, 0);
+ lprintf ("ignored\n");
+ return;
+@@ -391,6 +392,16 @@
+
+ close_internal (stream);
+
++ /*
++ * set status to idle.
++ * not putting this into close_internal because it is also called
++ * by open_internal.
++ */
++
++ /* Don't change status if we're quitting */
++ if (stream->status != XINE_STATUS_QUIT)
++ stream->status = XINE_STATUS_IDLE;
++
+ pthread_mutex_unlock (&stream->frontend_lock);
+ }
+
+@@ -467,7 +478,7 @@
+ _x_extra_info_reset( stream->audio_decoder_extra_info );
+
+ stream->xine = this;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+
+ stream->spu_decoder_plugin = NULL;
+ stream->spu_decoder_streamtype = -1;
+@@ -614,8 +625,10 @@
+ pthread_mutex_lock (&queue->lock);
+ pthread_mutex_unlock (&stream->event_queues_lock);
+
+- while (!xine_list_is_empty (queue->events)) {
+- pthread_cond_wait (&queue->events_processed, &queue->lock);
++ if (queue->listener_thread != NULL) {
++ while (!xine_list_is_empty (queue->events)) {
++ pthread_cond_wait (&queue->events_processed, &queue->lock);
++ }
+ }
+
+ pthread_mutex_unlock (&queue->lock);
+@@ -633,7 +646,8 @@
+ if (!mrl) {
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ if (stream->status != XINE_STATUS_IDLE)
++ stream->status = XINE_STATUS_STOP;
+ return 0;
+ }
+
+@@ -718,7 +732,7 @@
+ if (!(stream->demux_plugin = _x_find_demux_plugin_by_name(stream, demux_name, stream->input_plugin))) {
+ xine_log(stream->xine, XINE_LOG_MSG, _("xine: specified demuxer %s failed to start\n"), demux_name);
+ stream->err = XINE_ERROR_NO_DEMUX_PLUGIN;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ free(demux_name);
+ return 0;
+ }
+@@ -729,7 +743,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -759,14 +773,14 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error opening rip input plugin instance\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -790,7 +804,7 @@
+ if (!(stream->demux_plugin = _x_find_demux_plugin_last_probe(stream, demux_name, stream->input_plugin))) {
+ xine_log(stream->xine, XINE_LOG_MSG, _("xine: last_probed demuxer %s failed to start\n"), demux_name);
+ stream->err = XINE_ERROR_NO_DEMUX_PLUGIN;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ free(demux_name);
+ return 0;
+ }
+@@ -802,7 +816,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -814,7 +828,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("ignoring video\n"));
+@@ -827,7 +841,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("ignoring audio\n"));
+@@ -840,7 +854,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("ignoring subpicture\n"));
+@@ -853,7 +867,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ xprintf (stream->xine, XINE_VERBOSITY_LOG, _("input cache plugin disabled\n"));
+@@ -879,7 +893,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -904,7 +918,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -939,7 +953,7 @@
+ } else {
+ xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ return 0;
+ }
+ continue;
+@@ -970,7 +984,7 @@
+ config_entry);
+ }
+ stream->err = XINE_ERROR_MALFORMED_MRL;
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+ free(config_entry);
+ return 0;
+ }
+@@ -993,7 +1007,7 @@
+ xine_log (stream->xine, XINE_LOG_MSG, _("xine: couldn't find demux for >%s<\n"), mrl);
+ stream->err = XINE_ERROR_NO_DEMUX_PLUGIN;
+
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+
+ /* force the engine to unregister fifo callbacks */
+ _x_demux_control_nop(stream, BUF_FLAG_END_STREAM);
+@@ -1037,7 +1051,7 @@
+ stream->input_plugin = NULL;
+ stream->err = XINE_ERROR_NO_DEMUX_PLUGIN;
+
+- stream->status = XINE_STATUS_STOP;
++ stream->status = XINE_STATUS_IDLE;
+
+ xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "return from\n");
+ return 0;
+@@ -1045,6 +1059,8 @@
+
+ _x_demux_control_headers_done (stream);
+
++ stream->status = XINE_STATUS_STOP;
++
+ lprintf ("done\n");
+ return 1;
+ }
+--- ./src/xine-utils/color.c 9 Dec 2003 00:02:38 -0000 1.24
++++ ./src/xine-utils/color.c 9 Feb 2005 19:39:47 -0000 1.24.2.1
+@@ -61,7 +61,7 @@
+ * instructions), these macros will automatically map to those special
+ * instructions.
+ *
+- * $Id: color.c,v 1.24 2003/12/09 00:02:38 f1rmb Exp $
++ * $Id: color.c,v 1.24.2.1 2005/02/09 19:39:47 mroi Exp $
+ */
+
+ #include "xine_internal.h"
+@@ -701,12 +701,9 @@
+ p_y1 = p_y2;
+ p_y2 += y_src_pitch;
+
+- for( i_x = width / 8 ; i_x-- ; )
++ for( i_x = width / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+ }
+
+ p_y2 += i_source_margin;
+@@ -734,12 +731,9 @@
+ p_y1 = p_y2;
+ p_y2 += 2 * y_src_pitch;
+
+- for( i_x = width / 8 ; i_x-- ; )
++ for( i_x = width / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+ }
+
+ p_y2 += i_source_margin + y_src_pitch;
+@@ -770,12 +764,9 @@
+ p_y1 = p_y2;
+ p_y2 += 2 * y_src_pitch;
+
+- for( i_x = width / 8 ; i_x-- ; )
++ for( i_x = width / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+- C_YUV420_YUYV( );
+ }
+
+ p_y2 += i_source_margin + y_src_pitch;
+@@ -868,6 +859,10 @@
+ {
+ MMXEXT_YUV420_YUYV( );
+ }
++ for( i_x = (width % 8) / 2 ; i_x-- ; )
++ {
++ C_YUV420_YUYV( );
++ }
+
+ p_y2 += i_source_margin;
+ p_u += i_source_u_margin;
+@@ -898,6 +893,10 @@
+ {
+ MMXEXT_YUV420_YUYV( );
+ }
++ for( i_x = (width % 8) / 2 ; i_x-- ; )
++ {
++ C_YUV420_YUYV( );
++ }
+
+ p_y2 += i_source_margin + y_src_pitch;
+ p_u += i_source_u_margin + u_src_pitch;
+@@ -931,6 +930,10 @@
+ {
+ MMXEXT_YUV420_YUYV( );
+ }
++ for( i_x = (width % 8) / 2 ; i_x-- ; )
++ {
++ C_YUV420_YUYV( );
++ }
+
+ p_y2 += i_source_margin + y_src_pitch;
+ p_u += i_source_u_margin + u_src_pitch;
+--- ./src/xine-utils/xmllexer.c 31 May 2004 17:37:49 -0000 1.8
++++ ./src/xine-utils/xmllexer.c 9 Feb 2005 19:39:48 -0000 1.8.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xmllexer.c,v 1.8 2004/05/31 17:37:49 tmattern Exp $
++ * $Id: xmllexer.c,v 1.8.2.1 2005/02/09 19:39:48 mroi Exp $
+ *
+ */
+
+@@ -353,11 +353,13 @@
+ }
+ } else {
+ /* data mode, stop if char equal '<' */
+- if (c == '<') {
++ switch (c)
++ {
++ case '<':
+ tok[tok_pos] = '\0';
+ lex_mode = NORMAL;
+ return T_DATA;
+- } else {
++ default:
+ tok[tok_pos] = c;
+ tok_pos++;
+ lexbuf_pos++;
+@@ -411,3 +413,73 @@
+ lprintf("token buffer is null\n");
+ return T_ERROR;
+ }
++
++static struct {
++ char code;
++ unsigned char namelen;
++ char name[6];
++} lexer_entities[] = {
++ { '"', 4, "quot" },
++ { '&', 3, "amp" },
++ { '\'', 4, "apos" },
++ { '<', 2, "lt" },
++ { '>', 2, "gt" },
++ { 0 }
++};
++
++char *lexer_decode_entities (char *tok)
++{
++ char *buf = xine_xmalloc (strlen (tok) + 1);
++ char *bp = buf;
++ char c;
++
++ while ((c = *tok++))
++ {
++ if (c != '&')
++ *bp++ = c;
++ else
++ {
++ /* parse the character entity (on failure, treat it as literal text) */
++ char *tp = tok;
++ long i;
++
++ for (i = 0; lexer_entities[i].code; ++i)
++ if (!strncmp (lexer_entities[i].name, tok, lexer_entities[i].namelen)
++ && tok[lexer_entities[i].namelen] == ';')
++ break;
++ if (lexer_entities[i].code)
++ {
++ tok += lexer_entities[i].namelen + 1;
++ *bp++ = lexer_entities[i].code;
++ continue;
++ }
++
++ if (*tp++ != '#')
++ {
++ /* not a recognised name and not numeric */
++ *bp++ = '&';
++ continue;
++ }
++
++ /* entity is a number
++ * (note: strtol() allows "0x" prefix for hexadecimal, but we don't)
++ */
++ if (*tp == 'x' && tp[1] && tp[2] != 'x')
++ i = strtol (tp + 1, &tp, 16);
++ else
++ i = strtol (tp, &tp, 10);
++
++ if (i < 1 || i > 255 || *tp != ';')
++ {
++ /* out of range, or format error */
++ *bp++ = '&';
++ continue;
++ }
++
++ tok = tp + 1;
++ *bp++ = i;
++ }
++ }
++ *bp = 0;
++ return buf;
++}
+--- ./src/xine-utils/xmllexer.h 9 Dec 2003 00:02:39 -0000 1.3
++++ ./src/xine-utils/xmllexer.h 9 Feb 2005 19:39:48 -0000 1.3.2.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xmllexer.h,v 1.3 2003/12/09 00:02:39 f1rmb Exp $
++ * $Id: xmllexer.h,v 1.3.2.1 2005/02/09 19:39:48 mroi Exp $
+ *
+ */
+
+@@ -50,5 +50,6 @@
+ /* public functions */
+ void lexer_init(char * buf, int size);
+ int lexer_get_token(char * tok, int tok_size);
++char *lexer_decode_entities (char *tok);
+
+ #endif
+--- ./src/xine-utils/xmlparser.c 6 Dec 2003 18:11:53 -0000 1.13
++++ ./src/xine-utils/xmlparser.c 9 Feb 2005 19:39:48 -0000 1.13.2.1
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xmlparser.c,v 1.13 2003/12/06 18:11:53 mroi Exp $
++ * $Id: xmlparser.c,v 1.13.2.1 2005/02/09 19:39:48 mroi Exp $
+ *
+ */
+
+@@ -205,7 +205,7 @@
+ /* avoid a memory leak */
+ free(current_node->data);
+ }
+- current_node->data = strdup(tok);
++ current_node->data = lexer_decode_entities(tok);
+ lprintf("info: node data : %s\n", current_node->data);
+ break;
+ default:
+@@ -389,7 +389,7 @@
+ current_property = current_property->next;
+ }
+ current_property->name = strdup(property_name);
+- current_property->value = strdup(tok);
++ current_property->value = lexer_decode_entities(tok);
+ lprintf("info: new property %s=%s\n", current_property->name, current_property->value);
+ state = 2;
+ break;
+@@ -523,6 +523,40 @@
+ return 0;
+ }
+
++static int xml_escape_string_internal (char *buf, const char *s,
++ xml_escape_quote_t quote_type)
++{
++ int c, length = 0;
++ int sl = buf ? 8 : 0;
++ /* calculate max required buffer size */
++ while ((c = *s++ & 0xFF))
++ switch (c)
++ {
++ case '"': if (quote_type != XML_ESCAPE_DOUBLE_QUOTE) goto literal;
++ length += snprintf (buf + length, sl, """); break;
++ case '\'': if (quote_type != XML_ESCAPE_SINGLE_QUOTE) goto literal;
++ length += snprintf (buf + length, sl, "'"); break;
++ case '&': length += snprintf (buf + length, sl, "&"); break;
++ case '<': length += snprintf (buf + length, sl, "<"); break;
++ case '>': length += snprintf (buf + length, sl, ">"); break;
++ case 127: length += snprintf (buf + length, sl, ""); break;
++ case '\t':
++ case '\n':
++ literal: if (buf) buf[length] = c; ++length; break;
++ default: if (c >= ' ') goto literal;
++ length += snprintf (buf + length, sl, "&#%d;", c); break;
++ }
++ if (buf)
++ buf[length] = 0;
++ return length + 1;
++}
++
++char *xml_escape_string (const char *s, xml_escape_quote_t quote_type)
++{
++ char *buf = xine_xmalloc (xml_escape_string_internal (NULL, s, quote_type));
++ return buf ? (xml_escape_string_internal (buf, s, quote_type), buf) : NULL;
++}
++
+ static void printf_indent (int indent, const char *format, ...) {
+
+ int i ;
+@@ -550,7 +584,9 @@
+
+ p = node->props;
+ while (p) {
+- printf ("%s='%s'", p->name, p->value);
++ char *value = xml_escape_string (p->value, XML_ESCAPE_SINGLE_QUOTE);
++ printf ("%s='%s'", p->name, value);
++ free (value);
+ p = p->next;
+ if (p) {
+ printf ("\n");
+--- ./src/xine-utils/xmlparser.h 19 Jul 2003 00:22:43 -0000 1.2
++++ ./src/xine-utils/xmlparser.h 9 Feb 2005 19:39:49 -0000 1.2.4.1
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: xmlparser.h,v 1.2 2003/07/19 00:22:43 tmattern Exp $
++ * $Id: xmlparser.h,v 1.2.4.1 2005/02/09 19:39:49 mroi Exp $
+ *
+ */
+ #ifndef XML_PARSER_H
+@@ -60,6 +60,18 @@
+ int xml_parser_get_property_bool (xml_node_t *node, const char *name,
+ int def_value);
+
++/* for output:
++ * returns an escaped string (free() it when done)
++ * input must be in ASCII or UTF-8
++ */
++
++typedef enum {
++ XML_ESCAPE_NO_QUOTE,
++ XML_ESCAPE_SINGLE_QUOTE,
++ XML_ESCAPE_DOUBLE_QUOTE
++} xml_escape_quote_t;
++char *xml_escape_string (const char *s, xml_escape_quote_t quote_type);
++
+ /* for debugging purposes: dump read-in xml tree in a nicely
+ * indented fashion
+ */
Added: general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/patches/03_vdr-xine_patch.dpatch 2005-03-02 10:34:25 UTC (rev 225)
@@ -0,0 +1,3108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_vdr-xine_patch.dpatch by Reinhard Nissl
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: VDR plugin.
+
+@DPATCH@
+diff -urNad xine-lib-vdr-1.0/configure.ac /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac
+--- xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:42.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/configure.ac 2005-02-12 22:01:43.000000000 +0000
+@@ -2254,6 +2254,7 @@
+ src/xine-utils/Makefile
+ src/xine-engine/Makefile
+ src/xine-engine/xineintl.h
++src/vdr/Makefile
+ win32/Makefile
+ win32/contrib/Makefile
+ win32/contrib/pthreads/Makefile
+@@ -2312,7 +2313,7 @@
+ echo " - stdin_fifo - rtp"
+ echo " - http - mms"
+ echo " - pnm - rtsp"
+-echo " - dvb"
++echo " - dvb - vdr"
+ if test x"$external_dvdnav" = "xyes"; then
+ echo " - dvd (external libs)"
+ else
+@@ -2463,6 +2464,7 @@
+ echo " - eq - eq2"
+ echo " - boxblur - denoise3d"
+ echo " - unsharp - tvtime"
++echo " - vdr"
+ echo " * SFX:"
+ echo " - goom - oscope"
+ echo " - fftscope - mosaico"
+diff -urNad xine-lib-vdr-1.0/src/Makefile.am /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/Makefile.am
+--- xine-lib-vdr-1.0/src/Makefile.am 2005-02-12 22:01:42.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/Makefile.am 2005-02-12 22:02:17.000000000 +0000
+@@ -30,4 +30,6 @@
+ libfaad \
+ libflac \
+ libmusepack \
+- post
++ post \
++ vdr
++
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/decode.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/decode.c
+--- xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-02-12 22:01:42.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/decode.c 2005-02-12 22:01:43.000000000 +0000
+@@ -175,7 +175,7 @@
+ 1.0, 0.6735, 0.7031, 0.7615, 0.8055, 0.8437, 0.8935, 0.9157,
+ 0.9815, 1.0255, 1.0695, 1.0950, 1.1575, 1.2015, 1.0 /*reserved*/ };
+
+- if( !picture->mpeg1 ) {
++ if( !picture->delayed_mpeg1 ) {
+ /* these hardcoded values are defined on mpeg2 standard for
+ * aspect ratio. other values are reserved or forbidden. */
+ switch(picture->aspect_ratio_information) {
+@@ -251,6 +251,7 @@
+ {
+ picture_t * picture;
+ int is_frame_done;
++ int delayed_mpeg1;
+
+ /* wait for sequence_header_code */
+ if (mpeg2dec->is_sequence_needed) {
+@@ -429,6 +430,8 @@
+ break;
+
+ case 0xb3: /* sequence_header_code */
++ delayed_mpeg1 = picture->mpeg1;
++
+ if (mpeg2_header_sequence (picture, buffer)) {
+ fprintf (stderr, "bad sequence header\n");
+ /* abort(); */
+@@ -442,7 +445,8 @@
+
+ if (mpeg2dec->is_sequence_needed
+ || (picture->frame_width != picture->coded_picture_width)
+- || (picture->frame_height != picture->coded_picture_height)) {
++ || (picture->frame_height != picture->coded_picture_height)
++ || (picture->delayed_mpeg1 != delayed_mpeg1)) {
+ xine_event_t event;
+ xine_format_change_data_t data;
+
+@@ -477,6 +481,7 @@
+
+ picture->frame_width = picture->coded_picture_width;
+ picture->frame_height = picture->coded_picture_height;
++ picture->delayed_mpeg1 = delayed_mpeg1;
+ }
+ break;
+
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h
+--- xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2004-11-13 19:32:52.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/libmpeg2/mpeg2_internal.h 2005-02-12 22:01:43.000000000 +0000
+@@ -158,7 +158,7 @@
+
+ int second_field;
+
+- int mpeg1;
++ int mpeg1, delayed_mpeg1;
+
+ int skip_non_intra_dct;
+
+diff -urNad xine-lib-vdr-1.0/src/post/planar/expand.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/post/planar/expand.c
+--- xine-lib-vdr-1.0/src/post/planar/expand.c 2004-04-17 20:54:32.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/post/planar/expand.c 2005-02-12 22:01:43.000000000 +0000
+@@ -21,7 +21,8 @@
+ *
+ * expand video filter by James Stembridge 24/05/2003
+ * improved by Michael Roitzsch
+- *
++ * centre_crop_out_mode by Reinhard Nissl
++ *
+ * based on invert.c
+ *
+ */
+@@ -52,6 +53,11 @@
+ * This way, the decoder (or any other post plugin up the tree) will only
+ * see the frame area between the black bars and by that modify the
+ * enlarged version directly. No need for later copying.
++ *
++ * When centre_crop_out_mode is enabled, the plugin will detect the black
++ * bars to the left and right of the image and will then set up cropping
++ * to efficiently remove the black border around the 4:3 image, which the
++ * plugin would produce otherwise for this case.
+ */
+
+
+@@ -62,6 +68,7 @@
+ typedef struct expand_parameters_s {
+ int enable_automatic_shift;
+ int overlay_y_offset;
++ int centre_cut_out_mode;
+ } expand_parameters_t;
+
+ START_PARAM_DESCR(expand_parameters_t)
+@@ -69,6 +76,8 @@
+ "enable automatic overlay shifting")
+ PARAM_ITEM(POST_PARAM_TYPE_INT, overlay_y_offset, NULL, -500, 500, 0,
+ "manually shift the overlay vertically")
++PARAM_ITEM(POST_PARAM_TYPE_BOOL, centre_cut_out_mode, NULL, 0, 1, 0,
++ "cut out centered 4:3 image contained in 16:9 frame")
+ END_PARAM_DESCR(expand_param_descr)
+
+ typedef struct post_expand_s {
+@@ -79,6 +88,8 @@
+ int enable_automatic_shift;
+ int overlay_y_offset;
+ int top_bar_height;
++ int centre_cut_out_mode;
++ int cropping_active;
+ } post_expand_t;
+
+ /* plugin class functions */
+@@ -103,6 +114,9 @@
+ uint32_t height, double ratio,
+ int format, int flags);
+
++/* replaced vo_frame functions */
++static int expand_draw(vo_frame_t *frame, xine_stream_t *stream);
++
+ /* overlay manager intercept check */
+ static int expand_intercept_ovl(post_video_port_t *port);
+
+@@ -147,11 +161,14 @@
+
+ this->enable_automatic_shift = 0;
+ this->overlay_y_offset = 0;
++ this->centre_cut_out_mode = 0;
++ this->cropping_active = 0;
+
+ port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output);
+ port->new_port.get_frame = expand_get_frame;
+ port->intercept_ovl = expand_intercept_ovl;
+ port->new_manager->add_event = expand_overlay_add_event;
++ port->new_frame->draw = expand_draw;
+
+ input_param = &this->parameter_input;
+ input_param->name = "parameters";
+@@ -159,8 +176,8 @@
+ input_param->data = &post_api;
+ xine_list_append_content(this->post.input, input_param);
+
+- input->xine_in.name = "video";
+- output->xine_out.name = "expanded video";
++ input->xine_in.name = "video";
++ output->xine_out.name = "expanded video";
+
+ this->post.xine_post.video_input[0] = &port->new_port;
+
+@@ -206,6 +223,8 @@
+
+ this->enable_automatic_shift = param->enable_automatic_shift;
+ this->overlay_y_offset = param->overlay_y_offset;
++ this->centre_cut_out_mode = param->centre_cut_out_mode;
++
+ return 1;
+ }
+
+@@ -216,6 +235,8 @@
+
+ param->enable_automatic_shift = this->enable_automatic_shift;
+ param->overlay_y_offset = this->overlay_y_offset;
++ param->centre_cut_out_mode = this->centre_cut_out_mode;
++
+ return 1;
+ }
+
+@@ -228,6 +249,7 @@
+ "Parameters (FIXME: better help)\n"
+ " Enable_automatic_shift: Enable automatic overlay shifting\n"
+ " Overlay_y_offset: Manually shift the overlay vertically\n"
++ " Centre_cut_out_mode: extracts 4:3 image contained in 16:9 frame\n"
+ "\n"
+ );
+ }
+@@ -314,6 +336,10 @@
+
+ static int expand_intercept_ovl(post_video_port_t *port)
+ {
++ post_expand_t *this = (post_expand_t *)port->post;
++
++ if (this->centre_cut_out_mode && this->cropping_active) return 0;
++
+ /* we always intercept overlay manager */
+ return 1;
+ }
+@@ -342,3 +368,79 @@
+
+ return port->original_manager->add_event(port->original_manager, event_gen);
+ }
++
++
++static int is_pixel_black(vo_frame_t *frame, int x, int y)
++{
++ int Y = 0x00, Cr = 0x00, Cb = 0x00;
++
++ if (x < 0) x = 0;
++ if (x >= frame->width) x = frame->width - 1;
++ if (y < 0) y = 0;
++ if (y >= frame->height) y = frame->height - 1;
++
++ switch (frame->format)
++ {
++ case XINE_IMGFMT_YV12:
++ Y = *(frame->base[ 0 ] + frame->pitches[ 0 ] * y + x);
++ Cr = *(frame->base[ 1 ] + frame->pitches[ 1 ] * y / 2 + x / 2);
++ Cb = *(frame->base[ 2 ] + frame->pitches[ 2 ] * y / 2 + x / 2);
++ break;
++
++ case XINE_IMGFMT_YUY2:
++ Y = *(frame->base[ 0 ] + frame->pitches[ 0 ] * y + x * 2 + 0);
++ x &= ~1;
++ Cr = *(frame->base[ 0 ] + frame->pitches[ 0 ] * y + x * 2 + 1);
++ Cb = *(frame->base[ 0 ] + frame->pitches[ 0 ] * y + x * 2 + 3);
++ break;
++ }
++
++ return (Y == 0x10 && Cr == 0x80 && Cb == 0x80);
++}
++
++
++static int expand_draw(vo_frame_t *frame, xine_stream_t *stream)
++{
++ post_video_port_t *port = (post_video_port_t *)frame->port;
++ post_expand_t *this = (post_expand_t *)port->post;
++ int skip;
++
++ if (this->centre_cut_out_mode && !frame->bad_frame)
++ {
++ /* expected area of inner 4:3 image */
++ int centre_width = frame->width * (9 * 4) / (16 * 3);
++ int centre_left = (frame->width - centre_width ) / 2;
++
++ /* centre point for detecting a black frame */
++ int centre_x = frame->width / 2;
++ int centre_y = frame->height / 2;
++
++ /* ignore a black frame as it could lead to wrong results */
++ if (!is_pixel_black(frame, centre_x, centre_y))
++ {
++ /* coordinates for testing black border near the centre area */
++ int test_left = centre_left - 16;
++ int test_right = centre_left + 16 + centre_width;
++
++ /* enable cropping when these pixels are black */
++ this->cropping_active = is_pixel_black(frame, test_left, centre_y)
++ && is_pixel_black(frame, test_right, centre_y);
++ }
++
++ /* crop frame */
++ if (this->centre_cut_out_mode && this->cropping_active) {
++ frame->crop_left += centre_left;
++ frame->crop_right += centre_left;
++
++ /* get_frame() allocated an extra high frame */
++ frame->crop_top += (frame->next->height - frame->height) / 2;
++ frame->crop_bottom += (frame->next->height - frame->height) / 2;
++ }
++ }
++
++ _x_post_frame_copy_down(frame, frame->next);
++ skip = frame->next->draw(frame->next, stream);
++ _x_post_frame_copy_up(frame, frame->next);
++
++ return skip;
++}
+diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.am /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/Makefile.am
+--- xine-lib-vdr-1.0/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/Makefile.am 2005-02-12 22:01:43.000000000 +0000
+@@ -0,0 +1,30 @@
++include $(top_srcdir)/misc/Makefile.common
++
++
++
++libdir = $(XINE_PLUGINDIR)
++
++AM_CFLAGS = -D_LARGEFILE64_SOURCE
++
++lib_LTLIBRARIES = \
++ xineplug_inp_vdr.la
++
++xineplug_inp_vdr_la_SOURCES = input_vdr.c
++xineplug_inp_vdr_la_LIBADD = $(XINE_LIB)
++xineplug_inp_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++include_HEADERS = input_vdr.h
++
++
++
++postlibdir = $(XINE_PLUGINDIR)/post
++
++postlib_LTLIBRARIES = \
++ xineplug_post_vdr.la
++
++xineplug_post_vdr_la_SOURCES = post_vdr.c
++xineplug_post_vdr_la_LIBADD = $(XINE_LIB)
++xineplug_post_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++noinst_HEADERS = post_vdr.h
++
+diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.c
+--- xine-lib-vdr-1.0/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.c 2005-02-12 22:01:43.000000000 +0000
+@@ -0,0 +1,1586 @@
++/*
++ * Copyright (C) 2003-2004 the xine project
++ *
++ * This file is part of xine, a free video player.
++ *
++ * xine is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * xine is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * $Id: input_vdr.c,v 1.51 2003/05/02 15:02:11 miguelfreitas Exp $
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <sys/poll.h>
++#include <errno.h>
++#include <pthread.h>
++
++#define LOG_MODULE "input_vdr"
++#define LOG_VERBOSE
++/*
++#define LOG
++*/
++#include "xine_internal.h"
++#include "xineutils.h"
++#include "input_plugin.h"
++
++#include "input_vdr.h"
++#include "post_vdr.h"
++
++
++
++#define VDR_MAX_NUM_WINDOWS 16
++#define VDR_ABS_FIFO_DIR "/tmp/vdr-xine"
++
++
++
++#define BUF_SIZE 1024
++
++#define LOG_OSD(x)
++/*
++#define LOG_OSD(x) x
++*/
++
++
++typedef struct
++{
++ input_plugin_t input_plugin;
++
++ xine_stream_t *stream;
++ xine_stream_t *stream_external;
++
++ int fh;
++ int fh_control;
++ int fh_result;
++ int fh_event;
++
++ char *mrl;
++
++ off_t curpos;
++ char seek_buf[ BUF_SIZE ];
++
++ char preview[ MAX_PREVIEW_SIZE ];
++ off_t preview_size;
++
++ enum funcs cur_func;
++ off_t cur_size;
++ off_t cur_done;
++
++ xine_osd_t *osd_window[ VDR_MAX_NUM_WINDOWS ];
++ uint8_t *osd_buffer;
++ uint32_t osd_buffer_size;
++ uint8_t osd_unscaled_blending;
++
++ uint8_t mute_mode;
++ uint8_t dont_change_xine_volume;
++ int last_volume;
++ vdr_frame_size_changed_data_t frame_size;
++
++ pthread_t thread_control;
++
++ xine_event_queue_t *event_queue;
++ xine_event_queue_t *event_queue_external;
++
++}
++vdr_input_plugin_t;
++
++
++
++typedef struct
++{
++ input_class_t input_class;
++ xine_t *xine;
++ char *mrls[ 2 ];
++}
++vdr_input_class_t;
++
++
++
++static int xwrite(int f, void *b, int n)
++{
++ int t = 0;
++
++ while (t < n)
++ {
++ int r = write(f, ((char *)b) + t, n - t);
++ if (r < 0)
++ {
++ if (EAGAIN == errno)
++ break;
++
++ return r;
++ }
++
++ t += r;
++ }
++
++ return t;
++}
++
++
++
++static int internal_write_event_play_external(vdr_input_plugin_t *this, uint32_t key);
++
++static void event_handler_external(void *user_data, const xine_event_t *event)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)user_data;
++ uint32_t key = key_none;
++/*
++ printf("event_handler_external(): event->type: %d\n", event->type);
++*/
++ switch (event->type)
++ {
++ case XINE_EVENT_UI_PLAYBACK_FINISHED:
++ break;
++
++ default:
++ return;
++ }
++
++ if (0 != internal_write_event_play_external(this, key))
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("input event write: %s.\n"), strerror(errno));
++}
++
++static void external_stream_stop(vdr_input_plugin_t *this)
++{
++ if (this->stream_external)
++ {
++ xine_stop(this->stream_external);
++ xine_close(this->stream_external);
++
++ if (this->event_queue_external)
++ {
++ xine_event_dispose_queue(this->event_queue_external);
++ this->event_queue_external = 0;
++ }
++
++ _x_demux_flush_engine(this->stream_external);
++
++ xine_dispose(this->stream_external);
++ this->stream_external = 0;
++ }
++}
++
++static void external_stream_play(vdr_input_plugin_t *this, char *file_name)
++{
++ external_stream_stop(this);
++
++ this->stream_external = xine_stream_new(this->stream->xine, this->stream->audio_out, this->stream->video_out);
++
++ this->event_queue_external = xine_event_new_queue(this->stream_external);
++
++ xine_event_create_listener_thread(this->event_queue_external, event_handler_external, this);
++
++ if (!xine_open(this->stream_external, file_name)
++ || !xine_play(this->stream_external, 0, 0))
++ {
++ uint32_t key = key_none;
++
++ if ( 0 != internal_write_event_play_external(this, key))
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("input event write: %s.\n"), strerror(errno));
++ }
++}
++
++
++#define READ_DATA_OR_FAIL(kind, log) \
++ data_##kind##_t *data = &data_union.kind; \
++ { \
++ log; \
++ n = _x_read_abort (this->stream, this->fh_control, (char *)data + sizeof (data->header), sizeof (*data) - sizeof (data->header)); \
++ if (n != sizeof (*data) - sizeof (data->header)) \
++ return -1; \
++ \
++ this->cur_size -= n; \
++ }
++
++static off_t internal_ead(vdr_input_plugin_t *this, char *buf, off_t len);
++
++static off_t internal_read(vdr_input_plugin_t *this, char *buf, off_t len)
++{
++ off_t r = internal_ead(this, buf, len);
++ fprintf(stderr, "internal_ead(): %lld, func: %d\n", r, this->cur_func);
++ return r;
++}
++
++static off_t internal_ead(vdr_input_plugin_t *this, char *buf, off_t len)
++{
++ data_union_t data_union;
++ off_t n;
++
++retry:
++ if (this->cur_done == this->cur_size)
++ this->cur_func = func_unknown;
++
++ if (func_unknown == this->cur_func)
++ {
++ n = _x_read_abort(this->stream, this->fh_control, (char *)&data_union, sizeof (data_union.header));
++ if (n != sizeof (data_union.header))
++ return -1;
++
++ this->cur_func = data_union.header.func;
++ this->cur_size = data_union.header.len - sizeof (data_union.header);
++ this->cur_done = 0;
++ }
++
++ switch (this->cur_func)
++ {
++ case func_nop:
++ {
++ READ_DATA_OR_FAIL(nop, lprintf("got NOP\n"));
++ }
++ break;
++
++ case func_osd_new:
++ {
++ READ_DATA_OR_FAIL(osd_new, LOG_OSD(lprintf("got OSDNEW\n")));
++/*
++ LOG_OSD(lprintf("... (%d,%d)-(%d,%d)\n", data->x, data->y, data->width, data->height));
++
++ fprintf(stderr, "vdr: osdnew %d\n", data->window);
++*/
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ return -1;
++
++ this->osd_window[ data->window ] = xine_osd_new(this->stream
++ , data->x
++ , data->y
++ , data->width
++ , data->height);
++
++ if (0 == this->osd_window[ data->window ])
++ return -1;
++ }
++ break;
++
++ case func_osd_free:
++ {
++ READ_DATA_OR_FAIL(osd_free, LOG_OSD(lprintf("got OSDFREE\n")));
++/*
++ fprintf(stderr, "vdr: osdfree %d\n", data->window);
++*/
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ xine_osd_free(this->osd_window[ data->window ]);
++
++ this->osd_window[ data->window ] = 0;
++ }
++ break;
++
++ case func_osd_show:
++ {
++ READ_DATA_OR_FAIL(osd_show, LOG_OSD(lprintf("got OSDSHOW\n")));
++/*
++ fprintf(stderr, "vdr: osdshow %d\n", data->window);
++*/
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ {
++ if (this->osd_unscaled_blending)
++ xine_osd_show_unscaled(this->osd_window[ data->window ], 0);
++ else
++ xine_osd_show(this->osd_window[ data->window ], 0);
++ }
++ }
++ break;
++
++ case func_osd_hide:
++ {
++ READ_DATA_OR_FAIL(osd_hide, LOG_OSD(lprintf("got OSDHIDE\n")));
++/*
++ fprintf(stderr, "vdr: osdhide %d\n", data->window);
++*/
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ {
++ if (this->osd_unscaled_blending)
++ xine_osd_show_unscaled(this->osd_window[ data->window ], 0);
++ else
++ xine_osd_show(this->osd_window[ data->window ], 0);
++ }
++ }
++ break;
++
++ case func_osd_flush:
++ {
++ READ_DATA_OR_FAIL(osd_flush, LOG_OSD(lprintf("got OSDFLUSH\n")));
++/*
++ fprintf(stderr, "vdr: osdflush +\n");
++*/
++ while (_x_query_unprocessed_osd_events(this->stream))
++ {
++/*
++ fprintf(stderr, "redraw_needed: 1\n");
++*/
++ sched_yield();
++ }
++/*
++ fprintf(stderr, "redraw_needed: 0\n");
++
++ fprintf(stderr, "vdr: osdflush -\n");
++*/
++ }
++ break;
++
++ case func_osd_set_position:
++ {
++ READ_DATA_OR_FAIL(osd_set_position, LOG_OSD(lprintf("got OSDSETPOSITION\n")));
++/*
++ fprintf(stderr, "vdr: osdsetposition %d\n", data->window);
++*/
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ xine_osd_set_position(this->osd_window[ data->window ], data->x, data->y);
++ }
++ break;
++
++ case func_osd_draw_bitmap:
++ {
++ READ_DATA_OR_FAIL(osd_draw_bitmap, LOG_OSD(lprintf("got OSDDRAWBITMAP\n")));
++/*
++ fprintf(stderr, "vdr: osddrawbitmap %d\n", data->window);
++*/
++ if (this->osd_buffer_size < this->cur_size)
++ {
++ if (this->osd_buffer)
++ free(this->osd_buffer);
++
++ this->osd_buffer_size = 0;
++
++ this->osd_buffer = xine_xmalloc(this->cur_size);
++ if (!this->osd_buffer)
++ return -1;
++
++ this->osd_buffer_size = this->cur_size;
++ }
++
++ n = _x_read_abort (this->stream, this->fh_control, (char *)this->osd_buffer, this->cur_size);
++ if (n != this->cur_size)
++ return -1;
++
++ this->cur_size -= n;
++
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ xine_osd_draw_bitmap(this->osd_window[ data->window ], this->osd_buffer, data->x, data->y, data->width, data->height, 0);
++ }
++ break;
++
++ case func_set_color:
++ {
++ uint32_t vdr_color[ 256 ];
++
++ READ_DATA_OR_FAIL(set_color, lprintf("got SETCOLOR\n"));
++
++ if (((data->num + 1) * sizeof (uint32_t)) != this->cur_size)
++ return -1;
++
++ n = _x_read_abort (this->stream, this->fh_control, (char *)&vdr_color[ data->index ], this->cur_size);
++ if (n != this->cur_size)
++ return -1;
++
++ this->cur_size -= n;
++
++ if (data->window >= VDR_MAX_NUM_WINDOWS)
++ return -1;
++
++ if (0 != this->osd_window[ data->window ])
++ {
++ uint32_t color[ 256 ];
++ uint8_t trans[ 256 ];
++
++ xine_osd_get_palette(this->osd_window[ data->window ], color, trans);
++
++ {
++ int i;
++
++ for (i = data->index; i <= (data->index + data->num); i++)
++ {
++ int a = (vdr_color[ i ] & 0xff000000) >> 0x18;
++ int r = (vdr_color[ i ] & 0x00ff0000) >> 0x10;
++ int g = (vdr_color[ i ] & 0x0000ff00) >> 0x08;
++ int b = (vdr_color[ i ] & 0x000000ff) >> 0x00;
++
++ int y = (( 66 * r + 129 * g + 25 * b + 128) >> 8) + 16;
++ int cr = ((112 * r - 94 * g - 18 * b + 128) >> 8) + 128;
++ int cb = ((-38 * r - 74 * g + 112 * b + 128) >> 8) + 128;
++
++ color[ i ] = (y << 8 | cr) << 8 | cb;
++ trans[ i ] = a >> 4;
++ }
++ }
++
++ xine_osd_set_palette(this->osd_window[ data->window ], color, trans);
++ }
++ }
++ break;
++
++ case func_play_external:
++ {
++ char file_name[ 1024 ];
++ int file_name_len = 0;
++
++ READ_DATA_OR_FAIL(play_external, lprintf("got PLAYEXTERNAL\n"));
++
++ file_name_len = this->cur_size;
++
++ if (0 != file_name_len)
++ {
++ if (file_name_len <= 1
++ || file_name_len > sizeof (file_name))
++ {
++ return -1;
++ }
++
++ n = _x_read_abort (this->stream, this->fh_control, file_name, file_name_len);
++ if (n != file_name_len)
++ return -1;
++
++ if (file_name[ file_name_len - 1 ] != '\0')
++ return -1;
++
++ this->cur_size -= n;
++ }
++
++ lprintf((file_name_len > 0) ? "----------- play external: %s\n" : "---------- stop external\n", file_name);
++
++ if (file_name_len > 0)
++ external_stream_play(this, file_name);
++ else
++ external_stream_stop(this);
++ }
++ break;
++
++ case func_clear:
++ {
++ READ_DATA_OR_FAIL(clear, lprintf("got CLEAR\n"));
++
++ {
++/*
++ if (!this->dont_change_xine_volume)
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_VOLUME, 0);
++*/
++ _x_demux_flush_engine(this->stream);
++ _x_trigger_relaxed_frame_drop_mode(this->stream);
++/*
++ if (!this->dont_change_xine_volume)
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_VOLUME, this->last_volume);
++*/
++ }
++ }
++ break;
++
++ case func_first_frame:
++ {
++ READ_DATA_OR_FAIL(first_frame, lprintf("got FIRST FRAME\n"));
++
++ _x_trigger_relaxed_frame_drop_mode(this->stream);
++ }
++ break;
++
++ case func_set_video_window:
++ {
++ READ_DATA_OR_FAIL(set_video_window, lprintf("got SET VIDEO WINDOW\n"));
++/*
++ fprintf(stderr, "svw: (%d, %d)x(%d, %d), (%d, %d)\n", data->x, data->y, data->w, data->h, data->wRef, data->hRef);
++*/
++ {
++ xine_event_t event;
++ vdr_set_video_window_data_t event_data;
++
++ event_data.x = data->x;
++ event_data.y = data->y;
++ event_data.w = data->w;
++ event_data.h = data->h;
++ event_data.w_ref = data->w_ref;
++ event_data.h_ref = data->h_ref;
++
++ event.type = XINE_EVENT_VDR_SETVIDEOWINDOW;
++ event.data = &event_data;
++ event.data_length = sizeof (event_data);
++
++ xine_event_send(this->stream, &event);
++ }
++ }
++ break;
++
++ case func_flush:
++ {
++ READ_DATA_OR_FAIL(flush, lprintf("got FLUSH\n"));
++
++ if (!data->just_wait)
++ {
++ if (this->stream->video_fifo)
++ {
++ buf_element_t *buf = this->stream->video_fifo->buffer_pool_alloc(this->stream->video_fifo);
++ if (!buf)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: buffer_pool_alloc() failed!\n"));
++ return -1;
++ }
++
++ buf->type = BUF_CONTROL_FLUSH_DECODER;
++
++ this->stream->video_fifo->put(this->stream->video_fifo, buf);
++ }
++ }
++
++ {
++ int vb = -1, ab = -1, vf = -1, af = -1;
++
++ uint8_t timed_out = 0;
++
++ struct timeval now, then;
++
++ if (data->ms_timeout >= 0)
++ {
++ gettimeofday(&now, 0);
++
++ then = now;
++ then.tv_usec += (data->ms_timeout % 1000) * 1000;
++ then.tv_sec += (data->ms_timeout / 1000);
++
++ if (then.tv_usec >= 1000000)
++ {
++ then.tv_usec -= 1000000;
++ then.tv_sec += 1;
++ }
++ }
++
++ while (1)
++ {
++ _x_query_buffer_usage(this->stream, &vb, &ab, &vf, &af);
++
++ if (vb <= 0 && ab <= 0 && vf <= 0 && af <= 0)
++ break;
++
++ if (data->ms_timeout >= 0
++ && timercmp(&now, &then, >))
++ {
++ timed_out++;
++ break;
++ }
++
++ sched_yield();
++
++ if (data->ms_timeout >= 0)
++ gettimeofday(&now, 0);
++ }
++
++ xprintf(this->stream->xine
++ , XINE_VERBOSITY_LOG
++ , _("VDR: flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n")
++ , vb, ab, vf, af
++ , (timed_out ? "timed out" : "done"));
++
++ {
++ result_flush_t result_flush;
++ result_flush.header.func = data->header.func;
++ result_flush.header.len = sizeof (result_flush);
++
++ result_flush.timed_out = timed_out;
++
++ if (sizeof (result_flush) != xwrite(this->fh_result, &result_flush, sizeof (result_flush)))
++ return -1;
++ }
++ }
++ }
++ break;
++
++ case func_mute:
++ {
++ READ_DATA_OR_FAIL(mute, lprintf("got MUTE\n"));
++
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_MUTE, data->mute);
++ }
++ break;
++
++ case func_set_volume:
++ {
++ READ_DATA_OR_FAIL(set_volume, lprintf("got SETVOLUME\n"));
++
++ {
++ int change_volume = !this->dont_change_xine_volume;
++ int do_mute = (0 != this->last_volume && 0 == data->volume);
++ int do_unmute = (0 == this->last_volume && 0 != data->volume);
++ int report_change = 0;
++
++ this->last_volume = data->volume;
++
++ if (do_mute || do_unmute)
++ {
++ switch (this->mute_mode)
++ {
++ case INPUT_VDR_MUTE_EXECUTE:
++ report_change = 1;
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_MUTE, do_mute);
++
++ case INPUT_VDR_MUTE_IGNORE:
++ if (do_mute)
++ change_volume = 0;
++ break;
++
++ case INPUT_VDR_MUTE_SIMULATE:
++ change_volume = 1;
++ break;
++
++ default:
++ return -1;
++ };
++ }
++
++ if (change_volume)
++ {
++ report_change = 1;
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_VOLUME, this->last_volume);
++ }
++
++ if (report_change)
++ {
++ xine_event_t event;
++ xine_audio_level_data_t data;
++
++ data.left
++ = data.right
++ = xine_get_param(this->stream, XINE_PARAM_AUDIO_VOLUME);
++ data.mute
++ = xine_get_param(this->stream, XINE_PARAM_AUDIO_MUTE);
++
++ event.type = XINE_EVENT_AUDIO_LEVEL;
++ event.data = &data;
++ event.data_length = sizeof (data);
++
++ xine_event_send(this->stream, &event);
++ }
++ }
++ }
++ break;
++
++ case func_set_speed:
++ {
++ READ_DATA_OR_FAIL(set_speed, lprintf("got SETSPEED\n"));
++
++ lprintf("... got SETSPEED %d\n", data->speed);
++
++ if (data->speed != xine_get_param(this->stream, XINE_PARAM_FINE_SPEED))
++ xine_set_param(this->stream, XINE_PARAM_FINE_SPEED, data->speed);
++ }
++ break;
++
++ case func_set_prebuffer:
++ {
++ READ_DATA_OR_FAIL(set_prebuffer, lprintf("got SETPREBUFFER\n"));
++
++ xine_set_param(this->stream, XINE_PARAM_METRONOM_PREBUFFER, data->prebuffer);
++ }
++ break;
++
++ case func_metronom:
++ {
++ READ_DATA_OR_FAIL(metronom, lprintf("got METRONOM\n"));
++
++ _x_demux_control_newpts(this->stream, data->pts, data->flags);
++ }
++ break;
++
++ case func_start:
++ {
++ READ_DATA_OR_FAIL(start, lprintf("got START\n"));
++
++ _x_demux_control_start(this->stream);
++ }
++ break;
++
++ case func_wait:
++ {
++ READ_DATA_OR_FAIL(wait, lprintf("got WAIT\n"));
++ }
++ break;
++
++ case func_setup:
++ {
++ READ_DATA_OR_FAIL(setup, lprintf("got SETUP\n"));
++
++ this->osd_unscaled_blending = data->osd_unscaled_blending;
++ this->dont_change_xine_volume = data->dont_change_xine_volume;
++ this->mute_mode = data->mute_mode;
++ }
++ break;
++
++ case func_grab_image:
++ {
++ READ_DATA_OR_FAIL(grab_image, lprintf("got GRABIMAGE\n"));
++
++ {
++ off_t ret_val = -1;
++
++ uint8_t *img = 0;
++ int frame_size = 0;
++ int width = 0;
++ int height = 0;
++ int ratio_code = 0;
++ int format = 0;
++
++ int orig_speed = xine_get_param(this->stream, XINE_PARAM_FINE_SPEED);
++ if (XINE_SPEED_PAUSE != orig_speed)
++ xine_set_param(this->stream, XINE_PARAM_FINE_SPEED, XINE_SPEED_PAUSE);
++
++ if (xine_get_current_frame(this->stream, &width, &height, &ratio_code, &format, 0))
++ {
++ switch (format)
++ {
++ case XINE_IMGFMT_YV12:
++ frame_size = width * height
++ + ((width + 1) / 2) * ((height + 1) / 2)
++ + ((width + 1) / 2) * ((height + 1) / 2);
++ break;
++
++ case XINE_IMGFMT_YUY2:
++ frame_size = width * height
++ + ((width + 1) / 2) * height
++ + ((width + 1) / 2) * height;
++ break;
++ }
++
++ img = xine_xmalloc(frame_size);
++
++ if (!xine_get_current_frame(this->stream, &width, &height, &ratio_code, &format, img))
++ frame_size = 0;
++
++ if (ratio_code == XINE_VO_ASPECT_SQUARE)
++ ratio_code = 10000;
++ else if (ratio_code == XINE_VO_ASPECT_4_3)
++ ratio_code = 13333;
++ else if (ratio_code == XINE_VO_ASPECT_ANAMORPHIC)
++ ratio_code = 17778;
++ else if (ratio_code == XINE_VO_ASPECT_DVB)
++ ratio_code = 21100;
++
++ if (0 == frame_size)
++ {
++ width = 0;
++ height = 0;
++ ratio_code = 0;
++ }
++ }
++
++ if (XINE_SPEED_PAUSE != orig_speed)
++ xine_set_param(this->stream, XINE_PARAM_FINE_SPEED, orig_speed);
++
++ {
++ result_grab_image_t result_grab_image;
++ result_grab_image.header.func = data->header.func;
++ result_grab_image.header.len = sizeof (result_grab_image) + frame_size;
++
++ result_grab_image.width = width;
++ result_grab_image.height = height;
++ result_grab_image.ratio = ratio_code;
++ result_grab_image.format = format;
++
++ if (sizeof (result_grab_image) == xwrite(this->fh_result, &result_grab_image, sizeof (result_grab_image)))
++ {
++ if (frame_size == xwrite(this->fh_result, img, frame_size))
++ ret_val = 0;
++ }
++ }
++
++ if (img)
++ free(img);
++
++ if (ret_val != 0)
++ return ret_val;
++ }
++ }
++ break;
++
++ case func_get_pts:
++ {
++ READ_DATA_OR_FAIL(get_pts, lprintf("got GETPTS\n"));
++
++ {
++ result_get_pts_t result_get_pts;
++ result_get_pts.header.func = data->header.func;
++ result_get_pts.header.len = sizeof (result_get_pts);
++
++ result_get_pts.pts = xine_get_current_vpts(this->stream) - this->stream->metronom->get_option(this->stream->metronom, METRONOM_VPTS_OFFSET);
++
++ if (sizeof (result_get_pts) != xwrite(this->fh_result, &result_get_pts, sizeof (result_get_pts)))
++ return -1;
++ }
++ }
++ break;
++
++ case func_video_size:
++ {
++ READ_DATA_OR_FAIL(video_size, lprintf("got VIDEO SIZE\n"));
++
++ {
++ int format;
++
++ result_video_size_t result_video_size;
++ result_video_size.header.func = data->header.func;
++ result_video_size.header.len = sizeof (result_video_size);
++
++ result_video_size.top = -1;
++ result_video_size.left = -1;
++ result_video_size.width = -1;
++ result_video_size.height = -1;
++ result_video_size.ratio = 0;
++
++ xine_get_current_frame(this->stream, &result_video_size.width, &result_video_size.height, &result_video_size.ratio, &format, 0);
++
++ if (result_video_size.ratio == XINE_VO_ASPECT_SQUARE)
++ result_video_size.ratio = 10000;
++ else if (result_video_size.ratio == XINE_VO_ASPECT_4_3)
++ result_video_size.ratio = 13333;
++ else if (result_video_size.ratio == XINE_VO_ASPECT_ANAMORPHIC)
++ result_video_size.ratio = 17778;
++ else if (result_video_size.ratio == XINE_VO_ASPECT_DVB)
++ result_video_size.ratio = 21100;
++
++ if (0 != this->frame_size.x
++ || 0 != this->frame_size.y
++ || 0 != this->frame_size.w
++ || 0 != this->frame_size.h)
++ {
++ result_video_size.left = this->frame_size.x;
++ result_video_size.top = this->frame_size.y;
++ result_video_size.width = this->frame_size.w;
++ result_video_size.height = this->frame_size.h;
++ }
++
++ if (sizeof (result_video_size) != xwrite(this->fh_result, &result_video_size, sizeof (result_video_size)))
++ return -1;
++ }
++ }
++ break;
++
++ case func_reset_audio:
++ {
++ READ_DATA_OR_FAIL(reset_audio, printf("got RESET AUDIO\n"));
++
++ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 1);
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -2);
++
++ while (1)
++ {
++ int n = xine_get_stream_info(this->stream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
++ if (n <= 0)
++ break;
++
++ sched_yield();
++ }
++
++ xine_set_param(this->stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, -1);
++ xine_set_param(this->stream, XINE_PARAM_IGNORE_AUDIO, 0);
++ }
++ break;
++
++ default:
++ lprintf("unknown function: %d\n", this->cur_func);
++ }
++
++ if (this->cur_size != this->cur_done)
++ {
++ off_t skip = this->cur_size - this->cur_done;
++
++ lprintf("func: %d, skipping: %lld\n", this->cur_func, skip);
++
++ while (skip > BUF_SIZE)
++ {
++ n = _x_read_abort(this->stream, this->fh_control, this->seek_buf, BUF_SIZE);
++ if (n != BUF_SIZE)
++ return -1;
++
++ skip -= BUF_SIZE;
++ }
++
++ n = _x_read_abort(this->stream, this->fh_control, this->seek_buf, skip);
++ if (n != skip)
++ return -1;
++
++ this->cur_done = this->cur_size;
++ }
++
++ goto retry;
++
++ return -1;
++}
++
++
++
++static void *vdr_plugin_control_loop(void *arg)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)arg;
++
++ off_t length;
++ char buffer[ 1000 ];
++
++ while (1)
++ {
++ /*
++ * System calls are not a thread cancellation point in Linux
++ * pthreads. However, the RT signal sent to cancel the thread
++ * will cause recv() to return with EINTR, and we can manually
++ * check cancellation.
++ */
++ pthread_testcancel();
++ length = internal_read(this, buffer, sizeof (buffer));
++ pthread_testcancel();
++
++ if (length < 0)
++ {
++ if (errno != EINTR)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("read(): %s.\n"), strerror(errno));
++ return NULL;
++ }
++ }
++ else
++ {
++ lprintf("read %lld bytes\n", length);
++ }
++ }
++}
++
++static int internal_write_event_key(vdr_input_plugin_t *this, uint32_t key)
++{
++ event_key_t event;
++ event.header.func = func_key;
++ event.header.len = sizeof (event);
++
++ event.key = key;
++
++ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ return -1;
++
++ return 0;
++}
++
++static int internal_write_event_frame_size(vdr_input_plugin_t *this)
++{
++ event_frame_size_t event;
++ event.header.func = func_frame_size;
++ event.header.len = sizeof (event);
++
++ event.top = this->frame_size.x;
++ event.left = this->frame_size.y;
++ event.width = this->frame_size.w,
++ event.height = this->frame_size.h;
++
++ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ return -1;
++
++ return 0;
++}
++
++static int internal_write_event_play_external(vdr_input_plugin_t *this, uint32_t key)
++{
++ event_play_external_t event;
++ event.header.func = func_play_external;
++ event.header.len = sizeof (event);
++
++ event.key = key;
++
++ if (sizeof (event) != xwrite(this->fh_event, &event, sizeof (event)))
++ return -1;
++
++ return 0;
++}
++
++static off_t vdr_plugin_read(input_plugin_t *this_gen,
++ char *buf, off_t len)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *) this_gen;
++ off_t n, total;
++#ifdef LOG_READ
++ lprintf ("vdr: reading %lld bytes...\n", len);
++#endif
++ total=0;
++ if (this->curpos < this->preview_size)
++ {
++ n = this->preview_size - this->curpos;
++ if (n > (len - total))
++ n = len - total;
++#ifdef LOG_READ
++ lprintf ("vdr: %lld bytes from preview (which has %lld bytes)\n",
++ n, this->preview_size);
++#endif
++ memcpy (&buf[total], &this->preview[this->curpos], n);
++ this->curpos += n;
++ total += n;
++ }
++
++ if( (len-total) > 0 )
++ {
++ int retries = 0;
++ do
++ {
++ n = _x_read_abort (this->stream, this->fh, &buf[total], len-total);
++
++ if (0 == n)
++ lprintf("vdr: read 0, retries: %d\n", retries);
++ }
++ while (0 == n
++ && !this->stream_external
++ && _x_continue_stream_processing(this->stream)
++ && 200 > retries++); /* 200 * 50ms */
++#ifdef LOG_READ
++ lprintf ("vdr: got %lld bytes (%lld/%lld bytes read)\n",
++ n,total,len);
++#endif
++ if (n < 0)
++ {
++ _x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
++ return 0;
++ }
++
++ this->curpos += n;
++ total += n;
++ }
++ return total;
++}
++
++static buf_element_t *vdr_plugin_read_block(input_plugin_t *this_gen, fifo_buffer_t *fifo,
++ off_t todo)
++{
++ off_t total_bytes;
++ buf_element_t *buf = fifo->buffer_pool_alloc(fifo);
++
++ buf->content = buf->mem;
++ buf->type = BUF_DEMUX_BLOCK;
++
++ total_bytes = vdr_plugin_read(this_gen, buf->content, todo);
++
++ if (total_bytes != todo)
++ {
++ buf->free_buffer(buf);
++ return NULL;
++ }
++
++ buf->size = total_bytes;
++
++ return buf;
++}
++
++/* forward reference */
++static off_t vdr_plugin_get_current_pos(input_plugin_t *this_gen);
++
++static off_t vdr_plugin_seek(input_plugin_t *this_gen, off_t offset, int origin)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++
++ lprintf("vdr: seek %lld offset, %d origin...\n",
++ offset, origin);
++
++ if ((origin == SEEK_CUR) && (offset >= 0))
++ {
++ for ( ; ((int)offset) - BUF_SIZE > 0; offset -= BUF_SIZE)
++ {
++ if (!this_gen->read(this_gen, this->seek_buf, BUF_SIZE))
++ return this->curpos;
++ }
++
++ this_gen->read (this_gen, this->seek_buf, offset);
++ }
++
++ if (origin == SEEK_SET)
++ {
++ if (offset < this->curpos)
++ {
++ if (this->curpos <= this->preview_size)
++ this->curpos = offset;
++ else
++ lprintf("vdr: cannot seek back! (%lld > %lld)\n", this->curpos, offset);
++ }
++ else
++ {
++ offset -= this->curpos;
++
++ for ( ; ((int)offset) - BUF_SIZE > 0; offset -= BUF_SIZE)
++ {
++ if (!this_gen->read(this_gen, this->seek_buf, BUF_SIZE))
++ return this->curpos;
++ }
++
++ this_gen->read(this_gen, this->seek_buf, offset);
++ }
++ }
++
++ return this->curpos;
++}
++
++static off_t vdr_plugin_get_length(input_plugin_t *this_gen)
++{
++ return 0;
++}
++
++static uint32_t vdr_plugin_get_capabilities(input_plugin_t *this_gen)
++{
++ /* return INPUT_CAP_PREVIEW; */
++ return INPUT_CAP_NOCAP;
++}
++
++static uint32_t vdr_plugin_get_blocksize(input_plugin_t *this_gen)
++{
++ return 0;
++}
++
++static off_t vdr_plugin_get_current_pos(input_plugin_t *this_gen)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++
++ return this->curpos;
++}
++
++static char* vdr_plugin_get_mrl(input_plugin_t *this_gen)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++
++ return this->mrl;
++}
++
++static void vdr_plugin_dispose(input_plugin_t *this_gen)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++ int i;
++
++ external_stream_stop(this);
++
++ if (this->event_queue)
++ xine_event_dispose_queue(this->event_queue);
++
++ if (this->thread_control)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: stopping control thread...\n"));
++ pthread_cancel(this->thread_control);
++ pthread_join(this->thread_control, NULL);
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("VDR: control thread terminated\n"));
++ }
++
++ if (this->fh_result != -1)
++ close(this->fh_result);
++
++ if (this->fh_control != -1)
++ close(this->fh_control);
++
++ if (this->fh_event != -1)
++ close(this->fh_event);
++
++ for (i = 0; i < VDR_MAX_NUM_WINDOWS; i++)
++ {
++ if (0 == this->osd_window[ i ])
++ continue;
++
++ xine_osd_hide(this->osd_window[ i ], 0);
++ xine_osd_free(this->osd_window[ i ]);
++ }
++
++ if (this->osd_buffer)
++ free(this->osd_buffer);
++
++ if ((this->fh != STDIN_FILENO) && (this->fh != -1))
++ close(this->fh);
++
++ free(this->mrl);
++ free(this);
++}
++
++static int vdr_plugin_get_optional_data(input_plugin_t *this_gen,
++ void *data, int data_type)
++{
++/*
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++
++ switch (data_type)
++ {
++ case INPUT_OPTIONAL_DATA_PREVIEW:
++ memcpy (data, this->preview, this->preview_size);
++ return this->preview_size;
++ }
++*/
++ return INPUT_OPTIONAL_UNSUPPORTED;
++}
++
++static int vdr_plugin_open(input_plugin_t *this_gen)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)this_gen;
++
++ lprintf("input_vdr: trying to open '%s'...\n", this->mrl);
++
++ if (this->fh == -1)
++ {
++ char *filename;
++ int err = 0;
++
++ filename = (char *)&this->mrl[ 4 ];
++ this->fh = open(filename, O_RDONLY | O_NONBLOCK);
++
++ lprintf("input_vdr: filename '%s'\n", filename);
++
++ if (this->fh == -1)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: failed to open '%s' (%s)\n"),
++ filename,
++ strerror(errno));
++
++ return 0;
++ }
++
++ {
++ struct pollfd poll_fh = { this->fh, POLLIN, 0 };
++
++ int r = poll(&poll_fh, 1, 300);
++ if (1 != r)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: failed to open '%s' (%s)\n"),
++ filename,
++ _("timeout expired during setup phase"));
++
++ return 0;
++ }
++ }
++
++ fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0));
++
++ {
++ char *filename_control = 0;
++ asprintf(&filename_control, "%s.control", filename);
++
++ this->fh_control = open(filename_control, O_RDONLY);
++
++ if (this->fh_control == -1) {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: failed to open '%s' (%s)\n"),
++ filename_control,
++ strerror(errno));
++
++ free(filename_control);
++ return 0;
++ }
++
++ free(filename_control);
++ }
++
++ {
++ char *filename_result = 0;
++ asprintf(&filename_result, "%s.result", filename);
++
++ this->fh_result = open(filename_result, O_WRONLY);
++
++ if (this->fh_result == -1) {
++ perror("failed");
++
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: failed to open '%s' (%s)\n"),
++ filename_result,
++ strerror(errno));
++
++ free(filename_result);
++ return 0;
++ }
++
++ free(filename_result);
++ }
++
++ {
++ char *filename_event = 0;
++ asprintf(&filename_event, "%s.event", filename);
++
++ this->fh_event = open(filename_event, O_WRONLY);
++
++ if (this->fh_event == -1) {
++ perror("failed");
++
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: failed to open '%s' (%s)\n"),
++ filename_event,
++ strerror(errno));
++
++ free(filename_event);
++ return 0;
++ }
++
++ free(filename_event);
++ }
++
++ if ((err = pthread_create(&this->thread_control, NULL,
++ vdr_plugin_control_loop, (void *)this)) != 0)
++ {
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("vdr: can't create new thread (%s)\n"),
++ strerror(err));
++
++ return 0;
++ }
++ }
++
++
++ /*
++ * mrl accepted and opened successfully at this point
++ *
++ * => create plugin instance
++ */
++
++ /*
++ * fill preview buffer
++ */
++
++ this->preview_size = 0; /* vdr_plugin_read (&this->input_plugin, this->preview,
++ MAX_PREVIEW_SIZE) */
++ this->curpos = 0;
++
++ return 1;
++}
++
++static void event_handler(void *user_data, const xine_event_t *event)
++{
++ vdr_input_plugin_t *this = (vdr_input_plugin_t *)user_data;
++ uint32_t key = key_none;
++
++ lprintf("eventHandler(): event->type: %d\n", event->type);
++
++ if (XINE_EVENT_VDR_FRAMESIZECHANGED == event->type)
++ {
++ memcpy(&this->frame_size, event->data, event->data_length);
++
++ if (0 != internal_write_event_frame_size(this))
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("input event write: %s.\n"), strerror(errno));
++
++ return;
++ }
++
++ switch (event->type)
++ {
++ case XINE_EVENT_INPUT_UP: key = key_up; break;
++ case XINE_EVENT_INPUT_DOWN: key = key_down; break;
++ case XINE_EVENT_INPUT_LEFT: key = key_left; break;
++ case XINE_EVENT_INPUT_RIGHT: key = key_right; break;
++ case XINE_EVENT_INPUT_SELECT: key = key_ok; break;
++ case XINE_EVENT_VDR_BACK: key = key_back; break;
++ case XINE_EVENT_VDR_CHANNELPLUS: key = key_channel_plus; break;
++ case XINE_EVENT_VDR_CHANNELMINUS: key = key_channel_minus; break;
++ case XINE_EVENT_VDR_RED: key = key_red; break;
++ case XINE_EVENT_VDR_GREEN: key = key_green; break;
++ case XINE_EVENT_VDR_YELLOW: key = key_yellow; break;
++ case XINE_EVENT_VDR_BLUE: key = key_blue; break;
++ case XINE_EVENT_VDR_PLAY: key = key_play; break;
++ case XINE_EVENT_VDR_PAUSE: key = key_pause; break;
++ case XINE_EVENT_VDR_STOP: key = key_stop; break;
++ case XINE_EVENT_VDR_RECORD: key = key_record; break;
++ case XINE_EVENT_VDR_FASTFWD: key = key_fast_fwd; break;
++ case XINE_EVENT_VDR_FASTREW: key = key_fast_rew; break;
++ case XINE_EVENT_VDR_POWER: key = key_power; break;
++ case XINE_EVENT_VDR_SCHEDULE: key = key_schedule; break;
++ case XINE_EVENT_VDR_CHANNELS: key = key_channels; break;
++ case XINE_EVENT_VDR_TIMERS: key = key_timers; break;
++ case XINE_EVENT_VDR_RECORDINGS: key = key_recordings; break;
++ case XINE_EVENT_INPUT_MENU1: key = key_menu; break;
++ case XINE_EVENT_VDR_SETUP: key = key_setup; break;
++ case XINE_EVENT_VDR_COMMANDS: key = key_commands; break;
++ case XINE_EVENT_INPUT_NUMBER_0: key = key_0; break;
++ case XINE_EVENT_INPUT_NUMBER_1: key = key_1; break;
++ case XINE_EVENT_INPUT_NUMBER_2: key = key_2; break;
++ case XINE_EVENT_INPUT_NUMBER_3: key = key_3; break;
++ case XINE_EVENT_INPUT_NUMBER_4: key = key_4; break;
++ case XINE_EVENT_INPUT_NUMBER_5: key = key_5; break;
++ case XINE_EVENT_INPUT_NUMBER_6: key = key_6; break;
++ case XINE_EVENT_INPUT_NUMBER_7: key = key_7; break;
++ case XINE_EVENT_INPUT_NUMBER_8: key = key_8; break;
++ case XINE_EVENT_INPUT_NUMBER_9: key = key_9; break;
++ case XINE_EVENT_VDR_USER1: key = key_user1; break;
++ case XINE_EVENT_VDR_USER2: key = key_user2; break;
++ case XINE_EVENT_VDR_USER3: key = key_user3; break;
++ case XINE_EVENT_VDR_USER4: key = key_user4; break;
++ case XINE_EVENT_VDR_USER5: key = key_user5; break;
++ case XINE_EVENT_VDR_USER6: key = key_user6; break;
++ case XINE_EVENT_VDR_USER7: key = key_user7; break;
++ case XINE_EVENT_VDR_USER8: key = key_user8; break;
++ case XINE_EVENT_VDR_USER9: key = key_user9; break;
++ case XINE_EVENT_VDR_VOLPLUS: key = key_volume_plus; break;
++ case XINE_EVENT_VDR_VOLMINUS: key = key_volume_minus; break;
++ case XINE_EVENT_VDR_MUTE: key = key_mute; break;
++ default:
++ return;
++ }
++
++ if (0 != internal_write_event_key(this, key))
++ xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
++ _("input event write: %s.\n"), strerror(errno));
++}
++
++static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_stream_t *stream,
++ const char *data)
++{
++ vdr_input_plugin_t *this;
++ char *mrl = strdup(data);
++
++ if (!strncasecmp(mrl, "vdr:/", 5))
++ {
++ lprintf("filename '%s'\n", (char *)&mrl[ 4 ]);
++ }
++ else
++ {
++ free(mrl);
++ return NULL;
++ }
++
++ /*
++ * mrl accepted and opened successfully at this point
++ *
++ * => create plugin instance
++ */
++
++ this = (vdr_input_plugin_t *)xine_xmalloc(sizeof (vdr_input_plugin_t));
++
++ this->stream = stream;
++ this->curpos = 0;
++ this->mrl = mrl;
++ this->fh = -1;
++ this->fh_control = -1;
++ this->fh_result = -1;
++ this->fh_event = -1;
++
++
++ this->input_plugin.open = vdr_plugin_open;
++ this->input_plugin.get_capabilities = vdr_plugin_get_capabilities;
++ this->input_plugin.read = vdr_plugin_read;
++ this->input_plugin.read_block = vdr_plugin_read_block;
++ this->input_plugin.seek = vdr_plugin_seek;
++ this->input_plugin.get_current_pos = vdr_plugin_get_current_pos;
++ this->input_plugin.get_length = vdr_plugin_get_length;
++ this->input_plugin.get_blocksize = vdr_plugin_get_blocksize;
++ this->input_plugin.get_mrl = vdr_plugin_get_mrl;
++ this->input_plugin.dispose = vdr_plugin_dispose;
++ this->input_plugin.get_optional_data = vdr_plugin_get_optional_data;
++ this->input_plugin.input_class = cls_gen;
++
++ this->cur_func = func_unknown;
++ this->cur_size = 0;
++ this->cur_done = 0;
++
++ memset(this->osd_window, 0, sizeof (this->osd_window));
++
++ this->osd_buffer = 0;
++ this->osd_buffer_size = 0;
++ this->osd_unscaled_blending = 0;
++ this->mute_mode = INPUT_VDR_MUTE_SIMULATE;
++ this->dont_change_xine_volume = 0;
++ this->last_volume = 0;
++ this->frame_size.x = 0;
++ this->frame_size.y = 0;
++ this->frame_size.w = 0;
++ this->frame_size.h = 0;
++
++ this->event_queue = xine_event_new_queue(this->stream);
++
++ this->stream_external = 0;
++ this->event_queue_external = 0;
++
++ if (this->event_queue)
++ xine_event_create_listener_thread(this->event_queue, event_handler, this);
++
++ return &this->input_plugin;
++}
++
++/*
++ * vdr input plugin class stuff
++ */
++
++static char *vdr_class_get_description(input_class_t *this_gen)
++{
++ return _("VDR display device plugin");
++}
++
++static const char *vdr_class_get_identifier (input_class_t *this_gen)
++{
++ return "VDR";
++}
++
++static void vdr_class_dispose (input_class_t *this_gen)
++{
++ vdr_input_class_t *this = (vdr_input_class_t *)this_gen;
++
++ free(this);
++}
++
++static char **vdr_class_get_autoplay_list(input_class_t *this_gen,
++ int *num_files)
++{
++ vdr_input_class_t *class = (vdr_input_class_t *)this_gen;
++
++ *num_files = 1;
++ return class->mrls;
++}
++
++static void *init_class(xine_t *xine, void *data)
++{
++ vdr_input_class_t *this;
++
++ lprintf("init_class\n");
++
++ this = (vdr_input_class_t *)xine_xmalloc(sizeof (vdr_input_class_t));
++
++ this->xine = xine;
++
++ this->mrls[ 0 ] = "vdr:" VDR_ABS_FIFO_DIR "/stream#demux:mpeg_pes";
++ this->mrls[ 1 ] = 0;
++
++ this->input_class.get_instance = vdr_class_get_instance;
++ this->input_class.get_identifier = vdr_class_get_identifier;
++ this->input_class.get_description = vdr_class_get_description;
++ this->input_class.get_dir = NULL;
++ this->input_class.get_autoplay_list = vdr_class_get_autoplay_list;
++ this->input_class.dispose = vdr_class_dispose;
++ this->input_class.eject_media = NULL;
++
++ return this;
++}
++
++/*
++ * exported plugin catalog entry
++ */
++
++plugin_info_t xine_plugin_info[] =
++{
++ /* type, API, "name", version, special_info, init_function */
++ { PLUGIN_INPUT, 15, "VDR", XINE_VERSION_CODE, NULL, init_class },
++ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
++};
+diff -urNad xine-lib-vdr-1.0/src/vdr/input_vdr.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.h
+--- xine-lib-vdr-1.0/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/input_vdr.h 2005-02-12 22:01:43.000000000 +0000
+@@ -0,0 +1,512 @@
++
++#ifndef __INPUT_VDR_H
++#define __INPUT_VDR_H
++
++
++
++enum funcs
++{
++ func_unknown = -1
++ , func_nop
++ , func_osd_new
++ , func_osd_free
++ , func_osd_show
++ , func_osd_hide
++ , func_osd_set_position
++ , func_osd_draw_bitmap
++ , func_set_color
++ , func_clear
++ , func_mute
++ , func_set_volume
++ , func_set_speed
++ , func_set_prebuffer
++ , func_metronom
++ , func_start
++ , func_wait
++ , func_setup
++ , func_grab_image
++ , func_get_pts
++ , func_flush
++ , func_first_frame
++ , func_video_size
++ , func_set_video_window
++ , func_osd_flush
++ , func_play_external
++ , func_key
++ , func_frame_size
++ , func_reset_audio
++};
++
++enum keys
++{
++ key_none,
++ key_up,
++ key_down,
++ key_menu,
++ key_ok,
++ key_back,
++ key_left,
++ key_right,
++ key_red,
++ key_green,
++ key_yellow,
++ key_blue,
++ key_0,
++ key_1,
++ key_2,
++ key_3,
++ key_4,
++ key_5,
++ key_6,
++ key_7,
++ key_8,
++ key_9,
++ key_play,
++ key_pause,
++ key_stop,
++ key_record,
++ key_fast_fwd,
++ key_fast_rew,
++ key_power,
++ key_channel_plus,
++ key_channel_minus,
++ key_volume_plus,
++ key_volume_minus,
++ key_mute,
++ key_schedule,
++ key_channels,
++ key_timers,
++ key_recordings,
++ key_setup,
++ key_commands,
++ key_user1,
++ key_user2,
++ key_user3,
++ key_user4,
++ key_user5,
++ key_user6,
++ key_user7,
++ key_user8,
++ key_user9,
++};
++
++
++
++typedef struct __attribute__((packed)) data_header_s
++{
++ uint32_t func:8;
++ uint32_t len:24;
++}
++data_header_t;
++
++
++
++typedef data_header_t result_header_t;
++typedef data_header_t event_header_t;
++
++
++
++typedef struct __attribute__((packed)) data_nop_s
++{
++ data_header_t header;
++}
++data_nop_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_new_s
++{
++ data_header_t header;
++
++ uint8_t window;
++ int16_t x;
++ int16_t y;
++ uint16_t width;
++ uint16_t height;
++}
++data_osd_new_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_free_s
++{
++ data_header_t header;
++
++ uint8_t window;
++}
++data_osd_free_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_show_s
++{
++ data_header_t header;
++
++ uint8_t window;
++}
++data_osd_show_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_hide_s
++{
++ data_header_t header;
++
++ uint8_t window;
++}
++data_osd_hide_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_flush_s
++{
++ data_header_t header;
++}
++data_osd_flush_t;
++
++
++
++typedef struct __attribute__((packed)) data_play_external_s
++{
++ data_header_t header;
++}
++data_play_external_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_set_position_s
++{
++ data_header_t header;
++
++ uint8_t window;
++ int16_t x;
++ int16_t y;
++}
++data_osd_set_position_t;
++
++
++
++typedef struct __attribute__((packed)) data_osd_draw_bitmap_s
++{
++ data_header_t header;
++
++ uint8_t window;
++ int16_t x;
++ int16_t y;
++ uint16_t width;
++ uint16_t height;
++}
++data_osd_draw_bitmap_t;
++
++
++
++typedef struct __attribute__((packed)) data_set_color_s
++{
++ data_header_t header;
++
++ uint8_t window;
++ uint8_t index;
++ uint8_t num;
++}
++data_set_color_t;
++
++
++
++typedef struct __attribute__((packed)) data_flush_s
++{
++ data_header_t header;
++
++ int32_t ms_timeout;
++ uint8_t just_wait;
++}
++data_flush_t;
++
++
++
++typedef struct __attribute__((packed)) result_flush_s
++{
++ result_header_t header;
++
++ uint8_t timed_out;
++}
++result_flush_t;
++
++
++
++typedef struct __attribute__((packed)) data_clear_s
++{
++ data_header_t header;
++}
++data_clear_t;
++
++
++
++typedef struct __attribute__((packed)) data_mute_s
++{
++ data_header_t header;
++
++ uint8_t mute;
++}
++data_mute_t;
++
++
++
++typedef struct __attribute__((packed)) data_set_volume_s
++{
++ data_header_t header;
++
++ uint8_t volume;
++}
++data_set_volume_t;
++
++
++
++typedef struct __attribute__((packed)) data_set_speed_s
++{
++ data_header_t header;
++
++ int32_t speed;
++}
++data_set_speed_t;
++
++
++
++typedef struct __attribute__((packed)) data_set_prebuffer_s
++{
++ data_header_t header;
++
++ uint32_t prebuffer;
++}
++data_set_prebuffer_t;
++
++
++
++typedef struct __attribute__((packed)) data_metronom_s
++{
++ data_header_t header;
++
++ int64_t pts;
++ uint32_t flags;
++}
++data_metronom_t;
++
++
++
++typedef struct __attribute__((packed)) data_start_s
++{
++ data_header_t header;
++}
++data_start_t;
++
++
++
++typedef struct __attribute__((packed)) data_wait_s
++{
++ data_header_t header;
++
++ uint8_t data[ 64 * 1024 - sizeof (data_header_t) ];
++}
++data_wait_t;
++
++
++
++#define INPUT_VDR_MUTE_IGNORE 0
++#define INPUT_VDR_MUTE_EXECUTE 1
++#define INPUT_VDR_MUTE_SIMULATE 2
++
++typedef struct __attribute__((packed)) data_setup_s
++{
++ data_header_t header;
++
++ uint8_t osd_unscaled_blending;
++ uint8_t dont_change_xine_volume;
++ uint8_t mute_mode;
++}
++data_setup_t;
++
++
++
++typedef struct __attribute__((packed)) data_first_frame_s
++{
++ data_header_t header;
++}
++data_first_frame_t;
++
++
++
++typedef struct __attribute__((packed)) data_set_video_window_s
++{
++ data_header_t header;
++
++ uint32_t x;
++ uint32_t y;
++ uint32_t w;
++ uint32_t h;
++ uint32_t w_ref;
++ uint32_t h_ref;
++}
++data_set_video_window_t;
++
++
++
++typedef struct __attribute__((packed)) data_grab_image_s
++{
++ data_header_t header;
++}
++data_grab_image_t;
++
++
++
++typedef struct __attribute__((packed)) result_grab_image_s
++{
++ result_header_t header;
++
++ int32_t width;
++ int32_t height;
++ int32_t ratio;
++ int32_t format;
++}
++result_grab_image_t;
++
++
++
++typedef struct __attribute__((packed)) data_get_pts_s
++{
++ data_header_t header;
++}
++data_get_pts_t;
++
++
++
++typedef struct __attribute__((packed)) result_get_pts_s
++{
++ result_header_t header;
++
++ int64_t pts;
++}
++result_get_pts_t;
++
++
++
++typedef struct __attribute__((packed)) data_video_size_s
++{
++ data_header_t header;
++}
++data_video_size_t;
++
++
++
++typedef struct __attribute__((packed)) result_video_size_s
++{
++ result_header_t header;
++
++ int32_t left;
++ int32_t top;
++ int32_t width;
++ int32_t height;
++ int32_t ratio;
++}
++result_video_size_t;
++
++
++
++typedef struct __attribute__((packed)) data_reset_audio_s
++{
++ data_header_t header;
++}
++data_reset_audio_t;
++
++
++
++typedef struct __attribute__((packed)) event_key_s
++{
++ event_header_t header;
++
++ uint32_t key;
++}
++event_key_t;
++
++
++
++typedef struct __attribute__((packed)) event_frame_size_s
++{
++ event_header_t header;
++
++ int32_t left;
++ int32_t top;
++ int32_t width;
++ int32_t height;
++}
++event_frame_size_t;
++
++
++
++typedef struct __attribute__((packed)) event_play_external_s
++{
++ event_header_t header;
++
++ uint32_t key;
++}
++event_play_external_t;
++
++
++
++typedef union __attribute__((packed)) data_union_u
++{
++ data_header_t header;
++ data_nop_t nop;
++ data_osd_new_t osd_new;
++ data_osd_free_t osd_free;
++ data_osd_show_t osd_show;
++ data_osd_hide_t osd_hide;
++ data_osd_set_position_t osd_set_position;
++ data_osd_draw_bitmap_t osd_draw_bitmap;
++ data_set_color_t set_color;
++ data_flush_t flush;
++ data_clear_t clear;
++ data_mute_t mute;
++ data_set_volume_t set_volume;
++ data_set_speed_t set_speed;
++ data_set_prebuffer_t set_prebuffer;
++ data_metronom_t metronom;
++ data_start_t start;
++ data_wait_t wait;
++ data_setup_t setup;
++ data_grab_image_t grab_image;
++ data_get_pts_t get_pts;
++ data_first_frame_t first_frame;
++ data_video_size_t video_size;
++ data_set_video_window_t set_video_window;
++ data_osd_flush_t osd_flush;
++ data_play_external_t play_external;
++ data_reset_audio_t reset_audio;
++}
++data_union_t;
++
++
++
++typedef union __attribute__((packed)) result_union_u
++{
++ result_header_t header;
++ result_grab_image_t grab_image;
++ result_get_pts_t get_pts;
++ result_flush_t flush;
++ result_video_size_t video_size;
++}
++result_union_t;
++
++
++
++typedef union __attribute__((packed)) event_union_u
++{
++ event_header_t header;
++ event_key_t key;
++ event_frame_size_t frame_size;
++ event_play_external_t play_external;
++}
++event_union_t;
++
++
++
++#endif /* __INPUT_VDR_H */
++
+diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.c
+--- xine-lib-vdr-1.0/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.c 2005-02-12 22:01:43.000000000 +0000
+@@ -0,0 +1,492 @@
++/*
++ * Copyright (C) 2000-2004 the xine project
++ *
++ * This file is part of xine, a free video player.
++ *
++ * xine is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * xine is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ *
++ * $Id: vdr.c,v 1.20 2004/04/17 19:54:32 mroi Exp $
++ */
++
++/*
++ * frame scaler plugin for VDR
++ */
++
++#include "xine_internal.h"
++#include "post.h"
++#include "post_vdr.h"
++
++
++
++typedef struct vdr_post_plugin_s
++{
++ post_plugin_t post_plugin;
++
++ xine_event_queue_t *event_queue;
++ xine_stream_t *current_stream;
++ xine_stream_t *vdr_stream;
++
++ int8_t enabled;
++
++ int32_t x;
++ int32_t y;
++ int32_t w;
++ int32_t h;
++ int32_t w_ref;
++ int32_t h_ref;
++
++ int32_t old_frame_left;
++ int32_t old_frame_top;
++ int32_t old_frame_width;
++ int32_t old_frame_height;
++
++}
++vdr_post_plugin_t;
++
++
++static void vdr_set_video_window(vdr_post_plugin_t *this, int32_t x, int32_t y, int32_t w, int32_t h, int32_t w_ref, int32_t h_ref)
++{
++ this->enabled = 0;
++
++ this->x = x;
++ this->y = y;
++ this->w = w;
++ this->h = h;
++ this->w_ref = w_ref;
++ this->h_ref = h_ref;
++
++ if (w != w_ref || h != h_ref)
++ this->enabled = 1;
++}
++
++
++/* plugin class initialization function */
++static void *vdr_init_plugin(xine_t *xine, void *);
++
++/* plugin class functions */
++static post_plugin_t *vdr_open_plugin(post_class_t *class_gen, int inputs,
++ xine_audio_port_t **audio_target,
++ xine_video_port_t **video_target);
++static char *vdr_get_identifier(post_class_t *class_gen);
++static char *vdr_get_description(post_class_t *class_gen);
++static void vdr_class_dispose(post_class_t *class_gen);
++
++/* plugin instance functions */
++static void vdr_dispose(post_plugin_t *this_gen);
++
++/* frame intercept check */
++static int vdr_intercept_frame(post_video_port_t *port, vo_frame_t *frame);
++
++/* replaced vo_frame functions */
++static int vdr_draw(vo_frame_t *frame, xine_stream_t *stream);
++
++
++void *vdr_init_plugin(xine_t *xine, void *data)
++{
++ post_class_t *class = (post_class_t *)malloc(sizeof (post_class_t));
++
++ if (!class)
++ return NULL;
++
++ class->open_plugin = vdr_open_plugin;
++ class->get_identifier = vdr_get_identifier;
++ class->get_description = vdr_get_description;
++ class->dispose = vdr_class_dispose;
++
++ return class;
++}
++
++
++static vdr_post_plugin_t *vdr_singleton = 0;
++
++static post_plugin_t *vdr_open_plugin(post_class_t *class_gen, int inputs,
++ xine_audio_port_t **audio_target,
++ xine_video_port_t **video_target)
++{
++ vdr_post_plugin_t *this = (vdr_post_plugin_t *)xine_xmalloc(sizeof (vdr_post_plugin_t));
++ post_in_t *input;
++ post_out_t *output;
++ post_video_port_t *port;
++
++ if (vdr_singleton || !this || !video_target || !video_target[ 0 ])
++ {
++ free(this);
++ return NULL;
++ }
++
++ _x_post_init(&this->post_plugin, 0, 1);
++
++ port = _x_post_intercept_video_port(&this->post_plugin, video_target[ 0 ], &input, &output);
++ port->intercept_frame = vdr_intercept_frame;
++ port->new_frame->draw = vdr_draw;
++ input->xine_in.name = "video";
++ output->xine_out.name = "VDR enhanced video";
++ this->post_plugin.xine_post.video_input[ 0 ] = &port->new_port;
++
++ this->post_plugin.dispose = vdr_dispose;
++
++
++
++ vdr_singleton = this;
++
++ this->enabled = 0;
++ this->current_stream = 0;
++ this->vdr_stream = 0;
++ this->event_queue = 0;
++ this->old_frame_left = 0;
++ this->old_frame_top = 0;
++ this->old_frame_width = 0;
++ this->old_frame_height = 0;
++
++ return &this->post_plugin;
++}
++
++static char *vdr_get_identifier(post_class_t *class_gen)
++{
++ return "vdr";
++}
++
++static char *vdr_get_description(post_class_t *class_gen)
++{
++ return "modifies every video frame as requested by VDR";
++}
++
++static void vdr_class_dispose(post_class_t *class_gen)
++{
++ free(class_gen);
++}
++
++
++static void vdr_dispose(post_plugin_t *this_gen)
++{
++ if (_x_post_dispose(this_gen))
++ {
++ vdr_post_plugin_t *this = (vdr_post_plugin_t *)this_gen;
++
++ vdr_singleton = 0;
++
++ if (this->event_queue)
++ xine_event_dispose_queue(this->event_queue);
++
++ if (this->vdr_stream)
++ {
++ xine_event_t event;
++ vdr_frame_size_changed_data_t event_data;
++
++ event_data.x = 0;
++ event_data.y = 0;
++ event_data.w = 0;
++ event_data.h = 0;
++
++ event.type = XINE_EVENT_VDR_FRAMESIZECHANGED;
++ event.data = &event_data;
++ event.data_length = sizeof (event_data);
++
++ xine_event_send(this->vdr_stream, &event);
++ }
++
++ free(this_gen);
++ }
++}
++
++
++static int vdr_intercept_frame(post_video_port_t *port, vo_frame_t *frame)
++{
++ return (frame->format == XINE_IMGFMT_YV12 || frame->format == XINE_IMGFMT_YUY2);
++}
++
++
++static inline void vdr_scale(uint8_t *src, uint8_t *dst, int y_inc, int x_inc, int w_dst, int h_dst, int x, int y, int w, int h, int w_ref, int h_ref, int init)
++{
++ int x0 = x * w_dst / w_ref;
++ int y0 = y * h_dst / h_ref;
++
++ int x1 = ((x + w) * w_dst - 1 + w_ref) / w_ref;
++ int y1 = ((y + h) * h_dst - 1 + h_ref) / h_ref;
++
++ int dx = x1 - x0;
++ int dy = y1 - y0;
++
++ int yy, xx;
++
++ int dy2 = dy + dy;
++ int h_dst2 = h_dst + h_dst;
++ int y_eps = h_dst - dy2;
++
++ int dx2 = dx + dx;
++ int w_dst2 = w_dst + w_dst;
++ int x_eps0 = w_dst - dx2;
++
++ for (yy = 0; yy < y0; yy++)
++ {
++ uint8_t *dst0 = dst;
++
++ for (xx = 0; xx < w_dst; xx++)
++ {
++ *dst0 = init;
++ dst0 += x_inc;
++ }
++
++ dst += y_inc;
++ }
++
++ for (yy = y0; yy < y1; yy++)
++ {
++ uint8_t *dst0 = dst;
++ uint8_t *src0 = src;
++
++ int x_eps = x_eps0;
++
++ for (xx = 0; xx < x0; xx++)
++ {
++ *dst0 = init;
++ dst0 += x_inc;
++ }
++
++ for (xx = x0; xx < x1; xx++)
++ {
++ *dst0 = *src0;
++ dst0 += x_inc;
++
++ x_eps += w_dst2;
++ while (x_eps >= 0)
++ {
++ src0 += x_inc;
++ x_eps -= dx2;
++ }
++ }
++
++ for (xx = x1; xx < w_dst; xx++)
++ {
++ *dst0 = init;
++ dst0 += x_inc;
++ }
++
++ dst += y_inc;
++
++ y_eps += h_dst2;
++ while (y_eps >= 0)
++ {
++ src += y_inc;
++ y_eps -= dy2;
++ }
++ }
++
++ for (yy = y1; yy < h_dst; yy++)
++ {
++ uint8_t *dst0 = dst;
++
++ for (xx = 0; xx < w_dst; xx++)
++ {
++ *dst0 = init;
++ dst0 += x_inc;
++ }
++
++ dst += y_inc;
++ }
++}
++
++static void vdr_scale_YUY2(vdr_post_plugin_t *this, vo_frame_t *src, vo_frame_t *dst)
++{
++ int w = dst->width - dst->crop_left - dst->crop_right;
++ int h = dst->height - dst->crop_top - dst->crop_bottom;
++ int offset;
++
++ if (w < 0)
++ w = 0;
++
++ if (h < 0)
++ h = 0;
++
++ offset = dst->pitches[ 0 ] * dst->crop_top + 2 * dst->crop_left;
++ vdr_scale(&src->base[ 0 ][ 0 ] + offset, &dst->base[ 0 ][ 0 ] + offset, dst->pitches[ 0 ], 2, w , h, this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x00);
++ offset = dst->pitches[ 0 ] * dst->crop_top + 4 * ((dst->crop_left + 1) / 2);
++ vdr_scale(&src->base[ 0 ][ 1 ] + offset, &dst->base[ 0 ][ 1 ] + offset, dst->pitches[ 0 ], 4, (w + 1) / 2, h, this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x80);
++ offset = dst->pitches[ 0 ] * dst->crop_top + 4 * ((dst->crop_left + 1) / 2);
++ vdr_scale(&src->base[ 0 ][ 3 ] + offset, &dst->base[ 0 ][ 3 ] + offset, dst->pitches[ 0 ], 4, (w + 1) / 2, h, this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x80);
++}
++
++static void vdr_scale_YV12(vdr_post_plugin_t *this, vo_frame_t *src, vo_frame_t *dst)
++{
++ int w = dst->width - dst->crop_left - dst->crop_right;
++ int h = dst->height - dst->crop_top - dst->crop_bottom;
++ int offset;
++
++ if (w < 0)
++ w = 0;
++
++ if (h < 0)
++ h = 0;
++
++ offset = dst->pitches[ 0 ] * dst->crop_top + 1 * dst->crop_left;
++ vdr_scale(&src->base[ 0 ][ 0 ] + offset, &dst->base[ 0 ][ 0 ] + offset, dst->pitches[ 0 ], 1, w , h , this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x00);
++ offset = dst->pitches[ 1 ] * ((dst->crop_top + 1) / 2) + 1 * ((dst->crop_left + 1) / 2);
++ vdr_scale(&src->base[ 1 ][ 0 ] + offset, &dst->base[ 1 ][ 0 ] + offset, dst->pitches[ 1 ], 1, (w + 1) / 2, (h + 1) / 2, this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x80);
++ offset = dst->pitches[ 2 ] * ((dst->crop_top + 1) / 2) + 1 * ((dst->crop_left + 1) / 2);
++ vdr_scale(&src->base[ 2 ][ 0 ] + offset, &dst->base[ 2 ][ 0 ] + offset, dst->pitches[ 2 ], 1, (w + 1) / 2, (h + 1) / 2, this->x, this->y, this->w, this->h, this->w_ref, this->h_ref, 0x80);
++}
++
++
++static int vdr_is_vdr_stream(xine_stream_t *stream)
++{
++ if (!stream
++ || !stream->input_plugin
++ || !stream->input_plugin->input_class)
++ {
++ return 0;
++ }
++
++ {
++ input_class_t *input_class = stream->input_plugin->input_class;
++
++ if (input_class->get_identifier)
++ {
++ const char *identifier = input_class->get_identifier(input_class);
++
++ if (identifier
++ && 0 == strcmp(identifier, "VDR"))
++ {
++ return 1;
++ }
++ }
++ }
++
++ return 0;
++}
++
++
++static int vdr_draw(vo_frame_t *frame, xine_stream_t *stream)
++{
++ post_video_port_t *port = (post_video_port_t *)frame->port;
++ vdr_post_plugin_t *this = (vdr_post_plugin_t *)port->post;
++ vo_frame_t *vdr_frame;
++ xine_event_t *event;
++ int skip;
++
++ if (this->current_stream != stream)
++ {
++ this->current_stream = stream;
++
++ if (this->vdr_stream != this->current_stream
++ && vdr_is_vdr_stream(this->current_stream))
++ {
++ this->vdr_stream = this->current_stream;
++
++ if (this->event_queue)
++ xine_event_dispose_queue(this->event_queue);
++
++ this->event_queue = xine_event_new_queue(this->vdr_stream);
++ }
++ }
++
++ if (this->event_queue)
++ {
++ while ((event = xine_event_get(this->event_queue)))
++ {
++ if (event->type == XINE_EVENT_VDR_SETVIDEOWINDOW)
++ {
++ vdr_set_video_window_data_t *data = (vdr_set_video_window_data_t *)event->data;
++
++ vdr_set_video_window(this, data->x, data->y, data->w, data->h, data->w_ref, data->h_ref);
++ }
++
++ xine_event_free(event);
++ }
++ }
++
++ {
++ int frame_left = frame->crop_left;
++ int frame_width = frame->width - frame->crop_left - frame->crop_right;
++ int frame_top = frame->crop_top;
++ int frame_height = frame->height - frame->crop_top - frame->crop_bottom;
++
++ if (frame_left < 0)
++ frame_left = 0;
++ if (frame_width > frame->width)
++ frame_width = frame_width;
++ if (frame_top < 0)
++ frame_top = 0;
++ if (frame_height > frame->height)
++ frame_height = frame_height;
++
++ if (this->vdr_stream
++ && (this->old_frame_left != frame_left
++ || this->old_frame_top != frame_top
++ || this->old_frame_width != frame_width
++ || this->old_frame_height != frame_height))
++ {
++ xine_event_t event;
++ vdr_frame_size_changed_data_t event_data;
++
++ event_data.x = frame_left;
++ event_data.y = frame_top;
++ event_data.w = frame_width;
++ event_data.h = frame_height;
++
++ event.type = XINE_EVENT_VDR_FRAMESIZECHANGED;
++ event.data = &event_data;
++ event.data_length = sizeof (event_data);
++
++ xine_event_send(this->vdr_stream, &event);
++
++ this->old_frame_left = frame_left;
++ this->old_frame_top = frame_top;
++ this->old_frame_width = frame_width;
++ this->old_frame_height = frame_height;
++ }
++ }
++
++ if (!this->enabled || frame->bad_frame)
++ {
++ _x_post_frame_copy_down(frame, frame->next);
++ skip = frame->next->draw(frame->next, stream);
++ _x_post_frame_copy_up(frame, frame->next);
++ return skip;
++ }
++
++ vdr_frame = port->original_port->get_frame(port->original_port,
++ frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS);
++
++ _x_post_frame_copy_down(frame, vdr_frame);
++
++ switch (vdr_frame->format)
++ {
++ case XINE_IMGFMT_YUY2:
++ vdr_scale_YUY2(this, frame, vdr_frame);
++ break;
++
++ case XINE_IMGFMT_YV12:
++ vdr_scale_YV12(this, frame, vdr_frame);
++ break;
++ }
++
++ skip = vdr_frame->draw(vdr_frame, stream);
++ _x_post_frame_copy_up(frame, vdr_frame);
++ vdr_frame->free(vdr_frame);
++
++ return skip;
++}
++
++
++
++static post_info_t vdr_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
++
++plugin_info_t xine_plugin_info[] =
++{
++ /* type, API, "name", version, special_info, init_function */
++ { PLUGIN_POST, 9, "vdr", XINE_VERSION_CODE, &vdr_special_info, &vdr_init_plugin },
++ { PLUGIN_NONE, 0, "", 0, NULL, NULL }
++};
++
+diff -urNad xine-lib-vdr-1.0/src/vdr/post_vdr.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.h
+--- xine-lib-vdr-1.0/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/vdr/post_vdr.h 2005-02-12 22:01:43.000000000 +0000
+@@ -0,0 +1,30 @@
++
++#ifndef __POST_VDR_H
++#define __POST_VDR_H
++
++
++
++typedef struct vdr_set_video_window_data_s {
++ int32_t x;
++ int32_t y;
++ int32_t w;
++ int32_t h;
++ int32_t w_ref;
++ int32_t h_ref;
++
++} vdr_set_video_window_data_t;
++
++
++
++typedef struct vdr_frame_size_changed_data_s {
++ int32_t x;
++ int32_t y;
++ int32_t w;
++ int32_t h;
++
++} vdr_frame_size_changed_data_t;
++
++
++
++#endif /* __POST_VDR_H */
++
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/post.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/post.c
+--- xine-lib-vdr-1.0/src/xine-engine/post.c 2004-10-17 20:14:30.000000000 +0100
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/post.c 2005-02-12 22:01:43.000000000 +0000
+@@ -241,7 +241,7 @@
+ if (!*input) return port;
+ (*input)->xine_in.name = "video in";
+ (*input)->xine_in.type = XINE_POST_DATA_VIDEO;
+- (xine_video_port_t *)(*input)->xine_in.data = &port->new_port;
++ *(xine_video_port_t **)&(*input)->xine_in.data = &port->new_port;
+ (*input)->post = post;
+ xine_list_append_content(post->input, *input);
+ }
+@@ -251,7 +251,7 @@
+ if (!*output) return port;
+ (*output)->xine_out.name = "video out";
+ (*output)->xine_out.type = XINE_POST_DATA_VIDEO;
+- (xine_video_port_t **)(*output)->xine_out.data = &port->original_port;
++ *(xine_video_port_t ***)&(*output)->xine_out.data = &port->original_port;
+ (*output)->xine_out.rewire = post_video_rewire;
+ (*output)->post = post;
+ (*output)->user_data = port;
+@@ -420,6 +420,10 @@
+ to->drawn = from->drawn;
+ to->accel_data = from->accel_data;
+ to->stream = from->stream;
++ to->crop_left = from->crop_left;
++ to->crop_right = from->crop_right;
++ to->crop_top = from->crop_top;
++ to->crop_bottom = from->crop_bottom;
+
+ if (to->extra_info != from->extra_info)
+ _x_extra_info_merge(to->extra_info, from->extra_info);
+@@ -718,7 +722,7 @@
+ if (!*input) return port;
+ (*input)->xine_in.name = "audio in";
+ (*input)->xine_in.type = XINE_POST_DATA_AUDIO;
+- (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port;
++ *(xine_audio_port_t **)&(*input)->xine_in.data = &port->new_port;
+ (*input)->post = post;
+ xine_list_append_content(post->input, *input);
+ }
+@@ -728,7 +732,7 @@
+ if (!*output) return port;
+ (*output)->xine_out.name = "audio out";
+ (*output)->xine_out.type = XINE_POST_DATA_AUDIO;
+- (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port;
++ *(xine_audio_port_t ***)&(*output)->xine_out.data = &port->original_port;
+ (*output)->xine_out.rewire = post_audio_rewire;
+ (*output)->post = post;
+ (*output)->user_data = port;
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/video_overlay.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h
+--- xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2004-12-08 18:18:24.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/video_overlay.h 2005-02-12 22:01:43.000000000 +0000
+@@ -38,7 +38,7 @@
+
+ #define MAX_OBJECTS 50
+ #define MAX_EVENTS 50
+-#define MAX_SHOWING 16
++#define MAX_SHOWING (5 + 16)
+
+ #define OVERLAY_EVENT_NULL 0
+ #define OVERLAY_EVENT_SHOW 1
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine.c /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine.c
+--- xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-02-12 22:01:42.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine.c 2005-02-12 22:01:43.000000000 +0000
+@@ -1923,3 +1923,48 @@
+ slave->master = master->master;
+ return 1;
+ }
++
++int _x_continue_stream_processing(xine_stream_t *stream)
++{
++ return stream->status != XINE_STATUS_STOP
++ && stream->status != XINE_STATUS_QUIT;
++}
++
++void _x_trigger_relaxed_frame_drop_mode(xine_stream_t *stream)
++{
++ stream->first_frame_flag = 2;
++}
++
++void _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames)
++{
++ stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0);
++
++ if (num_video_buffers)
++ *num_video_buffers = (stream->video_fifo ? stream->video_fifo->size(stream->video_fifo) : 0);
++
++ if (num_audio_buffers)
++ *num_audio_buffers = (stream->audio_fifo ? stream->audio_fifo->size(stream->audio_fifo) : 0);
++
++ if (num_video_frames)
++ *num_video_frames = (stream->video_out ? stream->video_out->get_property(stream->video_out, VO_PROP_BUFS_IN_FIFO) : 0);
++
++ if (num_audio_frames)
++ *num_audio_frames = (stream->audio_out ? stream->audio_out->get_property(stream->audio_out, AO_PROP_BUFS_IN_FIFO) : 0);
++
++ stream->xine->port_ticket->release(stream->xine->port_ticket, 0);
++}
++
++int _x_query_unprocessed_osd_events(xine_stream_t *stream)
++{
++ video_overlay_manager_t *ovl;
++ int redraw_needed;
++
++ stream->xine->port_ticket->acquire(stream->xine->port_ticket, 0);
++
++ ovl = stream->video_out->get_overlay_manager(stream->video_out);
++ redraw_needed = ovl->redraw_needed(ovl, 0);
++
++ stream->xine->port_ticket->release(stream->xine->port_ticket, 0);
++
++ return redraw_needed;
++}
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/xine_internal.h /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h
+--- xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2004-12-19 20:24:31.000000000 +0000
++++ /tmp/dpep.ufzvy6/xine-lib-vdr-1.0/src/xine-engine/xine_internal.h 2005-02-12 22:01:43.000000000 +0000
+@@ -342,6 +342,11 @@
+ * private function prototypes:
+ */
+
++int _x_continue_stream_processing(xine_stream_t *stream);
++void _x_trigger_relaxed_frame_drop_mode(xine_stream_t *stream);
++void _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames);
++int _x_query_unprocessed_osd_events(xine_stream_t *stream);
++
+ void _x_handle_stream_end (xine_stream_t *stream, int non_user);
+
+ /* report message to UI. usually these are async errors */
Added: general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/patches/99_autoconf.dpatch 2005-03-02 10:34:25 UTC (rev 225)
@@ -0,0 +1,81879 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_autoconf.dpatch by Darren Salt
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xine-lib-vdr-1.0/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in
+--- xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,94 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(srcdir)/config.h.in $(top_srcdir)/configure \
+- $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
+- ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
+- depcomp install-sh ltmain.sh missing
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = config.h
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
+-DIST_ARCHIVES = $(distdir).tar.gz
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -108,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -128,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -154,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -183,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -312,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -327,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -341,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -355,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -379,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -416,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -431,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -448,66 +271,23 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
++
+ AUTOMAKE_OPTIONS = 1.3
++
+ ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = doc m4 intl po misc include lib src win32
++
+ DEBFILES = debian/README.Debian debian/changelog debian/control \
+ debian/copyright debian/rules debian/compat \
+ debian/shlibdeps.sh debian/libxine-dev.install debian/libxine1.install
+
++
+ EXTRA_DIST = autogen.sh \
+ automake.diff \
+ $(DEBFILES) \
+@@ -528,44 +308,46 @@
+ CREDITS \
+ @DEPCOMP@
+
++
+ noinst_HEADERS = config.h
++
+ CONFIG_CLEAN_FILES = libtool-nofpic
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = config.h
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = README $(noinst_HEADERS) ABOUT-NLS AUTHORS COPYING \
++ ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO aclocal.m4 \
++ compile config.guess config.h.in config.sub configure \
++ configure.ac depcomp install-sh ltmain.sh missing mkinstalldirs
++DIST_SUBDIRS = $(SUBDIRS)
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh:
+- @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+- cd $(srcdir) && $(AUTOMAKE) --gnu \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- echo ' $(SHELL) ./config.status'; \
+- $(SHELL) ./config.status;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+- esac;
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/_xine.m4 m4/aa.m4 m4/alsa.m4 m4/arts.m4 m4/as.m4 m4/caca.m4 m4/codeset.m4 m4/directx.m4 m4/dl.m4 m4/dvdnav.m4 m4/esd.m4 m4/ffmpeg.m4 m4/freetype2.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/irixal.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/libfame.m4 m4/libFLAC.m4 m4/ogg.m4 m4/opengl.m4 m4/pkg.m4 m4/progtest.m4 m4/sdl.m4 m4/speex.m4 m4/theora.m4 m4/vorbis.m4 m4/xine.m4 m4/xv.m4
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -577,10 +359,10 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h1
+- touch $@
++ touch $(srcdir)/config.h.in
+
+ distclean-hdr:
+ -rm -f config.h stamp-h1
+@@ -651,10 +433,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -664,23 +447,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+@@ -689,24 +463,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -715,24 +473,30 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = .
++distdir = $(PACKAGE)-$(VERSION)
++
++am__remove_distdir = \
++ { test ! -d $(distdir) \
++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr $(distdir); }; }
++
++GZIP_ENV = --best
++distcleancheck_listfiles = find . -type f -print
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/debian $(distdir)/include $(distdir)/intl $(distdir)/m4 $(distdir)/misc $(distdir)/po $(distdir)/src/xine-engine
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/debian $(distdir)/include $(distdir)/intl $(distdir)/misc $(distdir)/po $(distdir)/src/xine-engine
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -747,17 +511,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -768,54 +530,26 @@
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+- $(am__remove_distdir)
+-
+-dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+- $(am__remove_distdir)
+-
+-dist-tarZ: distdir
+- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+- $(am__remove_distdir)
+-
+-dist-shar: distdir
+- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+- $(am__remove_distdir)
+-
+-dist-zip: distdir
+- -rm -f $(distdir).zip
+- zip -rq $(distdir).zip $(distdir)
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ dist dist-all: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ # This target untars the dist file and tries a VPATH configuration. Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+- case '$(DIST_ARCHIVES)' in \
+- *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+- *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+- *.tar.Z*) \
+- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+- *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+- *.zip*) \
+- unzip $(distdir).zip ;;\
+- esac
++ $(am__remove_distdir)
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+- mkdir $(distdir)/_build
+- mkdir $(distdir)/_inst
++ mkdir $(distdir)/=build
++ mkdir $(distdir)/=inst
+ chmod a-w $(distdir)
+- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+- && cd $(distdir)/_build \
+- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
++ && cd $(distdir)/=build \
++ && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ --with-included-gettext \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+@@ -824,40 +558,23 @@
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+- distuninstallcheck \
+- && chmod -R a-w "$$dc_install_base" \
+- && ({ \
+- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+- } || { rm -rf "$$dc_destdir"; exit 1; }) \
+- && rm -rf "$$dc_destdir" \
+- && $(MAKE) $(AM_MAKEFLAGS) dist \
+- && rm -rf $(DIST_ARCHIVES) \
++ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
++ || { echo "ERROR: files left after uninstall:" ; \
++ find $$dc_install_base -type f -print ; \
++ exit 1; } >&2 ) \
++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
++ && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+- @(echo "$(distdir) archives ready for distribution: "; \
+- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+-distuninstallcheck:
+- @cd $(distuninstallcheck_dir) \
+- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+- || { echo "ERROR: files left after uninstall:" ; \
+- if test -n "$(DESTDIR)"; then \
+- echo " (check DESTDIR support)"; \
+- fi ; \
+- $(distuninstallcheck_listfiles) ; \
+- exit 1; } >&2
++ @echo "$(distdir).tar.gz is ready for distribution" | \
++ sed 'h;s/./=/g;p;x;p;x'
+ distcleancheck: distclean
+- @if test '$(srcdir)' = . ; then \
++ if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+- || { echo "ERROR: files left in build directory after distclean:" ; \
++ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++ || { echo "ERROR: files left after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+ check-am: all-am
+@@ -865,6 +582,7 @@
+ all-am: Makefile $(HEADERS) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -876,30 +594,27 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-hdr \
+- distclean-libtool distclean-tags
++distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -918,41 +633,32 @@
+
+ maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+- -rm -rf $(top_srcdir)/autom4te.cache
+- -rm -f Makefile
++ -rm -rf autom4te.cache
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+- check-am clean clean-generic clean-libtool clean-recursive \
+- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-shar dist-tarZ dist-zip distcheck distclean \
+- distclean-generic distclean-hdr distclean-libtool \
+- distclean-recursive distclean-tags distcleancheck distdir \
+- distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive dist dist-all \
++ dist-gzip distcheck distclean distclean-generic distclean-hdr \
++ distclean-libtool distclean-recursive distclean-tags \
++ distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ docs:
+@@ -972,6 +678,8 @@
+ (cd $$subdir && $(MAKE) $@) || exit;\
+ done;
+
++debug-install: install-debug
++
+ install-debug: debug
+ @list='$(SUBDIRS)'; for subdir in $$list; do \
+ (cd $$subdir && $(MAKE) $@) || exit; \
+diff -urNad xine-lib-vdr-1.0/aclocal.m4 /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/aclocal.m4
+--- xine-lib-vdr-1.0/aclocal.m4 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/aclocal.m4 2005-02-13 01:07:42.000000000 +0000
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
++# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -11,6 +11,906 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
++# Add --enable-maintainer-mode option to configure.
++# From Jim Meyering
++
++# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 1
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++# AM_CONDITIONAL -*- Autoconf -*-
++
++# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 5
++
++AC_PREREQ(2.52)
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([conditional \"$1\" was never defined.
++Usually this means the macro was only invoked conditionally.])
++fi])])
++
++# Do all the work for Automake. -*- Autoconf -*-
++
++# This macro actually does too much some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
++
++# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 8
++
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++
++
++AC_PREREQ([2.52])
++
++# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
++# the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
++ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_MISSING_PROG(AMTAR, tar)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_][CC],
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_][CC],
++ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_][CXX],
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_][CXX],
++ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
++
++# Copyright 2002 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++ [AM_AUTOMAKE_VERSION([1.6.3])])
++
++# Helper functions for option handling. -*- Autoconf -*-
++
++# Copyright 2001, 2002 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 2
++
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++#
++# Check to make sure that the build environment is sane.
++#
++
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
++
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
++else
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
++
++# -*- Autoconf -*-
++
++
++# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
++
++# AM_AUX_DIR_EXPAND
++
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++# Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])
++
++AC_DEFUN([AM_AUX_DIR_EXPAND], [
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++
++# AM_PROG_INSTALL_STRIP
++
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# serial 4 -*- Autoconf -*-
++
++# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++
++
++
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
++
++ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
++ [$1], CXX, [depcc="$CXX" am_compiler_list=],
++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++ [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++
++ am_cv_$1_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++ fi
++ for depmode in $am_compiler_list; do
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ echo '#include "conftest.h"' > conftest.c
++ echo 'int i;' > conftest.h
++ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
++
++ case $depmode in
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ none) break ;;
++ esac
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this.
++ if depmode=$depmode \
++ source=conftest.c object=conftest.o \
++ depfile=conftest.Po tmpdepfile=conftest.TPo \
++ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
++ grep conftest.h conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ am_cv_$1_dependencies_compiler_type=$depmode
++ break
++ fi
++ done
++
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++])
++
++
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[rm -f .deps 2>/dev/null
++mkdir .deps 2>/dev/null
++if test -d .deps; then
++ DEPDIR=.deps
++else
++ # MS-DOS does not allow filenames that begin with a dot.
++ DEPDIR=_deps
++fi
++rmdir .deps 2>/dev/null
++AC_SUBST([DEPDIR])
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[ --disable-dependency-tracking Speeds up one-time builds
++ --enable-dependency-tracking Do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++ am_depcomp="$ac_aux_dir/depcomp"
++ AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])
++])
++
++# Generate code to set up dependency tracking. -*- Autoconf -*-
++
++# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++#serial 2
++
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # So let's grep whole file.
++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
++ # Extract the definition of DEP_FILES from the Makefile without
++ # running `make'.
++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n -e '/^U = / s///p' < "$mf"`
++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++ # We invoke sed twice because it is the simplest approach to
++ # changing $(DEPDIR) to its actual value in the expansion.
++ for file in `sed -n -e '
++ /^DEP_FILES = .*\\\\$/ {
++ s/^DEP_FILES = //
++ :loop
++ s/\\\\$//
++ p
++ n
++ /\\\\$/ b loop
++ p
++ }
++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled. FIXME. This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++
++# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 2
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++doit:
++ @echo done
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
++ am__include=include
++ am__quote=
++ _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ fi
++fi
++AC_SUBST(am__include)
++AC_SUBST(am__quote)
++AC_MSG_RESULT($_am_result)
++rm -f confinc confmf
++])
++
++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++AC_PREREQ([2.52])
++
++# serial 6
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. We must strip everything past the first ":",
++# and everything past the last "/".
++
++# _AM_DIRNAME(PATH)
++# -----------------
++# Like AS_DIRNAME, only do it during macro expansion
++AC_DEFUN([_AM_DIRNAME],
++ [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
++ m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
++ m4_if(regexp([$1], [^/.*]), -1,
++ [.],
++ patsubst([$1], [^\(/\).*], [\1])),
++ patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
++ patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
++])# _AM_DIRNAME
++
++
++# The stamp files are numbered to have different names.
++# We could number them on a directory basis, but that's additional
++# complications, let's have a unique counter.
++m4_define([_AM_STAMP_Count], [0])
++
++
++# _AM_STAMP(HEADER)
++# -----------------
++# The name of the stamp file for HEADER.
++AC_DEFUN([_AM_STAMP],
++[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
++AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
++ [:.*])))/stamp-h[]_AM_STAMP_Count])
++
++
++# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
++# ------------------------------------------------------------
++# We used to try to get a real timestamp in stamp-h. But the fear is that
++# that will cause unnecessary cvs conflicts.
++AC_DEFUN([_AM_CONFIG_HEADER],
++[# Add the stamp file to the list of files AC keeps track of,
++# along with our hook.
++AC_CONFIG_HEADERS([$1],
++ [# update the timestamp
++echo 'timestamp for $1' >"_AM_STAMP([$1])"
++$2],
++ [$3])
++])# _AM_CONFIG_HEADER
++
++
++# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
++# --------------------------------------------------------------
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
++])# AM_CONFIG_HEADER
++
++#serial 1
++# This test replaces the one in autoconf.
++# Currently this macro should have the same name as the autoconf macro
++# because gettext's gettext.m4 (distributed in the automake package)
++# still uses it. Otherwise, the use in gettext.m4 makes autoheader
++# give these diagnostics:
++# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
++# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
++
++undefine([AC_ISC_POSIX])
++
++AC_DEFUN([AC_ISC_POSIX],
++ [
++ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
++ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
++ ]
++)
++
++dnl Extracted from automake-1.5 and sligtly modified for Xine usage.
++dnl Daniel Caujolle-Bert <segfault@club-internet.fr>
++
++# Figure out how to run the assembler.
++
++# AM_PROG_AS_MOD
++AC_DEFUN([AM_PROG_AS_MOD],
++[# By default we simply use the C compiler to build assembly code.
++AC_REQUIRE([AC_PROG_CC])
++: ${CCAS='$(CC)'}
++# Set CCASFLAGS if not already set.
++: ${CCASFLAGS='$(CFLAGS)'}
++# Set ASCOMPILE if not already set.
++if test $CCAS = '$'CC; then
++: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS) -c'}
++else
++: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS)'}
++fi
++AC_SUBST(CCAS)
++AC_SUBST(CCASFLAGS)
++AC_SUBST(CCASCOMPILE)])
++
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+ # serial 47 AC_PROG_LIBTOOL
+@@ -5927,1063 +6827,3615 @@
+ AC_MSG_RESULT([$SED])
+ ])
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
++dnl AC_C_ALWAYS_INLINE
++dnl Define inline to something appropriate, including the new always_inline
++dnl attribute from gcc 3.1
++dnl Thanks to Michel LESPINASSE <walken@zoy.org>
++AC_DEFUN([AC_C_ALWAYS_INLINE],
++ [AC_C_INLINE
++ if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
++ AC_MSG_CHECKING([for always_inline])
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -Wall -Werror"
++ AC_TRY_COMPILE([],[inline __attribute__ ((__always_inline__)) void f (void);],
++ [ac_cv_always_inline=yes],[ac_cv_always_inline=no])
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT([$ac_cv_always_inline])
++ if test x"$ac_cv_always_inline" = x"yes"; then
++ AH_TOP([
++#ifdef inline
++/* the strange formatting below is needed to prevent config.status from rewriting it */
++# undef \
++ inline
++#endif
++ ])
++ AC_DEFINE_UNQUOTED([inline],[inline __attribute__ ((__always_inline__))])
++ fi
++ fi])
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl
++dnl Check for minimum version of libtool
++dnl AC_PREREQ_LIBTOOL([MINIMUM VERSION],[ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]])
++AC_DEFUN([AC_PREREQ_LIBTOOL],
++ [
++ lt_min_full=ifelse([$1], ,1.3.5,$1)
++ lt_min=`echo $lt_min_full | sed -e 's/\.//g'`
++ AC_MSG_CHECKING(for libtool >= $lt_min_full)
++ lt_version="`grep '^VERSION' $srcdir/ltmain.sh | sed -e 's/VERSION\=//g;s/[[-.a-zA-Z]]//g'`"
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test $lt_version -lt 100 ; then
++ lt_version=`expr $lt_version \* 10`
++ fi
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ if test $lt_version -lt $lt_min ; then
++ AC_MSG_RESULT(no)
++ ifelse([$3], , :, [$3])
++ fi
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ ])
+
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++dnl
++AC_DEFUN([AC_CHECK_LIRC],
++ [AC_ARG_ENABLE(lirc,
++ AC_HELP_STRING([--disable-lirc], [turn off LIRC support]),
++ enable_lirc=$enableval, enable_lirc=yes)
+
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.3])])
++ if test x"$enable_lirc" = xyes; then
++ have_lirc=yes
++ AC_REQUIRE_CPP
++ AC_CHECK_LIB(lirc_client,lirc_init,
++ AC_CHECK_HEADER(lirc/lirc_client.h, true, have_lirc=no), have_lirc=no)
++ if test "$have_lirc" = "yes"; then
+
+-# AM_AUX_DIR_EXPAND
++ if test x"$LIRC_PREFIX" != "x"; then
++ lirc_libprefix="$LIRC_PREFIX/lib"
++ LIRC_INCLUDE="-I$LIRC_PREFIX/include"
++ fi
++ for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
++ AC_CHECK_FILE("$llirc/liblirc_client.a",
++ LIRC_LIBS="$llirc/liblirc_client.a"
++ AC_DEFINE(HAVE_LIRC),,)
++ done
++ else
++ AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
++ fi
++ fi
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++ AC_SUBST(LIRC_LIBS)
++ AC_SUBST(LIRC_INCLUDE)
++])
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++dnl AC_LINUX_PATH(DEFAULT PATH)
++AC_DEFUN([AC_LINUX_PATH],
++ [AC_ARG_WITH(linux-path,
++ AC_HELP_STRING([--with-linux-path=PATH], [where the linux sources are located]),
++ linux_path="$withval", linux_path="$1")
++ LINUX_INCLUDE="-I$linux_path/include"
++])
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl AC_CHECK_DXR3()
++AC_DEFUN([AC_CHECK_DXR3],
++[
++ AC_ARG_ENABLE(dxr3,
++ AC_HELP_STRING([--disable-dxr3], [do not build the DXR3/HW+ plugins]),
++ enable_dxr3=$enableval, enable_dxr3=yes)
++ if test x"$enable_dxr3" = xyes; then
++ have_dxr3=yes
++ AC_MSG_RESULT([*** checking for a supported mpeg encoder])
++ have_encoder=no
++ have_libfame=yes
++ AC_CHECK_LIB(fame, fame_open,
++ [AC_CHECK_HEADER(fame.h, true, have_libfame=no)], have_libfame=no)
++ if test "$have_libfame" = "yes"; then
++ AC_DEFINE(HAVE_LIBFAME)
++ have_encoder=yes
++ fi
++ have_librte=yes
++ AC_CHECK_LIB(rte, rte_init,
++ [AC_CHECK_HEADER(rte.h, true, have_librte=no)], have_librte=no)
++ if test "$have_librte" = "yes"; then
++ AC_DEFINE(HAVE_LIBRTE)
++ AC_MSG_WARN([this will probably only work with rte version 0.4!])
++ have_encoder=yes
++ fi
++ if test "$have_encoder" = "yes"; then
++ AC_MSG_RESULT([*** found one or more external mpeg encoders]);
++ else
++ AC_MSG_RESULT([*** no external mpeg encoder found]);
++ fi
++ else
++ AC_MSG_RESULT([DXR3 plugins will not be built.])
++ have_dxr3=no
++ fi
++])
+
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+-#
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory. The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run. This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
+-#
+-# $ac_aux_dir/missing
+-# fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-# fails if $ac_aux_dir is absolute,
+-# fails when called from a subdirectory in a VPATH build with
+-# a relative $ac_aux_dir
+-#
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir. In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
+-#
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-# MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+-#
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH. The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
+
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
++dnl AC_C_ATTRIBUTE_ALIGNED
++dnl define ATTRIBUTE_ALIGNED_MAX to the maximum alignment if this is supported
++AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED],
++ [AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
++ [ac_cv_c_attribute_aligned],
++ [ac_cv_c_attribute_aligned=0
++ for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
++ AC_TRY_COMPILE([],
++ [static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0
++; return c;],
++ [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
++ done])
++ if test x"$ac_cv_c_attribute_aligned" != x"0"; then
++ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
++ [$ac_cv_c_attribute_aligned],[maximum supported data alignment])
++ fi])
++
++dnl AC_TRY_CFLAGS (CFLAGS, [ACTION-IF-WORKS], [ACTION-IF-FAILS])
++dnl check if $CC supports a given set of cflags
++AC_DEFUN([AC_TRY_CFLAGS],
++ [AC_MSG_CHECKING([if $CC supports $1 flags])
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$1"
++ AC_TRY_COMPILE([],[],[ac_cv_try_cflags_ok=yes],[ac_cv_try_cflags_ok=no])
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT([$ac_cv_try_cflags_ok])
++ if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++ ifelse([$2],[],[:],[$2])
++ else
++ ifelse([$3],[],[:],[$3])
++ fi])
++
++
++dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
++dnl generate a default inttypes.h if the header file does not exist already
++AC_DEFUN([AC_CHECK_GENERATE_INTTYPES],
++ [AC_CHECK_HEADER([inttypes.h],[],
++ [AC_COMPILE_CHECK_SIZEOF([char],[1])
++ AC_COMPILE_CHECK_SIZEOF([short],[2])
++ AC_COMPILE_CHECK_SIZEOF([int],[4])
++ AC_COMPILE_CHECK_SIZEOF([long long],[8])
++ cat >$1/inttypes.h << EOF
++#ifndef _INTTYPES_H
++#define _INTTYPES_H
++/* default inttypes.h for people who do not have it on their system */
++#if (!defined __int8_t_defined) && (!defined __BIT_TYPES_DEFINED__)
++#define __int8_t_defined
++typedef signed char int8_t;
++typedef signed short int16_t;
++typedef signed int int32_t;
++#ifdef ARCH_X86
++typedef signed long long int64_t;
++#endif
++#endif
++#if (!defined __uint8_t_defined) && (!defined _LINUX_TYPES_H)
++#define __uint8_t_defined
++typedef unsigned char uint8_t;
++typedef unsigned short uint16_t;
++typedef unsigned int uint32_t;
++#ifdef ARCH_X86
++typedef unsigned long long uint64_t;
++#endif
++#endif
++#endif
++EOF
++ ])])
++
++
++dnl AC_COMPILE_CHECK_SIZEOF (TYPE SUPPOSED-SIZE)
++dnl abort if the given type does not have the supposed size
++AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
++ [AC_MSG_CHECKING(that size of $1 is $2)
++ AC_TRY_COMPILE([],[switch (0) case 0: case (sizeof ($1) == $2):;],[],
++ [AC_MSG_ERROR([can not build a default inttypes.h])])
++ AC_MSG_RESULT([yes])])
++
++
++dnl AM_CHECK_CDROM_IOCTLS ([ACTION-IF-YES], [ACTION-IF-NO])
++dnl check for CDROM_DRIVE_STATUS in ioctl.h
++AC_DEFUN([AM_CHECK_CDROM_IOCTLS],
++ [AC_CACHE_CHECK([if cdrom ioctls are available],
++ [am_cv_have_cdrom_ioctls],
++ [AC_EGREP_HEADER([CDROM_DRIVE_STATUS],[sys/ioctl.h],
++ am_cv_have_cdrom_ioctls=yes,
++ [AC_EGREP_HEADER([CDIOCALLOW],[sys/ioctl.h],
++ am_cv_have_cdrom_ioctls=yes,
++ [AC_EGREP_CPP(we_have_cdrom_ioctls,[
++#include <sys/ioctl.h>
++#ifdef HAVE_SYS_CDIO_H
++# include <sys/cdio.h>
++#endif
++#ifdef HAVE_LINUX_CDROM_H
++# include <linux/cdrom.h>
++#endif
++#if defined(CDROM_DRIVE_STATUS) || defined(CDIOCALLOW) || defined(CDROMCDXA)
++ we_have_cdrom_ioctls
++#endif
++],
++ am_cv_have_cdrom_ioctls=yes,
++ am_cv_have_cdrom_ioctls=no
++ )])])])
++ have_cdrom_ioctls=$am_cv_have_cdrom_ioctls
++ if test "x$have_cdrom_ioctls" = xyes ; then
++ ifelse([$1], , :, [$1])
++ else
++ ifelse([$2], , :, [$2])
++ fi
+ ])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
++dnl AC_CHECK_IP_MREQN
++dnl check for struct ip_mreqn in netinet/in.h
++AC_DEFUN([AC_CHECK_IP_MREQN],
++ [AC_CACHE_CHECK([for ip_mreqn], [ac_cv_have_ip_mreqn],
++ [AC_EGREP_HEADER([ip_mreqn],
++ [netinet/in.h],
++ [ac_cv_have_ip_mreqn=yes],
++ [ac_cv_have_ip_mreqn=no])])
++ if test $ac_cv_have_ip_mreqn = yes; then
++ AC_DEFINE([HAVE_IP_MREQN],1,[Define this if you have ip_mreqn in netinet/in.h])
++ fi
++])
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++dnl AC_PROG_GMSGFMT_PLURAL
++dnl ----------------------
++dnl Validate the GMSGFMT program found by gettext.m4; reject old versions
++dnl of GNU msgfmt that do not support the "msgid_plural" extension.
++AC_DEFUN([AC_PROG_GMSGFMT_PLURAL],
++ [dnl AC_REQUIRE(AM_GNU_GETTEXT)
++
++ if test "$GMSGFMT" != ":"; then
++ AC_MSG_CHECKING([for plural forms in GNU msgfmt])
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ changequote(,)dnl We use [ and ] in in .po test input
+
+-# serial 6
++ dnl If the GNU msgfmt does not accept msgid_plural we define it
++ dnl as : so that the Makefiles still can work.
++ cat >conftest.po <<_ACEOF
++msgid "channel"
++msgid_plural "channels"
++msgstr[0] "canal"
++msgstr[1] "canal"
+
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
+-if $2; then
+- $1_TRUE=
+- $1_FALSE='#'
++_ACEOF
++ changequote([,])dnl
++
++ if $GMSGFMT -o /dev/null conftest.po >/dev/null 2>&1; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ AC_MSG_RESULT(
++ [found GNU msgfmt program is too old, it does not support plural forms; ignore it])
++ GMSGFMT=":"
++ fi
++ rm -f conftest.po
++ fi
++])dnl AC_PROG_GMSGFMT_PLURAL
++
++
++# AC_PROG_LIBTOOL_SANITYCHECK
++# ----------------------
++# Default configuration of libtool on solaris produces non-working
++# plugin modules, when gcc is used as compiler, and gcc does not
++# use gnu-ld
++AC_DEFUN([AC_PROG_LIBTOOL_SANITYCHECK],
++ [dnl AC_REQUIRE(AC_PROG_CC)
++ dnl AC_REQUIRE(AC_PROG_LD)
++ dnl AC_REQUIRE(AC_PROG_LIBTOOL)
++
++ case $host in
++ *-*-solaris*)
++ if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
++ AC_MSG_CHECKING([if libtool can build working modules])
++ cat > conftest1.c <<_ACEOF
++#undef NDEBUG
++#include <assert.h>
++int shlib_func(long long a, long long b) {
++ assert(b);
++ switch (a&3) {
++ case 0: return a/b;
++ case 1: return a%b;
++ case 2: return (unsigned long long)a/b;
++ case 3: return (unsigned long long)a%b;
++ }
++}
++_ACEOF
++
++ cat > conftest2.c <<_ACEOF
++#include <dlfcn.h>
++int main(){
++ void *dl = dlopen(".libs/libconftest.so", RTLD_NOW);
++ if (!dl) printf("%s\n", dlerror());
++ exit(dl ? 0 : 1);
++}
++_ACEOF
++
++ if ./libtool $CC -c conftest1.c >/dev/null 2>&1 && \
++ ./libtool $CC -o libconftest.la conftest1.lo \
++ -module -avoid-version -rpath /tmp >/dev/null 2>&1 && \
++ ./libtool $CC -o conftest2 conftest2.c -ldl >/dev/null 2>&1
++ then
++ if ./conftest2 >/dev/null 2>&1; then
++ AC_MSG_RESULT(yes)
++ else
++ dnl typical problem: dlopen'ed module not self contained, because
++ dnl it wasn't linked with -lgcc
++ AC_MSG_RESULT(no)
++ if grep '^archive_cmds=.*$LD -G' libtool >/dev/null; then
++ AC_MSG_CHECKING([if libtool can be fixed])
++
++ dnl first try to update gcc2's spec file to add the
++ dnl gcc3 -mimpure-text flag
++
++ libtool_specs=""
++
++ if $CC -dumpspecs | grep -- '-G -dy -z text' >/dev/null; then
++ $CC -dumpspecs | \
++ sed 's/-G -dy -z text/-G -dy %{!mimpure-text:-z text}/g' \
++ > gcc-libtool-specs
++ libtool_specs=" -specs=`pwd`/gcc-libtool-specs"
++ fi
++
++ sed -e "s,\$LD -G,\$CC${libtool_specs} -shared -mimpure-text,g" \
++ -e 's/ -M / -Wl,-M,/' libtool >libtool-fixed
++ chmod +x libtool-fixed
++ if ./libtool-fixed $CC -o libconftest.la conftest1.lo \
++ -module -avoid-version -rpath /tmp >/dev/null 2>&1 && \
++ ./conftest2 >/dev/null 2>&1; then
++
++ dnl the fixed libtool works
++ AC_MSG_RESULT(yes)
++ mv -f libtool-fixed libtool
++
++ else
++ AC_MSG_RESULT(no)
++ fi
++ fi
++ fi
++ else
++ AC_MSG_RESULT(no)
++ fi
++ rm -f conftest1.c conftest1.lo conftest1.o conftest2.c \
++ libconftest.la conftest libtool-fixed
++ rm -rf .libs
++ fi ;;
++ esac
++])# AC_PROG_LIBTOOL_SANITYCHECK
++
++dnl Check for the type of the third argument of getsockname
++AC_DEFUN([AC_CHECK_SOCKLEN_T], [
++ AC_MSG_CHECKING(for socklen_t)
++ AC_LANG_PUSH(C++)
++
++ AC_CACHE_VAL(ac_cv_socklen_t, [
++ AC_TRY_COMPILE(
++#include <sys/types.h>
++#include <sys/socket.h>
++ ,
++socklen_t a=0;
++getsockname(0,(struct sockaddr*)0, &a);
++ ,
++ ac_cv_socklen_t=socklen_t,
++ [
++ AC_TRY_COMPILE(
++#include <sys/types.h>
++#include <sys/socket.h>
++ ,
++int a=0;
++getsockname(0,(struct sockaddr*)0, &a);
++ ,
++ ac_cv_socklen_t=int,
++ ac_cv_socklen_t=size_t
++ )]
++ )
++ ])
++ AC_LANG_POP([C++])
++
++ AC_MSG_RESULT($ac_cv_socklen_t)
++ if test "$ac_cv_socklen_t" != "socklen_t"; then
++ AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
++ [Define the real type of socklen_t])
++ fi
++])
++
++# Macro to add for using GNU gettext.
++# Ulrich Drepper <drepper@cygnus.com>, 1995.
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU General Public
++# License but which still want to provide support for the GNU gettext
++# functionality.
++# Please note that the actual code of GNU gettext is covered by the GNU
++# General Public License and is *not* in the public domain.
++
++# serial 10
++
++dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
++dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
++dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
++dnl depending on --{enable,disable}-{shared,static} and on the presence of
++dnl AM-DISABLE-SHARED). Otherwise, a static library
++dnl $(top_builddir)/intl/libintl.a will be created.
++dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
++dnl implementations (in libc or libintl) without the ngettext() function
++dnl will be ignored.
++dnl LIBDIR is used to find the intl libraries. If empty,
++dnl the value `$(top_builddir)/intl/' is used.
++dnl
++dnl The result of the configuration is one of three cases:
++dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
++dnl and used.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 2) GNU gettext has been found in the system's C library.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 3) No internationalization, always use English msgid.
++dnl Catalog format: none
++dnl Catalog extension: none
++dnl The use of .gmo is historical (it was needed to avoid overwriting the
++dnl GNU format catalogs when building on a platform with an X/Open gettext),
++dnl but we keep it in order not to force irrelevant filename changes on the
++dnl maintainers.
++dnl
++AC_DEFUN([AM_WITH_NLS],
++ [AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ AC_HELP_STRING([--disable-nls], [do not use Native Language Support]),
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
++
++ BUILD_INCLUDED_LIBINTL=no
++ USE_INCLUDED_LIBINTL=no
++ INTLLIBS=
++
++ dnl If we use NLS figure out what method
++ if test "$USE_NLS" = "yes"; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [Define to 1 if translation of program messages to the user's native language
++ is requested.])
++ AC_MSG_CHECKING([whether included gettext is requested])
++ AC_ARG_WITH(included-gettext,
++ AC_HELP_STRING([--with-included-gettext], [use the GNU gettext library included here]),
++ nls_cv_force_use_gnu_gettext=$withval,
++ nls_cv_force_use_gnu_gettext=no)
++ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++
++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
++ dnl User does not insist on using GNU NLS library. Figure out what
++ dnl to use. If GNU gettext is available we use this. Else we have
++ dnl to fall back to GNU NLS library.
++ CATOBJEXT=NONE
++
++ dnl Add a version number to the cache macros.
++ define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
++ define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
++
++ AC_CHECK_HEADERS(libintl.h,
++ [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
++ [AC_TRY_LINK([#include <libintl.h>
++extern int _nl_msg_cat_cntr;],
++ [bindtextdomain ("", "");
++return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
++ gt_cv_func_gnugettext_libc=yes,
++ gt_cv_func_gnugettext_libc=no)])
++
++ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
++ AC_CACHE_CHECK([for GNU gettext in libintl],
++ gt_cv_func_gnugettext_libintl,
++ [gt_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $LIBICONV"
++ AC_TRY_LINK([#include <libintl.h>
++extern int _nl_msg_cat_cntr;],
++ [bindtextdomain ("", "");
++return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
++ gt_cv_func_gnugettext_libintl=yes,
++ gt_cv_func_gnugettext_libintl=no)
++ LIBS="$gt_save_LIBS"])
++ fi
++
++ dnl If an already present or preinstalled GNU gettext() is found,
++ dnl use it. But if this macro is used in GNU gettext, and GNU
++ dnl gettext is already preinstalled in libintl, we update this
++ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
++ if test "$gt_cv_func_gnugettext_libc" = "yes" \
++ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
++ && test "$PACKAGE" != gettext; }; then
++ AC_DEFINE(HAVE_GETTEXT, 1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++
++ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
++ dnl If iconv() is in a separate libiconv library, then anyone
++ dnl linking with libintl{.a,.so} also needs to link with
++ dnl libiconv.
++ INTLLIBS="-lintl $LIBICONV"
++ fi
++
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ AC_CHECK_FUNCS(dcgettext)
++ LIBS="$gt_save_LIBS"
++
++ dnl Search for GNU msgfmt in the PATH.
++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++
++ dnl Search for GNU xgettext in the PATH.
++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
++
++ CATOBJEXT=.gmo
++ fi
++ ])
++
++ if test "$CATOBJEXT" = "NONE"; then
++ dnl GNU gettext is not found in the C library.
++ dnl Fall back on GNU gettext library.
++ nls_cv_use_gnu_gettext=yes
++ fi
++ fi
++
++ if test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions used to generate GNU NLS library.
++ INTLOBJS="\$(GETTOBJS)"
++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
++ AC_SUBST(MSGFMT)
++ BUILD_INCLUDED_LIBINTL=yes
++ USE_INCLUDED_LIBINTL=yes
++ CATOBJEXT=.gmo
++ INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
++ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
++ fi
++
++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
++ dnl Test whether we really found GNU msgfmt.
++ if test "$GMSGFMT" != ":"; then
++ dnl If it is no GNU msgfmt we define it as : so that the
++ dnl Makefiles still can work.
++ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found msgfmt program is not GNU msgfmt; ignore it])
++ GMSGFMT=":"
++ fi
++ fi
++
++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is no GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
++
++ dnl We need to process the po/ directory.
++ POSUB=po
++ fi
++ AC_OUTPUT_COMMANDS(
++ [for ac_file in $CONFIG_FILES; do
++ # Support "outfile[:infile[:infile...]]"
++ case "$ac_file" in
++ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++ esac
++ # PO directories have a Makefile.in generated from Makefile.in.in.
++ case "$ac_file" in */Makefile.in)
++ # Adjust a relative srcdir.
++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
++ # In autoconf-2.13 it is called $ac_given_srcdir.
++ # In autoconf-2.50 it is called $srcdir.
++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
++ case "$ac_given_srcdir" in
++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
++ /*) top_srcdir="$ac_given_srcdir" ;;
++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
++ esac
++ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
++ rm -f "$ac_dir/POTFILES"
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
++ sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
++ sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
++ fi
++ ;;
++ esac
++ done])
++
++
++ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
++ dnl to 'yes' because some of the testsuite requires it.
++ if test "$PACKAGE" = gettext; then
++ BUILD_INCLUDED_LIBINTL=yes
++ fi
++
++ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
++ dnl because plural.y uses bison specific features. It requires at least
++ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
++ dnl compile.
++ dnl bison is only needed for the maintainer (who touches plural.y). But in
++ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
++ dnl the rule in general Makefile. Now, some people carelessly touch the
++ dnl files or have a broken "make" program, hence the plural.c rule will
++ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
++ dnl present or too old.
++ AC_CHECK_PROGS([INTLBISON], [bison])
++ if test -z "$INTLBISON"; then
++ ac_verc_fail=yes
++ else
++ dnl Found it, now check the version.
++ AC_MSG_CHECKING([version of bison])
++changequote(<<,>>)dnl
++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
++ case $ac_prog_version in
++ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
++ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
++changequote([,])dnl
++ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
++ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
++ esac
++ AC_MSG_RESULT([$ac_prog_version])
++ fi
++ if test $ac_verc_fail = yes; then
++ INTLBISON=:
++ fi
++
++ dnl These rules are solely for the distribution goal. While doing this
++ dnl we only have to keep exactly one list of the available catalogs
++ dnl in configure.in.
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
++
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST(BUILD_INCLUDED_LIBINTL)
++ AC_SUBST(USE_INCLUDED_LIBINTL)
++ AC_SUBST(CATALOGS)
++ AC_SUBST(CATOBJEXT)
++ AC_SUBST(GMOFILES)
++ AC_SUBST(INTLLIBS)
++ AC_SUBST(INTLOBJS)
++ AC_SUBST(POFILES)
++ AC_SUBST(POSUB)
++
++ dnl For backward compatibility. Some configure.ins may be using this.
++ nls_cv_header_intl=
++ nls_cv_header_libgt=
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ DATADIRNAME=share
++ AC_SUBST(DATADIRNAME)
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INSTOBJEXT=.mo
++ AC_SUBST(INSTOBJEXT)
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ GENCAT=gencat
++ AC_SUBST(GENCAT)
++ ])
++
++dnl Usage: Just like AM_WITH_NLS, which see.
++AC_DEFUN([AM_GNU_GETTEXT],
++ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ AC_REQUIRE([AC_PROG_RANLIB])dnl
++ AC_REQUIRE([AC_ISC_POSIX])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++ AC_REQUIRE([AC_C_CONST])dnl
++ AC_REQUIRE([AC_C_INLINE])dnl
++ AC_REQUIRE([AC_TYPE_OFF_T])dnl
++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
++ AC_REQUIRE([AC_FUNC_MMAP])dnl
++ AC_REQUIRE([jm_GLIBC21])dnl
++
++ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
++stdlib.h string.h unistd.h sys/param.h])
++ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
++getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
++strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
++
++ AM_ICONV
++ AM_LANGINFO_CODESET
++ AM_LC_MESSAGES
++ AM_WITH_NLS([$1],[$2],[$3])
++
++ if test "x$CATOBJEXT" != "x"; then
++ if test "x$ALL_LINGUAS" = "x"; then
++ LINGUAS=
++ else
++ AC_MSG_CHECKING(for catalogs to be installed)
++ NEW_LINGUAS=
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++ fi
++ done
++ LINGUAS=$NEW_LINGUAS
++ AC_MSG_RESULT($LINGUAS)
++ fi
++
++ dnl Construct list of names of catalog files to be constructed.
++ if test -n "$LINGUAS"; then
++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++ fi
++ fi
++
++ dnl Enable libtool support if the surrounding package wishes it.
++ INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
++ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ ])
++
++# Search path for a program which passes the given test.
++# Ulrich Drepper <drepper@cygnus.com>, 1996.
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU General Public
++# License but which still want to provide support for the GNU gettext
++# functionality.
++# Please note that the actual code of GNU gettext is covered by the GNU
++# General Public License and is *not* in the public domain.
++
++# serial 2
++
++dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++AC_DEFUN([AM_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$]$1)
+ else
+- $1_TRUE='#'
+- $1_FALSE=
++ AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+- AC_MSG_ERROR([[conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.]])
+-fi])])
++AC_SUBST($1)dnl
++])
+
+-# serial 7 -*- Autoconf -*-
++#serial 2
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Test for the GNU C Library, version 2.1 or newer.
++# From Bruno Haible.
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++AC_DEFUN([jm_GLIBC21],
++ [
++ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
++ ac_cv_gnu_library_2_1,
++ [AC_EGREP_CPP([Lucky GNU user],
++ [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
++ Lucky GNU user
++ #endif
++#endif
++ ],
++ ac_cv_gnu_library_2_1=yes,
++ ac_cv_gnu_library_2_1=no)
++ ]
++ )
++ AC_SUBST(GLIBC21)
++ GLIBC21="$ac_cv_gnu_library_2_1"
++ ]
++)
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++#serial AM2
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl From Bruno Haible.
+
++AC_DEFUN([AM_ICONV],
++[
++ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
++ dnl those with the standalone portable GNU libiconv installed).
+
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++ AC_ARG_WITH([libiconv-prefix],
++ AC_HELP_STRING([--with-libiconv-prefix=DIR], [search for libiconv in DIR/include and DIR/lib]), [
++ for dir in `echo "$withval" | tr : ' '`; do
++ if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
++ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
++ done
++ ])
+
++ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
++ am_cv_func_iconv="no, consider installing GNU libiconv"
++ am_cv_lib_iconv=no
++ AC_TRY_LINK([#include <stdlib.h>
++#include <iconv.h>],
++ [iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);],
++ am_cv_func_iconv=yes)
++ if test "$am_cv_func_iconv" != yes; then
++ am_save_LIBS="$LIBS"
++ LIBS="$LIBS -liconv"
++ AC_TRY_LINK([#include <stdlib.h>
++#include <iconv.h>],
++ [iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);],
++ am_cv_lib_iconv=yes
++ am_cv_func_iconv=yes)
++ LIBS="$am_save_LIBS"
++ fi
++ ])
++ if test "$am_cv_func_iconv" = yes; then
++ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
++ AC_MSG_CHECKING([for iconv declaration])
++ AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_TRY_COMPILE([
++#include <stdlib.h>
++#include <iconv.h>
++extern
++#ifdef __cplusplus
++"C"
++#endif
++#if defined(__STDC__) || defined(__cplusplus)
++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
++#else
++size_t iconv();
++#endif
++], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
++ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
++ AC_MSG_RESULT([$]{ac_t:-
++ }[$]am_cv_proto_iconv)
++ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ [Define as const if the declaration of iconv() needs const.])
++ fi
++ LIBICONV=
++ if test "$am_cv_lib_iconv" = yes; then
++ LIBICONV="-liconv"
++ fi
++ AC_SUBST(LIBICONV)
++])
+
++#serial AM1
+
+-# _AM_DEPENDENCIES(NAME)
+-# ----------------------
+-# See how the compiler implements dependency checking.
+-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+-# We try a few techniques and use that to set a single cache variable.
++dnl From Bruno Haible.
++
++AC_DEFUN([AM_LANGINFO_CODESET],
++[
++ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
++ [AC_TRY_LINK([#include <langinfo.h>],
++ [char* cs = nl_langinfo(CODESET);],
++ am_cv_langinfo_codeset=yes,
++ am_cv_langinfo_codeset=no)
++ ])
++ if test $am_cv_langinfo_codeset = yes; then
++ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
++ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
++ fi
++])
++
++# Check whether LC_MESSAGES is available in <locale.h>.
++# Ulrich Drepper <drepper@cygnus.com>, 1995.
+ #
+-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+-# dependency, and given that the user is not expected to run this macro,
+-# just rely on AC_PROG_CC.
+-AC_DEFUN([_AM_DEPENDENCIES],
+-[AC_REQUIRE([AM_SET_DEPDIR])dnl
+-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+-AC_REQUIRE([AM_DEP_TRACK])dnl
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU General Public
++# License but which still want to provide support for the GNU gettext
++# functionality.
++# Please note that the actual code of GNU gettext is covered by the GNU
++# General Public License and is *not* in the public domain.
+
+-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+- [$1], CXX, [depcc="$CXX" am_compiler_list=],
+- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+- [depcc="$$1" am_compiler_list=])
++# serial 2
+
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
++AC_DEFUN([AM_LC_MESSAGES],
++ [if test $ac_cv_header_locale_h = yes; then
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ [Define if your <locale.h> file defines LC_MESSAGES.])
++ fi
++ fi])
+
+- am_cv_$1_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++dnl
++dnl Check for dlopen symbol and set DYNAMIC_LD_LIBS.
++dnl
++dnl AM_DL()
++dnl
++
++AC_DEFUN([AM_DL], [
++ AC_CHECK_LIB(c, dlopen,
++ [DYNAMIC_LD_LIBS=""
++ have_dl=yes])
++
++ if test x$have_dl != "xyes"; then
++ AC_CHECK_LIB(dl, dlopen,
++ [DYNAMIC_LD_LIBS="-ldl"
++ have_dl=yes])
+ fi
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- case $depmode in
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
++ if test x$have_dl != "xyes"; then
++ AC_MSG_CHECKING(for dlopen under win32)
++ AC_LANG_SAVE()
++ AC_LANG_C()
++
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ ac_save_LIBS="$LIBS"
++ CPPFLAGS="-I${srcdir}/win32/include $CPPFLAGS"
++ LIBS="$LIBS -lkernel32"
++ AC_COMPILE_IFELSE([
++#include <stddef.h>
++#include <dlfcn.h>
++
++int main() {
++ dlopen(NULL, 0);
++ return 0;
++}
++],
++ [DYNAMIC_LD_LIBS=-lkernel32
++ have_dl=yes
++ AC_MSG_RESULT(yes)],
++ AC_MSG_RESULT(no)
++ )
++
++ CPPFLAGS=$ac_save_CPPFLAGS
++ LIBS=$ac_save_LIBS
++
++ AC_LANG_RESTORE()
++ fi
++
++ if test x$have_dl != "xyes"; then
++ AC_MSG_ERROR(dynamic linker needed)
++ fi
++
++ AC_SUBST(DYNAMIC_LD_LIBS)
++
++])
++
++dnl
++dnl autoconf script for searching and checking ffmpeg
++dnl
++dnl written by Frantisek Dvorak <valtri@users.sourceforge.net>
++dnl
++dnl
++dnl AM_PATH_FFMPEG([ACTION IF FOUND [, ACTION IF NOT FOUND]]))
++dnl
++dnl It looks for ffmpeg, defines FFMPEG_CPPFLAGS and FFMPEG_LIBS.
++dnl
++AC_DEFUN([AM_PATH_FFMPEG], [
++
++AC_ARG_WITH(external-ffmpeg, AC_HELP_STRING([--with-external-ffmpeg@<:@=DIR@:>@], [use external ffmpeg library]),
++ [external_ffmpeg="$withval"],
++ [external_ffmpeg="no"]
++)
++
++if test x"$external_ffmpeg" != "xno"; then
++
++ dnl get the prefix, if specified
++ if test x"$external_ffmpeg" != "xyes"; then
++ ffmpeg_prefix="$withval"
++ fi
++
++ dnl disable test if requested
++ AC_ARG_ENABLE(ffmpegtest,
++ AC_HELP_STRING([--disable-ffmpegtest],
++ [Do not try compile and run a test ffmpeg program. It will need specify custom FFMPEG_CPPFLAGS and FFMPEG_LIBS environment variables.]
++ ),
++ enable_ffmpegtest="$enableval",
++ enable_ffmpegtest=yes
++ )
++
++ if test x"$enable_ffmpegtest" = "xyes"; then
++ ac_save_LDFLAGS="${LDFLAGS}"
++ ac_save_CPPFLAGS="${CPPFLAGS}"
++ external_ffmpeg_found=no
++
++ dnl look for the ffmpeg or just check specified flags
++ if test x"$FFMPEG_CPPFLAGS" = "x" -a x"$FFMPEG_LIBS" = "x"; then
++ dnl look for ffmpeg
++ if test x"$ffmpeg_prefix" = "x"; then
++ prefixes="/usr /usr/local /opt"
+ else
+- break
++ prefixes="$ffmpeg_prefix"
+ fi
+- ;;
+- none) break ;;
+- esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+- if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_$1_dependencies_compiler_type=$depmode
+- break
++ for dir in $prefixes; do
++ FFMPEG_CPPFLAGS="-I${dir}/include/ffmpeg -I${dir}/include/postproc"
++ FFMPEG_LIBS="-L${dir}/lib"
++ CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
++ LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
++
++ dnl drop the cache
++ for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
++ "ac_cv_lib_avcodec_pp_get_context" \
++ "ac_cv_lib_postproc_pp_get_context" \
++ "ac_cv_lib_avcodec_register_avcodec"; do
++ $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
++ done
++
++ dnl look for headers
++ AC_CHECK_HEADER(avcodec.h, , continue)
++ AC_CHECK_HEADER(postprocess.h, , continue)
++
++ dnl look for libpostproc inside libavcodec
++ AC_CHECK_LIB(avcodec, pp_get_context,
++ [external_ffmpeg_found=yes
++ FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec"
++ break],
++ ,
++ []
++ )
++
++ dnl look for shared libpostproc and avcodec
++ AC_CHECK_LIB(postproc, pp_get_context,
++ AC_CHECK_LIB(avcodec, register_avcodec,
++ [external_ffmpeg_found=yes
++ FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lpostproc"
++ break]
++ ),,
++ [-lavcodec]
++ )
++ done
++
++ dnl result of autodetection
++ if test x"$external_ffmpeg_found" = "xyes"; then
++ AC_MSG_RESULT([External ffmpeg library was found in ${dir}.])
++ else
++ AC_MSG_ERROR([External ffmpeg library not found.
++*********************************************************************
++You can try to specify prefix of ffmpeg library by the option
++--with-external-ffmpeg=prefix, or to specify custom FFMPEG_CPPFLAGS
++and FFMPEG_LIBS.
++
++If you would like to use the internal ffmpeg, please remove the
++configure option --with-external-ffmpeg.
++*********************************************************************])
++ fi
++ else
++ dnl check specified flags
++ CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
++ LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
++ AC_LINK_IFELSE([#include <avcodec.h>
++#include <postprocess.h>
++
++int main() {
++ register_avcodec((void *)0);
++ pp_get_context(0, 0, 0);
++}
++],
++ [external_ffmpeg_found=yes],
++ [external_ffmpeg_found=no],
++ )
++
++ dnl result
++ if test x"$external_ffmpeg_found" = "xyes"; then
++ AC_MSG_RESULT([Using custom FFMPEG_CPPFLAGS and FFMPEG_LIBS for external ffmpeg.])
++ else
++ AC_MSG_ERROR([External ffmpeg library not found with specified options.
++*********************************************************************
++You can try to specify prefix of ffmpeg library by the option
++--with-external-ffmpeg=prefix, or to specify different
++FFMPEG_CPPFLAGS and FFMPEG_LIBS.
++
++If you would like to use the internal ffmpeg, please remove the
++configure option --with-external-ffmpeg.
++*********************************************************************])
+ fi
+ fi
+- done
++ CPPFLAGS="${ac_save_CPPFLAGS}"
++ LDFLAGS="${ac_save_LDFLAGS}"
++ else
++ if test x"${FFMPEG_CPPFLAGS}" = "x" -a x"${FFMPEG_LIBS}" = "x"; then
++ external_ffmpeg_found=no
++ AC_MSG_ERROR([You should specify FFMPEG_CPPFLAGS and FFMPEG_LIBS.])
++ else
++ external_ffmpeg_found=yes
++ AC_MSG_RESULT([Forced using custom FFMPEG_CPPFLAGS and FFMPEG_LIBS.])
++ fi
++ fi
+
+- cd ..
+- rm -rf conftest.dir
++
++ dnl result
++ if test x"$external_ffmpeg_found" = "xyes"; then
++ dnl common warning
++ AC_MSG_NOTICE([
++*********************************************************************
++xine is configured with external ffmpeg.
++
++This requires the same version of ffmpeg what is included in xine and
++you should know what you do. If some problems occur, please try to
++use internal ffmpeg.
++*********************************************************************])
++ ifelse([$1], , :, [$1])
++ else
++ ifelse([$2], , :, [$2])
++ fi
++
++ AC_SUBST(FFMPEG_CPPFLAGS)
++ AC_SUBST(FFMPEG_LIBS)
++
+ else
+- am_cv_$1_dependencies_compiler_type=none
++ AC_MSG_RESULT([using included ffmpeg])
+ fi
++
+ ])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++
++dnl
++dnl Check for OpenGL & [Glut | GLU]
++dnl
++dnl AM_PATH_OPENGL([ACTION IF FOUND [, ACTION IF NOT FOUND]])
++dnl
++
++AC_DEFUN([AM_PATH_OPENGL], [
++
++ AC_ARG_ENABLE(opengl, AC_HELP_STRING([--disable-opengl], [do not build OpenGL plugin]),
++ [enableopengl=$enableval],
++ [enableopengl="yes"]
++ )
++
++ if test x$enableopengl = "xyes"; then
++ AC_CHECK_LIB(GL, glBegin,
++ [AC_CHECK_HEADER(GL/gl.h,
++ [ac_have_opengl="yes"
++ OPENGL_LIBS="-lGL"
++ dnl check for glut
++ AC_CHECK_LIB(glut, glutInit,
++ [ac_have_glut="yes"
++ GLUT_LIBS="-lglut"
++ AC_DEFINE(HAVE_GLUT,1,[Define this if you have GLut support available])
++ AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
++ ],
++ [ac_have_glut="no"
++ dnl fallback, check for GLU
++ AC_CHECK_LIB(GLU, gluPerspective,
++ [ac_have_glu="yes"
++ GLU_LIBS="-lGLU -lm"
++ AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available])
++ AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available])
++ ],
++ [ac_have_glu="no"],
++ [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS]
++ )
++ ],
++ [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS]
++ )
++ ]
++ )],
++ [],
++ [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]
++ )
++ if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then
++ ac_use_opengl=yes
++ fi
++ fi
++
++ AC_SUBST(OPENGL_CFLAGS)
++ AC_SUBST(OPENGL_LIBS)
++ AC_SUBST(GLUT_LIBS)
++ AC_SUBST(GLU_LIBS)
++ AM_CONDITIONAL(HAVE_OPENGL, [test x$ac_use_opengl = "xyes"])
++
++ dnl result
++ if test x$ac_use_opengl = "xyes"; then
++ ifelse([$1], , :, [$1])
++ else
++ ifelse([$2], , :, [$2])
++ fi
++
++])
++
++# AC_FIND_LIBXV_IMPL (LIB)
++# -------------------------
++#
++AC_DEFUN([AC_PATH_LIBXV_IMPL],
++[
++ AC_MSG_CHECKING([for $1])
++ if test -f "$xv_path/$1"; then
++ AC_MSG_RESULT([found $1 in $xv_path])
++ XV_LIB="$1"
++ else
++ AC_MSG_RESULT([$1 not found in $xv_path])
++ fi
+ ])
+
++AC_DEFUN([AC_TEST_LIBXV],
++[
++ dnl -----------------------------------------------
++ dnl Testing installed Xv library
++ dnl -----------------------------------------------
++ AC_CHECK_LIB(Xv, XvShmCreateImage,
++ [
++ AC_DEFINE(HAVE_XV,
++ 1,
++ [Define this if you have libXv installed])
+
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++ ac_have_xv="yes"
++ case x$XV_LIB in
++ x*.a)
++ AC_DEFINE(HAVE_XV_STATIC,
++ 1,
++ [Define this if you have libXv.a])
++ ac_have_xv_static="yes"
++ XV_LIB="$xv_path/$XV_LIB"
++ ;;
++ x*.so)
++ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
++ ;;
++ *)
++ AC_MSG_ERROR([sorry, I don't know about $XV_LIB])
++ ;;
++ esac
++ ],
++ ,
++ [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
++
++ dnl -----------------------------------------------
++ dnl xine_check use Xv functions API.
++ dnl -----------------------------------------------
++ if test x$ac_have_xv = "xyes"; then
++ EXTRA_X_LIBS="-L$xv_path $XV_LIB -lXext"
++ EXTRA_X_CFLAGS=""
++ fi
++ AC_SUBST(XV_LIB)
++ AC_SUBST(EXTRA_X_LIBS)
++ AC_SUBST(EXTRA_X_CFLAGS)
+ ])
+
++# AC_PATH_LIBXV
++# -------------------------
++#
++AC_DEFUN([AC_FIND_LIBXV],
++[
++ # Ensure that AC_PATH_XTRA is executed before this
++ AC_REQUIRE([AC_PATH_XTRA])
+
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++ # Set xv_path if its not done already
++ if test x$xv_path = x; then
++ xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
++ fi
++
++ if test "x$xv_prefer_shared" = "xyes"; then
++ AC_PATH_LIBXV_IMPL([libXv.so])
++ else
++ AC_PATH_LIBXV_IMPL([libXv.a])
++ fi
++
++ # Try the other lib if prefered failed
++ if test x$XV_LIB = x; then
++ if ! test "x$xv_prefer_shared" = "xyes"; then
++ AC_PATH_LIBXV_IMPL([libXv.so])
++ else
++ AC_PATH_LIBXV_IMPL([libXv.a])
++ fi
++ fi
++
++ if ! test x$XV_LIB = x; then
++ AC_TEST_LIBXV
++ fi
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++dnl Configure path and dependencies for aalib.
++dnl
++dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr>
++dnl
++dnl This program is free software; you can redistribute it and/or modify
++dnl it under the terms of the GNU General Public License as published by
++dnl the Free Software Foundation; either version 2 of the License, or
++dnl (at your option) any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++dnl GNU General Public License for more details.
++dnl
++dnl You should have received a copy of the GNU General Public License
++dnl along with this program; if not, write to the Free Software
++dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++dnl
++dnl
++dnl As a special exception to the GNU General Public License, if you
++dnl distribute this file as part of a program that contains a configuration
++dnl script generated by Autoconf, you may include it under the same
++dnl distribution terms that you use for the rest of that program.
++dnl
++dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND ]]])
++dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS, AALIB_STATIC_LIBS.
++dnl
++dnl ***********************
++dnl 26/09/2001
++dnl * fixed --disable-aalibtest.
++dnl 17/09/2001
++dnl * use both aalib-config, and *last chance* aainfo for guessing.
++dnl 19/08/2001
++dnl * use aalib-config instead of aainfo now.
++dnl 17/06/2001
++dnl * First shot
++dnl
++AC_DEFUN([AM_PATH_AALIB],
++[dnl
++dnl
++AC_ARG_WITH(aalib-prefix,
++ AC_HELP_STRING([--with-aalib-prefix=DIR], [prefix where AALIB is installed (optional)]),
++ aalib_config_prefix="$withval", aalib_config_prefix="")
++AC_ARG_WITH(aalib-exec-prefix,
++ AC_HELP_STRING([--with-aalib-exec-prefix=DIR], [exec prefix where AALIB is installed (optional)]),
++ aalib_config_exec_prefix="$withval", aalib_config_exec_prefix="")
++AC_ARG_ENABLE(aalibtest,
++ AC_HELP_STRING([--disable-aalibtest], [do not try to compile and run a test AALIB program]),
++ enable_aalibtest=$enableval, enable_aalibtest=yes)
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++ if test x$aalib_config_exec_prefix != x ; then
++ aalib_config_args="$aalib_config_args --exec-prefix=$aalib_config_exec_prefix"
++ if test x${AALIB_CONFIG+set} != xset ; then
++ AALIB_CONFIG=$aalib_config_exec_prefix/bin/aalib-config
++ fi
++ fi
++ if test x$aalib_config_prefix != x ; then
++ aalib_config_args="$aalib_config_args --prefix=$aalib_config_prefix"
++ if test x${AALIB_CONFIG+set} != xset ; then
++ AALIB_CONFIG=$aalib_config_prefix/bin/aalib-config
++ fi
++ fi
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ min_aalib_version=ifelse([$1], ,1.4,$1)
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test x"$enable_aalibtest" != "xyes"; then
++ AC_MSG_CHECKING([for AALIB version >= $min_aalib_version])
++ else
++ if test ! -x "$AALIB_CONFIG"; then
++ AALIB_CONFIG=""
++ fi
++ AC_PATH_PROG(AALIB_CONFIG, aalib-config, no)
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ if test "$AALIB_CONFIG" = "no" ; then
+
+-#serial 2
++dnl aalib-config is missing, check for old aainfo
+
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # So let's grep whole file.
+- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
++ AALIB_LIBS="$AALIB_LIBS -laa"
++ if test x$aalib_config_exec_prefix != x ; then
++ AALIB_CFLAGS="-I$aalib_config_exec_prefix/include"
++ AALIB_LIBS="-L$aalib_config_exec_prefix/lib -laa"
++ if test x${AAINFO+set} != xset ; then
++ AAINFO=$aalib_config_exec_prefix/bin/aainfo
++ fi
++ fi
++
++ if test x$aalib_config_prefix != x ; then
++ AALIB_CFLAGS="-I$aalib_config_prefix/include"
++ AALIB_LIBS="-L$aalib_config_prefix/lib -laa"
++ if test x${AAINFO+set} != xset ; then
++ AAINFO=$aalib_config_prefix/bin/aainfo
++ fi
++ fi
++
++ if test x"$aalib_config_prefix" = "x"; then
++ AC_PATH_PROG(AAINFO, aainfo, no)
++ else
++ AC_MSG_CHECKING(for $AAINFO)
++ if test -x $AAINFO; then
++ AC_MSG_RESULT(yes)
++ else
++ AAINFO="no"
++ AC_MSG_RESULT(no)
++ fi
++ fi
++
++ AC_MSG_CHECKING([for AALIB version >= $min_aalib_version])
++ no_aalib=""
++
++ if test x"$AAINFO" = "xno"; then
++ no_aalib=yes
++ else
++ aalib_drivers="`$AAINFO --help | grep drivers | sed -e 's/available//g;s/drivers//g;s/\://g'`"
++ for drv in $aalib_drivers; do
++ if test $drv = "X11" -a x$x11dep = "x"; then
++ AALIB_CFLAGS="$AALIB_CFLAGS `echo $X_CFLAGS|sed -e 's/\-I/\-L/g;s/include/lib/g'`"
++ x11dep="yes"
++ fi
++dnl if test $drv = "slang" -a x$slangdep = "x"; then
++dnl slangdep="yes"
++dnl fi
++dnl if test $drv = "gpm" -a x$gmpdep = "x"; then
++dnl gpmdep="yes"
++dnl fi
++ done
++
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$AALIB_CFLAGS $CFLAGS"
++ LIBS="$AALIB_LIBS $LIBS"
++
++dnl
++dnl Now check if the installed AALIB is sufficiently new. (Also sanity
++dnl checks the results of xine-config to some extent
++dnl
++ AC_LANG_SAVE()
++ AC_LANG_C()
++ rm -f conf.aalibtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <aalib.h>
++
++int main () {
++ int major, minor;
++ char *tmp_version;
++
++ system ("touch conf.aalibtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = (char *) strdup("$min_aalib_version");
++ if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
++ printf("%s, bad version string\n", "$min_aalib_version");
++ exit(1);
++ }
++
++ if ((AA_LIB_VERSION > major) || ((AA_LIB_VERSION == major) &&
++#ifdef AA_LIB_MINNOR
++ (AA_LIB_MINNOR >= minor)
++#else
++ (AA_LIB_MINOR >= minor)
++#endif
++ )) {
++ return 0;
++ }
++ else {
++#ifdef AA_LIB_MINNOR
++ printf("\n*** An old version of AALIB (%d.%d) was found.\n", AA_LIB_VERSION, AA_LIB_MINNOR);
++#else
++ printf("\n*** An old version of AALIB (%d.%d) was found.\n", AA_LIB_VERSION, AA_LIB_MINOR);
++#endif
++ printf("*** You need a version of AALIB newer than %d.%d. The latest version of\n", major, minor);
++ printf("*** AALIB is always available from:\n");
++ printf("*** http://www.ta.jcu.cz://aa\n");
++ printf("***\n");
++ }
++ return 1;
++}
++],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++
++ else
++ AC_MSG_CHECKING([for AALIB version >= $min_aalib_version])
++ no_aalib=""
++ AALIB_CFLAGS=`$AALIB_CONFIG $aalib_config_args --cflags`
++ AALIB_LIBS=`$AALIB_CONFIG $aalib_config_args --libs`
++ aalib_config_major_version=`$AALIB_CONFIG $aalib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ aalib_config_minor_version=`$AALIB_CONFIG $aalib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ aalib_config_sub_version=`$AALIB_CONFIG $aalib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $AALIB_CFLAGS"
++ LIBS="$AALIB_LIBS $LIBS"
++
++dnl
++dnl Now check if the installed AALIB is sufficiently new. (Also sanity
++dnl checks the results of aalib-config to some extent
++dnl
++ AC_LANG_SAVE()
++ AC_LANG_C()
++ rm -f conf.aalibtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <aalib.h>
++
++int main () {
++ int major, minor;
++ char *tmp_version;
++
++ system ("touch conf.aalibtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = (char *) strdup("$min_aalib_version");
++ if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
++ printf("%s, bad version string\n", "$min_aalib_version");
++ exit(1);
++ }
++
++ if ((AA_LIB_VERSION > major) || ((AA_LIB_VERSION == major) &&
++#ifdef AA_LIB_MINNOR
++ (AA_LIB_MINNOR >= minor)
++#else
++ (AA_LIB_MINOR >= minor)
++#endif
++ )) {
++ return 0;
++ }
++ else {
++#ifdef AA_LIB_MINNOR
++ printf("\n*** An old version of AALIB (%d.%d) was found.\n", AA_LIB_VERSION, AA_LIB_MINNOR);
++#else
++printf("\n*** An old version of AALIB (%d.%d) was found.\n", AA_LIB_VERSION, AA_LIB_MINOR);
++#endif
++ printf("*** You need a version of AALIB newer than %d.%d. The latest version of\n", major, minor);
++ printf("*** AALIB is always available from:\n");
++ printf("*** http://www.ta.jcu.cz://aa\n");
++ printf("***\n");
++ }
++ return 1;
++}
++],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi dnl AALIB_CONFIG
++
++ if test "x$no_aalib" = x; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
+ else
+- continue
++ AC_MSG_RESULT(no)
++ if test "$AALIB_CONFIG" = "no"; then
++ echo "*** The [aalib-config|aainfo] program installed by AALIB could not be found"
++ echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or use --with-aalib-prefix to set the prefix"
++ echo "*** where AALIB is installed."
++ else
++ if test -f conf.aalibtest ; then
++ :
++ else
++ echo "*** Could not run AALIB test program, checking why..."
++ CFLAGS="$CFLAGS $AALIB_CFLAGS"
++ LIBS="$LIBS $AALIB_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <aalib.h>
++], [
++ return ((AA_LIB_VERSION) ||
++#ifdef AA_LIB_MINNOR
++ (AA_LIB_MINNOR)
++#else
++ (AA_LIB_MINOR)
++#endif
++ ); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding AALIB or finding the wrong"
++ echo "*** version of AALIB. If it is not finding AALIB, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means AALIB was incorrectly installed"
++ echo "*** or that you have moved AALIB since it was installed." ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ AALIB_CFLAGS=""
++ AALIB_LIBS=""
++ ifelse([$3], , :, [$3])
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+-done
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++ AC_SUBST(AALIB_CFLAGS)
++ AC_SUBST(AALIB_LIBS)
++ AC_LANG_RESTORE()
++ rm -f conf.aalibtest
++])
+
++dnl Configure paths and dependencies for libcaca.
++dnl
++dnl Jeffrey S Smith <whydoubt@yahoo.com> 09-Dec-2003
++dnl based on aa.m4 as found in xinelib
++dnl
++dnl AM_PATH_CACA([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND ]]])
++dnl Test for CACA, and define CACA_CFLAGS, CACA_LIBS.
++dnl
++dnl ***********************
++dnl 09-Dec-2003
++dnl * new m4 for libcaca
++dnl
++AC_DEFUN([AM_PATH_CACA],
++[dnl
++dnl
++AC_ARG_WITH(caca-prefix,
++ AC_HELP_STRING([--with-caca-prefix=DIR], [prefix where CACA is installed (optional)]),
++ caca_config_prefix="$withval", caca_config_prefix="")
++AC_ARG_WITH(caca-exec-prefix,
++ AC_HELP_STRING([--with-caca-exec-prefix=DIR], [exec prefix where CACA is installed (optional)]),
++ caca_config_exec_prefix="$withval", caca_config_exec_prefix="")
++AC_ARG_ENABLE(cacatest,
++ AC_HELP_STRING([--disable-cacatest], [do not try to compile and run a test CACA program]),
++ enable_cacatest=$enableval, enable_cacatest=yes)
+
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++ if test x$caca_config_exec_prefix != x ; then
++ caca_config_args="$caca_config_args --exec-prefix=$caca_config_exec_prefix"
++ if test x${CACA_CONFIG+set} != xset ; then
++ CACA_CONFIG=$caca_config_exec_prefix/bin/caca-config
++ fi
++ fi
++ if test x$caca_config_prefix != x ; then
++ caca_config_args="$caca_config_args --prefix=$caca_config_prefix"
++ if test x${CACA_CONFIG+set} != xset ; then
++ CACA_CONFIG=$caca_config_prefix/bin/caca-config
++ fi
++ fi
++
++ min_caca_version=ifelse([$1], ,0.3,$1)
++
++ if test x"$enable_cacatest" != "xyes"; then
++ AC_MSG_CHECKING([for CACA version >= $min_caca_version])
++ else
++ if test ! -x "$CACA_CONFIG"; then
++ CACA_CONFIG=""
++ fi
++ AC_PATH_PROG(CACA_CONFIG, caca-config, no)
++
++ if test "$CACA_CONFIG" = "no" ; then
++dnl
++dnl caca-config is missing
++dnl
++ no_caca=yes
++ else
++ AC_MSG_CHECKING([for CACA version >= $min_caca_version])
++ no_caca=""
++ CACA_CFLAGS=`$CACA_CONFIG $caca_config_args --cflags`
++ CACA_LIBS=`$CACA_CONFIG $caca_config_args --plugin-libs`
++ caca_major_version=`$CACA_CONFIG $caca_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ caca_minor_version=`$CACA_CONFIG $caca_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $CACA_CFLAGS"
++ LIBS="$CACA_LIBS $LIBS"
++dnl
++dnl Now check if the installed CACA is sufficiently new. (Also sanity
++dnl checks the results of caca-config to some extent)
++dnl
++ AC_LANG_SAVE()
++ AC_LANG_C()
++ rm -f conf.cacatest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <caca.h>
++
++int main ()
++{
++ int major, minor;
++ char *tmp_version;
++
++ system("touch conf.cacatest");
++
++ tmp_version = (char *) strdup("$min_caca_version");
++ if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
++ printf("%s, bad version string\n", "$min_caca_version");
++ exit(1);
++ }
++
++ if (($caca_major_version > major) ||
++ (($caca_major_version == major) && ($caca_minor_version >= minor)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'caca-config --version' returned %d.%d, but the minimum version\n", $caca_major_version, $caca_minor_version);
++ printf("*** of CACA required is %d.%d. If caca-config is correct, then it is\n", major, minor);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If caca-config was wrong, set the environment variable CACA_CONFIG\n");
++ printf("*** to point to the correct copy of caca-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
++
++],, no_caca=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi dnl CACA_CONFIG
++
++ if test "x$no_caca" = x; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$CACA_CONFIG" = "no"; then
++ echo "*** The caca-config program installed by CACA could not be found"
++ echo "*** If CACA was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or use --with-caca-prefix to set the prefix"
++ echo "*** where CACA is installed."
++ else
++ if test -f conf.cacatest ; then
++ :
++ else
++ echo "*** Could not run CACA test program, checking why..."
++ CFLAGS="$CFLAGS $CACA_CFLAGS"
++ LIBS="$LIBS $CACA_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <caca.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding CACA or finding the wrong"
++ echo "*** version of CACA. If it is not finding CACA, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means CACA was incorrectly installed"
++ echo "*** or that you have moved CACA since it was installed." ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ CACA_CFLAGS=""
++ CACA_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(CACA_CFLAGS)
++ AC_SUBST(CACA_LIBS)
++ AC_LANG_RESTORE()
++ rm -f conf.cacatest
+ ])
+
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++# Small fix to avoid warnings from Daniel Caujolle-Bert
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl
++AC_DEFUN([AM_PATH_SDL],
++ [dnl
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ dnl Get the cflags and libraries from the sdl-config script
++ dnl
++ AC_ARG_WITH(sdl-prefix, AC_HELP_STRING([--with-sdl-prefix=DIR], [prefix where SDL is installed (optional)]),
++ sdl_prefix="$withval", sdl_prefix="")
++ AC_ARG_WITH(sdl-exec-prefix, AC_HELP_STRING([--with-sdl-exec-prefix=DIR], [exec prefix where SDL is installed (optional)]),
++ sdl_exec_prefix="$withval", sdl_exec_prefix="")
++ AC_ARG_ENABLE(sdltest, AC_HELP_STRING([--disable-sdltest], [do not try to compile and run a test SDL program]),
++ enable_sdltest=$enableval, enable_sdltest=yes)
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ if test x$sdl_exec_prefix != x ; then
++ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++ if test x${SDL_CONFIG+set} != xset ; then
++ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++ fi
++ fi
++ if test x$sdl_prefix != x ; then
++ sdl_args="$sdl_args --prefix=$sdl_prefix"
++ if test x${SDL_CONFIG+set} != xset ; then
++ SDL_CONFIG=$sdl_prefix/bin/sdl-config
++ fi
++ fi
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
++ min_sdl_version=ifelse([$1], ,0.11.0,$1)
++ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
++ no_sdl=""
++ if test "$SDL_CONFIG" = "no" ; then
++ no_sdl=yes
++ else
++ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
++ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_sdltest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $SDL_CFLAGS"
++ LIBS="$LIBS $SDL_LIBS"
++dnl
++dnl Now check if the installed SDL is sufficiently new. (Also sanity
++dnl checks the results of sdl-config to some extent
++dnl
++ rm -f conf.sdltest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "SDL.h"
+
+-# serial 7
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
+
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++int main (int argc, char *argv[])
++{
++ int major, minor, micro;
++ char *tmp_version;
+
+-# Do all the work for Automake. -*- Autoconf -*-
++ /* This hangs on some systems (?)
++ system ("touch conf.sdltest");
++ */
++ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_sdl_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_sdl_version");
++ exit(1);
++ }
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++ if (($sdl_major_version > major) ||
++ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
++ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
++ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
++ printf("*** to point to the correct copy of sdl-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_sdl" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$SDL_CONFIG" = "no" ; then
++ echo "*** The sdl-config script installed by SDL could not be found"
++ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the SDL_CONFIG environment variable to the"
++ echo "*** full path to sdl-config."
++ else
++ if test -f conf.sdltest ; then
++ :
++ else
++ echo "*** Could not run SDL test program, checking why..."
++ CFLAGS="$CFLAGS $SDL_CFLAGS"
++ LIBS="$LIBS $SDL_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include "SDL.h"
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++int main(int argc, char *argv[])
++{ return 0; }
++#undef main
++#define main K_and_R_C_main
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding SDL or finding the wrong"
++ echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means SDL was incorrectly installed"
++ echo "*** or that you have moved SDL since it was installed. In the latter case, you"
++ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ SDL_CFLAGS=""
++ SDL_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(SDL_CFLAGS)
++ AC_SUBST(SDL_LIBS)
++ rm -f conf.sdltest
++])
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl
++dnl autoconf script for DirectX
++dnl
++dnl written by Frantisek Dvorak <valtri@users.sourceforge.net>
++dnl
++dnl
++dnl AM_PATH_DIRECTX([ACTION IF FOUND [, ACTION IF NOT FOUND]]))
++dnl
++dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and
++dnl DIRECTX_VIDEO_LIBS.
++dnl
++AC_DEFUN([AM_PATH_DIRECTX], [
+
+-# serial 11
++AC_ARG_WITH(dxheaders, AC_HELP_STRING([--with-dxheaders], [specify location of DirectX headers]),
++ [dxheaders_prefix="$withval"],
++ [dxheaders_prefix="no"]
++)
+
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test x"$dxheaders_prefix" != "xno"; then
++ DIRECTX_CPPFLAGS="-I${dxheaders_prefix} ${DIRECTX_CPPFLAGS}"
+ fi
+
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
++AC_MSG_CHECKING(for DirectX)
++DIRECTX_VIDEO_LIBS="$DIRECTX_LIBS -lgdi32 -lddraw"
++DIRECTX_AUDIO_LIBS="$DIRECTX_LIBS -ldsound"
++AC_LANG_SAVE()
++AC_LANG_C()
++ac_save_CPPFLAGS="$CPPFLAGS"
++ac_save_LIBS="$LIBS"
++CPPFLAGS="$CPPFLAGS $DIRECTX_CPPFLAGS"
++LIBS="$LIBS $DIRECTX_VIDEO_LIBS $DIRECTX_AUDIO_LIBS"
++AC_COMPILE_IFELSE(
++ [
++#include <stddef.h>
++
++#include <windows.h>
++#include <ddraw.h>
++#include <dsound.h>
++
++int main() {
++ DirectDrawCreate(0, NULL, 0);
++ DirectsoundCreate(0, NULL, 0);
++
++ return 0;
++}
++ ],
++ [have_directx=yes
++ AC_DEFINE(HAVE_DIRECTX,1,[Define this if you have DirectX])],,)
++CPPFLAGS=$ac_save_CPPFLAGS
++LIBS=$ac_save_LIBS
++AC_LANG_RESTORE()
++
++if test x$have_directx = xyes ; then
++ AC_MSG_RESULT(yes)
++else
++ AC_MSG_RESULT(no)
++ AC_MSG_RESULT(*** All DirectX dependent parts will be disabled ***)
++fi
++
++AC_SUBST(DIRECTX_CPPFLAGS)
++AC_SUBST(DIRECTX_AUDIO_LIBS)
++AC_SUBST(DIRECTX_VIDEO_LIBS)
++AM_CONDITIONAL(HAVE_DIRECTX, test x$have_directx = "xyes")
++
++dnl result
++if test x"$have_directx" = "xyes"; then
++ ifelse([$1], , :, [$1])
++else
++ ifelse([$2], , :, [$2])
++fi
++
++])
++
++dnl AM_PATH_LIBFAME([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for libfame, and define LIBFAME_CFLAGS and LIBFAME_LIBS
++dnl Vivien Chappelier 12/11/00
++dnl stolen from ORBit autoconf
++dnl
++AC_DEFUN([AM_PATH_LIBFAME],
++[dnl
++dnl Get the cflags and libraries from the libfame-config script
++dnl
++AC_ARG_WITH(libfame-prefix, AC_HELP_STRING([--with-libfame-prefix=DIR], [prefix where libfame is installed (optional)]),
++ libfame_config_prefix="$withval", libfame_config_prefix="")
++AC_ARG_WITH(libfame-exec-prefix, AC_HELP_STRING([--with-libfame-exec-prefix=DIR], [exec prefix where libfame is installed (optional)]),
++ libfame_config_exec_prefix="$withval", libfame_config_exec_prefix="")
++AC_ARG_ENABLE(libfametest, AC_HELP_STRING([--disable-libfametest], [do not try to compile and run a test libfame program]),
++ enable_libfametest=$enableval, enable_libfametest=yes)
++
++ if test x$libfame_config_exec_prefix != x ; then
++ libfame_config_args="$libfame_config_args --exec-prefix=$libfame_config_exec_prefix"
++ if test x${LIBFAME_CONFIG+set} != xset ; then
++ LIBFAME_CONFIG=$libfame_config_exec_prefix/bin/libfame-config
++ fi
++ fi
++ if test x$libfame_config_prefix != x ; then
++ libfame_config_args="$libfame_config_args --prefix=$libfame_config_prefix"
++ if test x${LIBFAME_CONFIG+set} != xset ; then
++ LIBFAME_CONFIG=$libfame_config_prefix/bin/libfame-config
++ fi
++ fi
++
++ AC_PATH_PROG(LIBFAME_CONFIG, libfame-config, no)
++ min_libfame_version=ifelse([$1], , 0.9.0, $1)
++ AC_MSG_CHECKING(for libfame - version >= $min_libfame_version)
++ no_libfame=""
++ if test "$LIBFAME_CONFIG" = "no" ; then
++ no_libfame=yes
+ else
+- CYGPATH_W=echo
++ LIBFAME_CFLAGS=`$LIBFAME_CONFIG $libfame_config_args --cflags`
++ LIBFAME_LIBS=`$LIBFAME_CONFIG $libfame_config_args --libs`
++ libfame_config_major_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ libfame_config_minor_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ libfame_config_micro_version=`$LIBFAME_CONFIG $libfame_config_args --version | \
++ sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_libfametest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
++ LIBS="$LIBFAME_LIBS $LIBS"
++dnl
++dnl Now check if the installed LIBFAME is sufficiently new. (Also sanity
++dnl checks the results of libfame-config to some extent
++dnl
++ rm -f conf.libfametest
++ AC_TRY_RUN([
++#include <fame.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int
++main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.libfametest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = strdup("$min_libfame_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_libfame_version");
++ exit(1);
++ }
++
++ if ((libfame_major_version != $libfame_config_major_version) ||
++ (libfame_minor_version != $libfame_config_minor_version) ||
++ (libfame_micro_version != $libfame_config_micro_version))
++ {
++ printf("\n*** 'libfame-config --version' returned %d.%d.%d, but Libfame (%d.%d.%d)\n",
++ $libfame_config_major_version, $libfame_config_minor_version, $libfame_config_micro_version,
++ libfame_major_version, libfame_minor_version, libfame_micro_version);
++ printf ("*** was found! If libfame-config was correct, then it is best\n");
++ printf ("*** to remove the old version of libfame. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If libfame-config was wrong, set the environment variable LIBFAME_CONFIG\n");
++ printf("*** to point to the correct copy of libfame-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++#if defined (LIBFAME_MAJOR_VERSION) && defined (LIBFAME_MINOR_VERSION) && defined (LIBFAME_MICRO_VERSION)
++ else if ((libfame_major_version != LIBFAME_MAJOR_VERSION) ||
++ (libfame_minor_version != LIBFAME_MINOR_VERSION) ||
++ (libfame_micro_version != LIBFAME_MICRO_VERSION))
++ {
++ printf("*** libfame header files (version %d.%d.%d) do not match\n",
++ LIBFAME_MAJOR_VERSION, LIBFAME_MINOR_VERSION, LIBFAME_MICRO_VERSION);
++ printf("*** library (version %d.%d.%d)\n",
++ libfame_major_version, libfame_minor_version, libfame_micro_version);
++ }
++#endif /* defined (LIBFAME_MAJOR_VERSION) ... */
++ else
++ {
++ if ((libfame_major_version > major) ||
++ ((libfame_major_version == major) && (libfame_minor_version > minor)) ||
++ ((libfame_major_version == major) && (libfame_minor_version == minor) && (libfame_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** An old version of libfame (%d.%d.%d) was found.\n",
++ libfame_major_version, libfame_minor_version, libfame_micro_version);
++ printf("*** You need a version of libfame newer than %d.%d.%d. The latest version of\n",
++ major, minor, micro);
++ printf("*** libfame is always available from http://www-eleves.enst-bretagne.fr/~chappeli/fame\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the libfame-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of libfame, but you can also set the LIBFAME_CONFIG environment to point to the\n");
++ printf("*** correct copy of libfame-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++],, no_libfame=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_libfame" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$LIBFAME_CONFIG" = "no" ; then
++ echo "*** The libfame-config script installed by libfame could not be found"
++ echo "*** If libfame was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the LIBFAME_CONFIG environment variable to the"
++ echo "*** full path to libfame-config."
++ else
++ if test -f conf.libfametest ; then
++ :
++ else
++ echo "*** Could not run libfame test program, checking why..."
++ CFLAGS="$CFLAGS $LIBFAME_CFLAGS"
++ LIBS="$LIBS $LIBFAME_LIBS"
++ AC_TRY_LINK([
++#include <fame.h>
++#include <stdio.h>
++], [ return ((libfame_major_version) || (libfame_minor_version) || (libfame_micro_version)); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding libfame or finding the wrong"
++ echo "*** version of LIBFAME. If it is not finding libfame, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***" ],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means libfame was incorrectly installed"
++ echo "*** or that you have moved libfame since it was installed. In the latter case, you"
++ echo "*** may want to edit the libfame-config script: $LIBFAME_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ ifelse([$3], , :, [$3])
+ fi
+-fi
+-AC_SUBST([CYGPATH_W])
+
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++ AC_SUBST(LIBFAME_CFLAGS)
++ AC_SUBST(LIBFAME_LIBS)
++ rm -f conf.libfametest
++])
+
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++# Configure paths for libogg
++# Jack Moffitt <jack@icecast.org> 10-21-2000
++# Shamelessly stolen from Owen Taylor and Manish Singh
+
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
++dnl
++AC_DEFUN([AM_PATH_OGG],
++[dnl
++dnl Get the cflags and libraries
++dnl
++AC_ARG_WITH(ogg-prefix, AC_HELP_STRING([--with-ogg-prefix=DIR], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
++AC_ARG_ENABLE(oggtest, AC_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]), enable_oggtest=$enableval, enable_oggtest=yes)
++
++ if test x$ogg_prefix != x ; then
++ ogg_args="$ogg_args --prefix=$ogg_prefix"
++ OGG_CFLAGS="-I$ogg_prefix/include"
++ OGG_LIBS="-L$ogg_prefix/$XINE_LIBNAME"
++ fi
++
++ OGG_LIBS="$OGG_LIBS -logg"
++
++ AC_MSG_CHECKING(for Ogg)
++ no_ogg=""
++
++
++ if test "x$enable_oggtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $OGG_CFLAGS"
++ LIBS="$LIBS $OGG_LIBS"
++dnl
++dnl Now check if the installed Ogg is sufficiently new.
++dnl
++ rm -f conf.oggtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ogg/ogg.h>
++
++int main ()
++{
++ system("touch conf.oggtest");
++ return 0;
++}
++
++],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++
++ if test "x$no_ogg" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$1], , :, [$1])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.oggtest ; then
++ :
++ else
++ echo "*** Could not run Ogg test program, checking why..."
++ CFLAGS="$CFLAGS $OGG_CFLAGS"
++ LIBS="$LIBS $OGG_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <ogg/ogg.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding Ogg or finding the wrong"
++ echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
++ echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
++ echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ OGG_CFLAGS=""
++ OGG_LIBS=""
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(OGG_CFLAGS)
++ AC_SUBST(OGG_LIBS)
++ rm -f conf.oggtest
+ ])
++
++# Configure paths for libvorbis
++# Jack Moffitt <jack@icecast.org> 10-21-2000
++# Shamelessly stolen from Owen Taylor and Manish Singh
++
++dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
++dnl
++AC_DEFUN([AM_PATH_VORBIS],
++[dnl
++dnl Get the cflags and libraries
++dnl
++AC_ARG_WITH(vorbis-prefix, AC_HELP_STRING([--with-vorbis-prefix=DIR], [prefix where libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
++AC_ARG_ENABLE(vorbistest, AC_HELP_STRING([--disable-vorbistest], [do not try to compile and run a test Vorbis program]), enable_vorbistest=$enableval, enable_vorbistest=yes)
++
++ if test x$vorbis_prefix != x ; then
++ vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
++ VORBIS_CFLAGS="-I$vorbis_prefix/include"
++ VORBIS_LIBDIR="-L$vorbis_prefix/$XINE_LIBNAME"
++ fi
++
++ VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
++ VORBISFILE_LIBS="-lvorbisfile"
++ VORBISENC_LIBS="-lvorbisenc"
++
++ AC_MSG_CHECKING(for Vorbis)
++ no_vorbis=""
++
++
++ if test "x$enable_vorbistest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $VORBIS_CFLAGS"
++ LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
++dnl
++dnl Now check if the installed Vorbis is sufficiently new.
++dnl
++ rm -f conf.vorbistest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <vorbis/codec.h>
++
++int main ()
++{
++ system("touch conf.vorbistest");
++ return 0;
++}
++
++],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++
++ if test "x$no_vorbis" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$1], , :, [$1])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.vorbistest ; then
++ :
++ else
++ echo "*** Could not run Vorbis test program, checking why..."
++ CFLAGS="$CFLAGS $VORBIS_CFLAGS"
++ LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <vorbis/codec.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
++ echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
++ echo "*** or that you have moved Vorbis since it was installed." ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ VORBIS_CFLAGS=""
++ VORBIS_LIBS=""
++ VORBISFILE_LIBS=""
++ VORBISENC_LIBS=""
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(VORBIS_CFLAGS)
++ AC_SUBST(VORBIS_LIBS)
++ AC_SUBST(VORBISFILE_LIBS)
++ AC_SUBST(VORBISENC_LIBS)
++ rm -f conf.vorbistest
+ ])
+
++# Configure paths for libtheora
++# Andreas Heinchen <andreas.heinchen@gmx.de> 04-18-2003
++# Shamelessly adapted from Jack Moffitt's version for libvorbis
++# who had stolen it from Owen Taylor and Manish Singh
+
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
++dnl AM_PATH_THEORA([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl Test for libtheora, and define THEORA_CFLAGS and THEORA_LIBS
++dnl
++AC_DEFUN([AM_PATH_THEORA],
++[dnl
++dnl Get the cflags and libraries
++dnl
++AC_ARG_WITH(theora-prefix, AC_HELP_STRING([--with-theora-prefix=DIR], [prefix where libtheora is installed (optional)]), theora_prefix="$withval", theora_prefix="")
++AC_ARG_ENABLE(theoratest, AC_HELP_STRING([--disable-theoratest], [do not try to compile and run a test Vorbis program]), enable_theoratest=$enableval, enable_theoratest=yes)
+
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $1 | $1:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++ if test x$theora_prefix != x ; then
++ theora_args="$theora_args --prefix=$theora_prefix"
++ THEORA_CFLAGS="-I$theora_prefix/include"
++ THEORA_LIBDIR="-L$theora_prefix/$XINE_LIBNAME"
++ fi
+
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
++ THEORA_LIBS="$THEORA_LIBDIR -ltheora -lm"
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++ AC_MSG_CHECKING(for Theora)
++ no_theora=""
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test "x$enable_theoratest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $THEORA_CFLAGS"
++ LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
++dnl
++dnl Now check if the installed Theora is sufficiently new.
++dnl
++ rm -f conf.theoratest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <theora/theora.h>
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++int main ()
++{
++ system("touch conf.theoratest");
++ return 0;
++}
+
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
++],, no_theora=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++ if test "x$no_theora" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$1], , :, [$1])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.theoratest ; then
++ :
++ else
++ echo "*** Could not run Theora test program, checking why..."
++ CFLAGS="$CFLAGS $THEORA_CFLAGS"
++ LIBS="$LIBS $THEORA_LIBS $OGG_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <theora/theora.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding Theora or finding the wrong"
++ echo "*** version of Theora. If it is not finding Theora, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means Theora was incorrectly installed"
++ echo "*** or that you have moved Theora since it was installed." ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ THEORA_CFLAGS=""
++ THEORA_LIBS=""
++ THEORAFILE_LIBS=""
++ THEORAENC_LIBS=""
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(THEORA_CFLAGS)
++ AC_SUBST(THEORA_LIBS)
++ AC_SUBST(THEORAFILE_LIBS)
++ AC_SUBST(THEORAENC_LIBS)
++ rm -f conf.theoratest
++])
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
++dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
++dnl also defines GSTUFF_PKG_ERRORS on error
++AC_DEFUN([PKG_CHECK_MODULES], [
++ succeeded=no
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
+
+-# serial 1
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ AC_MSG_CHECKING(for $2)
+
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
++ if $PKG_CONFIG --exists "$2" ; then
++ AC_MSG_RESULT(yes)
++ succeeded=yes
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
++ AC_MSG_CHECKING($1_CFLAGS)
++ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
++ AC_MSG_RESULT($$1_CFLAGS)
+
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++ AC_MSG_CHECKING($1_LIBS)
++ $1_LIBS=`$PKG_CONFIG --libs "$2"`
++ AC_MSG_RESULT($$1_LIBS)
++ else
++ $1_CFLAGS=""
++ $1_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ ifelse([$4], ,echo $$1_PKG_ERRORS,)
++ fi
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ AC_SUBST($1_CFLAGS)
++ AC_SUBST($1_LIBS)
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test $succeeded = yes; then
++ ifelse([$3], , :, [$3])
++ else
++ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
++ fi
++])
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+
+-# serial 2
+
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
++# Configure paths for libspeex
++# Jack Moffitt <jack@icecast.org> 10-21-2000
++# Shamelessly stolen from Owen Taylor and Manish Singh
++
++dnl AM_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
++dnl
++AC_DEFUN([AM_PATH_SPEEX],
++[dnl
++dnl Get the cflags and libraries
++dnl
++AC_ARG_WITH(speex-prefix, AC_HELP_STRING([--with-speex-prefix=DIR], [prefix where libspeex is installed (optional)]), speex_prefix="$withval", speex_prefix="")
++AC_ARG_ENABLE(speextest, AC_HELP_STRING([--disable-speextest], [do not try to compile and run a test Speex program]), enable_speextest=$enableval, enable_speextest=yes)
++
++ if test x$speex_prefix != x ; then
++ speex_args="$speex_args --prefix=$speex_prefix"
++ SPEEX_CFLAGS="-I$speex_prefix/include"
++ SPEEX_LIBDIR="-L$speex_prefix/$XINE_LIBNAME"
++ fi
++
++ SPEEX_LIBS="$SPEEX_LIBDIR -lspeex -lm"
++
++ AC_MSG_CHECKING(for Speex)
++ no_speex=""
++
++
++ if test "x$enable_speextest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $SPEEX_CFLAGS"
++ LIBS="$LIBS $SPEEX_LIBS $OGG_LIBS"
++dnl
++dnl Now check if the installed Speex is sufficiently new.
++dnl
++ rm -f conf.speextest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <speex.h>
++
++int main ()
++{
++ system("touch conf.speextest");
++ return 0;
++}
++
++],, no_speex=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++
++ if test "x$no_speex" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$1], , :, [$1])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.speextest ; then
++ :
++ else
++ echo "*** Could not run Speex test program, checking why..."
++ CFLAGS="$CFLAGS $SPEEX_CFLAGS"
++ LIBS="$LIBS $SPEEX_LIBS $OGG_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <speex.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding Speex or finding the wrong"
++ echo "*** version of Speex. If it is not finding Speex, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means Speex was incorrectly installed"
++ echo "*** or that you have moved Speex since it was installed." ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ SPEEX_CFLAGS=""
++ SPEEX_LIBS=""
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(SPEEX_CFLAGS)
++ AC_SUBST(SPEEX_LIBS)
++ rm -f conf.speextest
+ ])
+
+-# -*- Autoconf -*-
++# Configure paths for libFLAC
++# "Inspired" by ogg.m4
+
++dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
++dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS
++dnl
++AC_DEFUN([AM_PATH_LIBFLAC],
++[dnl
++dnl Get the cflags and libraries
++dnl
++AC_ARG_WITH(libFLAC-prefix, AC_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="")
++AC_ARG_WITH(libFLAC-libraries, AC_HELP_STRING([--with-libFLAC-libraries=DIR], [directory where libFLAC library is installed (optional)]), libFLAC_libraries="$withval", libFLAC_libraries="")
++AC_ARG_WITH(libFLAC-includes, AC_HELP_STRING([--with-libFLAC-includes=DIR], [directory where libFLAC header files are installed (optional)]), libFLAC_includes="$withval", libFLAC_includes="")
++AC_ARG_ENABLE(libFLACtest, AC_HELP_STRING([--disable-libFLACtest], [do not try to compile and run a test libFLAC program]), enable_libFLACtest=$enableval, enable_libFLACtest=yes)
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
++ if test "x$libFLAC_libraries" != "x" ; then
++ LIBFLAC_LIBS="-L$libFLAC_libraries"
++ elif test "x$libFLAC_prefix" != "x" ; then
++ LIBFLAC_LIBS="-L$libFLAC_prefix/$XINE_LIBNAME"
++ elif test "x$prefix" != "xNONE" ; then
++ LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
++ fi
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test "x$libFLAC_includes" != "x" ; then
++ LIBFLAC_CFLAGS="-I$libFLAC_includes"
++ elif test "x$libFLAC_prefix" != "x" ; then
++ LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
++ elif test "$prefix" != "xNONE"; then
++ LIBFLAC_CFLAGS="-I$prefix/include"
++ fi
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ AC_MSG_CHECKING(for libFLAC)
++ no_libFLAC=""
+
+-# serial 3
+
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++ if test "x$enable_libFLACtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_CXXFLAGS="$CXXFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
++ CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS"
++ LIBS="$LIBS $LIBFLAC_LIBS"
++dnl
++dnl Now check if the installed libFLAC is sufficiently new.
++dnl
++ rm -f conf.libFLACtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <FLAC/format.h>
+
++int main ()
++{
++ system("touch conf.libFLACtest");
++ return 0;
++}
+
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
+-fi
++],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++
++ if test "x$no_libFLAC" = "x" ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$1], , :, [$1])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.libFLACtest ; then
++ :
++ else
++ echo "*** Could not run libFLAC test program, checking why..."
++ CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
++ LIBS="$LIBS $LIBFLAC_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <FLAC/format.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding libFLAC or finding the wrong"
++ echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means libFLAC was incorrectly installed"
++ echo "*** or that you have moved libFLAC since it was installed. In the latter case, you"
++ echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ LIBFLAC_CFLAGS=""
++ LIBFLAC_LIBS=""
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(LIBFLAC_CFLAGS)
++ AC_SUBST(LIBFLAC_LIBS)
++ rm -f conf.libFLACtest
+ ])
+
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++dnl
++dnl Search the freetype library.
++dnl
++dnl AM_PATH_FREETYPE2()
++dnl
+
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++AC_DEFUN([AM_PATH_FREETYPE2], [
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ AC_ARG_ENABLE(freetype,
++ AC_HELP_STRING([--disable-freetype], [disable freetype2 support]),
++ [enable_freetype=$enableval],
++ [enable_freetype=yes]
++ )
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ if test x"$enable_freetype" = "xyes"; then
++ AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
++ if test "$FREETYPE_CONFIG" = "no" ; then
++ AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled **
++ ])
++ else
++ FT2_CFLAGS=`$FREETYPE_CONFIG --cflags`
++ FT2_LIBS=`$FREETYPE_CONFIG --libs`
++ have_ft2="yes"
++ AC_DEFINE(HAVE_FT2,1,[Define this if you have freetype2 library])
++ fi
++ else
++ AC_MSG_RESULT([*** freetype2 support disabled ***])
++ fi
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ dnl AM_CONDITIONAL(HAVE_FT2, test x"$have_ft2" = "xyes" )
++ AC_SUBST(FT2_CFLAGS)
++ AC_SUBST(FT2_LIBS)
+
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake. There are at least two reasons why we must not
+-# use `-m 0755':
+-# - it causes special bits like SGID to be ignored,
+-# - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out. Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
++])
++
++dnl Configure paths/version for ALSA
++dnl
++dnl Copyright (C) 2000 Daniel Caujolle-Bert <lobadia@club-internet.fr>
++dnl
++dnl This program is free software; you can redistribute it and/or modify
++dnl it under the terms of the GNU General Public License as published by
++dnl the Free Software Foundation; either version 2 of the License, or
++dnl (at your option) any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++dnl GNU General Public License for more details.
++dnl
++dnl You should have received a copy of the GNU General Public License
++dnl along with this program; if not, write to the Free Software
++dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++dnl
++dnl
++dnl As a special exception to the GNU General Public License, if you
++dnl distribute this file as part of a program that contains a configuration
++dnl script generated by Autoconf, you may include it under the same
++dnl distribution terms that you use for the rest of that program.
++dnl
++dnl USAGE:
++dnl AM_PATH_ALSA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for ALSA, then
++dnl AC_SUBST() for ALSA_CFLAGS, ALSA_LIBS and ALSA_STATIC_LIB,
++dnl AC_DEFINE() HAVE_GL,
++dnl $no_alsa is set to "yes" if alsa isn't found.
++dnl $have_alsa05 is set to "yes" if installed alsa version is <= 0.5
++dnl $have_alsa09 is set to "yes" if installed alsa version is >= 0.9
++dnl
++AC_DEFUN([AM_PATH_ALSA],
++ [
++ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--disable-alsa], [do not build ALSA support]),
++ enable_alsa=$enableval, enable_alsa=yes)
++ AC_ARG_WITH(alsa-prefix, AC_HELP_STRING([--with-alsa-prefix=DIR], [prefix where alsa is installed (optional)]),
++ alsa_prefix="$withval", alsa_prefix="")
++ AC_ARG_WITH(alsa-exec-prefix, AC_HELP_STRING([--with-alsa-exec-prefix=DIR], [exec prefix where alsa is installed (optional)]),
++ alsa_exec_prefix="$withval", alsa_exec_prefix="")
++ AC_ARG_ENABLE(alsatest, AC_HELP_STRING([--disable-alsatest], [do not try to compile and run a test alsa program]),
++ enable_alsatest=$enableval, enable_alsatest=yes)
++
++ no_alsa="yes"
++ have_alsa05="no"
++ have_alsa09="no"
++
++if test x"$enable_alsa" != "xno"; then
++
++ if test x$alsa_prefix != x ; then
++ ALSA_LIBS="-L$alsa_prefix/$XINE_LIBNAME"
++ ALSA_STATIC_LIB="$alsa_prefix"
++ ALSA_CFLAGS="-I$alsa_prefix/include"
++ fi
++ if test x$alsa_exec_prefix != x ; then
++ ALSA_LIBS="-L$alsa_exec_prefix/$XINE_LIBNAME"
++ ALSA_STATIC_LIB="$alsa_exec_prefix"
++ ALSA_CFLAGS="-I$alsa_exec_prefix/include"
++ fi
++
++ ALSA_LIBS="-lasound $ALSA_LIBS"
++ if test x$ALSA_STATIC_LIB != x; then
++ ALSA_STATIC_LIB="$ALSA_STATIC_LIB/lib/libasound.a"
+ else
+- mkdir_p='$(install_sh) -d'
++ ALSA_STATIC_LIB="/usr/$XINE_LIBNAME/libasound.a"
+ fi
+-fi
+-AC_SUBST([mkdir_p])])
++ ALSA_CFLAGS="$ALSA_CFLAGS"
+
+-# Helper functions for option handling. -*- Autoconf -*-
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS"
++ AC_CHECK_HEADER(alsa/asoundlib.h,
++ [
++ asoundlib_h="alsa/asoundlib.h"
++ AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H, 1, [Define this if your asoundlib.h is installed in alsa/])
++ ],[
++ AC_CHECK_HEADER(sys/asoundlib.h,
++ [
++ asoundlib_h="sys/asoundlib.h"
++ AC_DEFINE(HAVE_SYS_ASOUNDLIB_H, 1, [Define this if your asoundlib.h is installed in sys/])
++ ])
++ ])
+
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++ min_alsa_version=ifelse([$1], ,0.1.1,$1)
++ AC_MSG_CHECKING([for ALSA version >= $min_alsa_version])
++ if test "x$enable_alsatest" = "xyes" ; then
++ no_alsa=""
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $ALSA_CFLAGS"
++ LIBS="$ALSA_LIBS $LIBS"
++dnl
++dnl Now check if the installed ALSA is sufficiently new.
++dnl
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ AC_LANG_SAVE()
++ AC_LANG_C()
++ rm -f conf.alsatest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++#include <$asoundlib_h>
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++int main() {
++ int major, minor, micro, extra;
++ char *tmp_version;
+
+-# serial 2
++ system("touch conf.alsatest");
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++ tmp_version = strdup("$min_alsa_version");
++ if(sscanf(tmp_version, "%d.%d.%dpre%d", &major, &minor, µ, &extra) != 4) {
++ if(sscanf(tmp_version, "%d.%d.%dalpha%d", &major, &minor, µ, &extra) != 4) {
++ if(sscanf(tmp_version, "%d.%d.%dbeta%d", &major, &minor, µ, &extra) != 4) {
++ if(sscanf(tmp_version, "%d.%d.%drc%d", &major, &minor, µ, &extra) != 4) {
++ if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_alsa_version");
++ exit(1);
++ } else /* final */
++ extra = 1000000;
++ } else /* rc */
++ extra += 100000;
++ } else /* beta */
++ extra += 20000;
++ } else /* alpha */
++ extra += 10000;
++ }
+
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++ #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
++ #define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
++ #endif
++ #if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
++ #define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
++ #endif
++ #if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
++ #define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
++ #endif
++ #if !defined(SND_LIB_EXTRAVER) && defined(SOUNDLIB_VERSION_EXTRAVER)
++ #define SND_LIB_EXTRAVER SOUNDLIB_VERSION_EXTRAVER
++ #endif
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++ if((SND_LIB_MAJOR > major) ||
++ ((SND_LIB_MAJOR == major) && (SND_LIB_MINOR > minor)) ||
++ ((SND_LIB_MAJOR == major) && (SND_LIB_MINOR == minor) && (SND_LIB_SUBMINOR > micro)) ||
++ ((SND_LIB_MAJOR == major) && (SND_LIB_MINOR == minor) && (SND_LIB_SUBMINOR == micro) && (SND_LIB_EXTRAVER >= extra))) {
++ return 0;
++ }
++ else {
++ printf("\n*** An old version of ALSA (%d.%d.%d) was found.\n",
++ SND_LIB_MAJOR, SND_LIB_MINOR, SND_LIB_SUBMINOR);
++ printf("*** You need a version of ALSA newer than %d.%d.%d. The latest version of\n", major, minor, micro);
++ printf("*** ALSA is always available from: http://www.alsa-project.org/\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version\n");
++ printf("*** the easiest way to fix this is to remove the old version, and\n");
++ printf("*** install a new one.\n");
++ }
++ return 1;
++}
++],, no_alsa=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
+
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++ if test "x$no_alsa" = x ; then
++ AC_MSG_RESULT(yes)
+
+-#
+-# Check to make sure that the build environment is sane.
+-#
++dnl
++dnl now check for installed version.
++dnl
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++dnl
++dnl Check for alsa 0.5.x series
++dnl
++ AC_MSG_CHECKING([for ALSA <= 0.5 series])
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++#include <$asoundlib_h>
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++int main() {
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
++ #define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
++ #endif
++ #if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
++ #define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
++ #endif
+
+-# serial 3
++ if((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR <= 5))
++ return 0;
+
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
++ return 1;
++}
++], [ AC_MSG_RESULT(yes)
++ have_alsa05=yes ],
++ AC_MSG_RESULT(no),[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
++dnl
++dnl Check for alsa >= 0.9.x
++dnl
++ AC_MSG_CHECKING([for ALSA >= 0.9 series])
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
++#include <$asoundlib_h>
+
+-# AM_PROG_INSTALL_STRIP
++int main() {
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++ #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
++ #define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
++ #endif
++ #if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
++ #define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
++ #endif
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++ if(((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)) ||
++ ((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)))
++ return 0;
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++ return 1;
++}
++], [ AC_MSG_RESULT(yes)
++ have_alsa09=yes ],
++ AC_MSG_RESULT(no),[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++dnl
++dnl Version checking done.
++dnl
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test -f conf.alsatest ; then
++ :
++ else
++ echo "*** Could not run ALSA test program, checking why..."
++ CFLAGS="$CFLAGS $ALSA_CFLAGS"
++ LIBS="$LIBS $ALSA_LIBS"
++ AC_TRY_LINK([
++#include <$asoundlib_h>
++#include <stdio.h>
++],
++ [return ((SND_LIB_MAJOR) || (SND_LIB_MINOR) || (SND_LIB_SUBMINOR));],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding ALSA or finding the wrong"
++ echo "*** version of ALSA. If it is not finding ALSA, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means ALSA was incorrectly installed."])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ ALSA_CFLAGS=""
++ ALSA_STATIC_LIB=""
++ ALSA_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
+
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
++ CPPFLAGS="$ac_save_CPPFLAGS"
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Check how to create a tarball. -*- Autoconf -*-
++ AC_SUBST(ALSA_CFLAGS)
++ AC_SUBST(ALSA_STATIC_LIB)
++ AC_SUBST(ALSA_LIBS)
++ AC_LANG_RESTORE()
++ rm -f conf.alsatest
++])
+
+-# Copyright (C) 2004 Free Software Foundation, Inc.
+
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Configure paths for ESD
++# Manish Singh 98-9-30
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
+
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
++dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
++dnl
++AC_DEFUN([AM_PATH_ESD],
++[dnl
++dnl Get the cflags and libraries from the esd-config script
++dnl
++AC_ARG_WITH(esd-prefix, AC_HELP_STRING([--with-esd-prefix=DIR], [prefix where ESD is installed (optional)]),
++ esd_prefix="$withval", esd_prefix="")
++AC_ARG_WITH(esd-exec-prefix, AC_HELP_STRING([--with-esd-exec-prefix=DIR], [exec prefix where ESD is installed (optional)]),
++ esd_exec_prefix="$withval", esd_exec_prefix="")
++AC_ARG_ENABLE(esdtest, AC_HELP_STRING([--disable-esdtest], [do not try to compile and run a test ESD program]),
++ enable_esdtest=$enableval, enable_esdtest=yes)
+
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++ if test x$esd_exec_prefix != x ; then
++ esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
++ if test x${ESD_CONFIG+set} != xset ; then
++ ESD_CONFIG=$esd_exec_prefix/bin/esd-config
++ fi
++ fi
++ if test x$esd_prefix != x ; then
++ esd_args="$esd_args --prefix=$esd_prefix"
++ if test x${ESD_CONFIG+set} != xset ; then
++ ESD_CONFIG=$esd_prefix/bin/esd-config
++ fi
++ fi
+
+-# serial 1
++ AC_PATH_PROG(ESD_CONFIG, esd-config, no)
++ min_esd_version=ifelse([$1], ,0.2.7,$1)
++ AC_MSG_CHECKING([for ESD - version >= $min_esd_version])
++ no_esd=""
++ if test "$ESD_CONFIG" = "no" ; then
++ no_esd=yes
++ else
++ ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
++ ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
+
++ esd_major_version=`$ESD_CONFIG $esd_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ esd_minor_version=`$ESD_CONFIG $esd_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_esdtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $ESD_CFLAGS"
++ LIBS="$LIBS $ESD_LIBS"
++dnl
++dnl Now check if the installed ESD is sufficiently new. (Also sanity
++dnl checks the results of esd-config to some extent
++dnl
++ rm -f conf.esdtest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <esd.h>
+
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+-#
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-# $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+- [m4_case([$1], [ustar],, [pax],,
+- [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+- case $_am_tool in
+- gnutar)
+- for _am_tar in tar gnutar gtar;
+- do
+- AM_RUN_LOG([$_am_tar --version]) && break
+- done
+- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+- am__untar="$_am_tar -xf -"
+- ;;
+- plaintar)
+- # Must skip GNU tar: if it does not support --format= it doesn't create
+- # ustar tarball either.
+- (tar --version) >/dev/null 2>&1 && continue
+- am__tar='tar chf - "$$tardir"'
+- am__tar_='tar chf - "$tardir"'
+- am__untar='tar xf -'
+- ;;
+- pax)
+- am__tar='pax -L -x $1 -w "$$tardir"'
+- am__tar_='pax -L -x $1 -w "$tardir"'
+- am__untar='pax -r'
+- ;;
+- cpio)
+- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+- am__untar='cpio -i -H $1 -d'
+- ;;
+- none)
+- am__tar=false
+- am__tar_=false
+- am__untar=false
+- ;;
+- esac
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
+
+- # If the value was cached, stop now. We just wanted to have am__tar
+- # and am__untar set.
+- test -n "${am_cv_prog_tar_$1}" && break
++int main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
+
+- # tar/untar a dummy directory, and stop if the command works
+- rm -rf conftest.dir
+- mkdir conftest.dir
+- echo GrepMe > conftest.dir/file
+- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+- rm -rf conftest.dir
+- if test -s conftest.tar; then
+- AM_RUN_LOG([$am__untar <conftest.tar])
+- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++ system ("touch conf.esdtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_esd_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_esd_version");
++ exit(1);
++ }
++
++ if (($esd_major_version > major) ||
++ (($esd_major_version == major) && ($esd_minor_version > minor)) ||
++ (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
++ printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
++ printf("*** to point to the correct copy of esd-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
++
++],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
+ fi
+-done
+-rm -rf conftest.dir
++ if test "x$no_esd" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$ESD_CONFIG" = "no" ; then
++ echo "*** The esd-config script installed by ESD could not be found"
++ echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the ESD_CONFIG environment variable to the"
++ echo "*** full path to esd-config."
++ else
++ if test -f conf.esdtest ; then
++ :
++ else
++ echo "*** Could not run ESD test program, checking why..."
++ CFLAGS="$CFLAGS $ESD_CFLAGS"
++ LIBS="$LIBS $ESD_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <esd.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding ESD or finding the wrong"
++ echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means ESD was incorrectly installed"
++ echo "*** or that you have moved ESD since it was installed. In the latter case, you"
++ echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ ESD_CFLAGS=""
++ ESD_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(ESD_CFLAGS)
++ AC_SUBST(ESD_LIBS)
++ rm -f conf.esdtest
++])
+
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
++# Configure paths for ARTS
++# Philip Stadermann 2001-06-21
++# stolen from esd.m4
++
++dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for ARTS, and define ARTS_CFLAGS and ARTS_LIBS
++dnl
++AC_DEFUN([AM_PATH_ARTS],
++[dnl
++dnl Get the cflags and libraries from the artsc-config script
++dnl
++AC_ARG_WITH(arts-prefix, AC_HELP_STRING([--with-arts-prefix=DIR], [prefix where ARTS is installed (optional)]),
++ arts_prefix="$withval", arts_prefix="")
++AC_ARG_ENABLE(artstest, AC_HELP_STRING([--disable-artstest], [do not try to compile and run a test ARTS program]),
++ enable_artstest=$enableval, enable_artstest=yes)
++
++ if test x$arts_prefix != x ; then
++ arts_args="$arts_args --arts-prefix=$arts_prefix"
++ if test x${ARTS_CONFIG+set} != xset ; then
++ ARTS_CONFIG=$arts_prefix/bin/artsc-config
++ fi
++ fi
++
++ AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
++
++ min_arts_version=ifelse([$1], ,0.9.5,$1)
++ AC_MSG_CHECKING(for ARTS artsc - version >= $min_arts_version)
++ no_arts=""
++ if test "$ARTS_CONFIG" = "no" ; then
++ no_arts=yes
++ else
++ ARTS_CFLAGS=`$ARTS_CONFIG $artsconf_args --cflags`
++ ARTS_LIBS=`$ARTS_CONFIG $artsconf_args --libs`
++
++ arts_major_version=`$ARTS_CONFIG $arts_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ arts_minor_version=`$ARTS_CONFIG $arts_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ arts_micro_version=`$ARTS_CONFIG $arts_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_artstest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $ARTS_CFLAGS"
++ LIBS="$LIBS $ARTS_LIBS"
++dnl
++dnl Now check if the installed ARTS is sufficiently new. (Also sanity
++dnl checks the results of artsc-config to some extent)
++dnl
++ rm -f conf.artstest
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <artsc.h>
++
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
++
++int main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.artstest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_arts_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_arts_version");
++ exit(1);
++ }
++
++ if (($arts_major_version > major) ||
++ (($arts_major_version == major) && ($arts_minor_version > minor)) ||
++ (($arts_major_version == major) && ($arts_minor_version == minor) && ($arts_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** 'artsc-config --version' returned %d.%d.%d, but the minimum version\n", $arts_major_version, $arts_minor_version, $arts_micro_version);
++ printf("*** of ARTS required is %d.%d.%d. If artsc-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If artsc-config was wrong, set the environment variable ARTS_CONFIG\n");
++ printf("*** to point to the correct copy of artsc-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ return 1;
++ }
++}
++
++],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_arts" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$ARTS_CONFIG" = "no" ; then
++ echo "*** The artsc-config script installed by ARTS could not be found"
++ echo "*** If ARTS was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the ARTS_CONFIG environment variable to the"
++ echo "*** full path to artsc-config."
++ else
++ if test -f conf.artstest ; then
++ :
++ else
++ echo "*** Could not run ARTS test program, checking why..."
++ CFLAGS="$CFLAGS $ARTS_CFLAGS"
++ LIBS="$LIBS $ARTS_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <artsc.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding ARTS or finding the wrong"
++ echo "*** version of ARTS. If it is not finding ARTS, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means ARTS was incorrectly installed"
++ echo "*** or that you have moved ARTS since it was installed. In the latter case, you"
++ echo "*** may want to edit the artsc-config script: $ARTS_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ ARTS_CFLAGS=""
++ ARTS_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(ARTS_CFLAGS)
++ AC_SUBST(ARTS_LIBS)
++ rm -f conf.artstest
++])
++
++dnl AM_CHECK_IRIXAL ([ACTION-IF-YES], [ACTION-IF-NO])
++dnl Configure paths/version for IRIX AL
++AC_DEFUN([AM_CHECK_IRIXAL],
++ [AC_CACHE_CHECK([for IRIX libaudio support],
++ [am_cv_have_irixal],
++ [AC_CHECK_HEADER([dmedia/audio.h],
++ am_cv_have_irixal=yes, am_cv_have_irixal=no)])
++ if test "x$am_cv_have_irixal" = xyes ; then
++ IRIXAL_LIBS="-laudio"
++ IRIXAL_STATIC_LIB="/usr/lib/libaudio.a"
++ ifelse([$1], , :, [$1])
++ else
++ ifelse([$2], , :, [$2])
++ fi
++ AC_SUBST(IRIXAL_CFLAGS)
++ AC_SUBST(IRIXAL_STATIC_LIB)
++ AC_SUBST(IRIXAL_LIBS)
++])
++
++
++dnl Configure paths for DVDNAV
++dnl
++dnl Copyright (C) 2001 Daniel Caujolle-Bert <segfault@club-internet.fr>
++dnl
++dnl This program is free software; you can redistribute it and/or modify
++dnl it under the terms of the GNU General Public License as published by
++dnl the Free Software Foundation; either version 2 of the License, or
++dnl (at your option) any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++dnl GNU General Public License for more details.
++dnl
++dnl You should have received a copy of the GNU General Public License
++dnl along with this program; if not, write to the Free Software
++dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++dnl
++dnl
++dnl As a special exception to the GNU General Public License, if you
++dnl distribute this file as part of a program that contains a configuration
++dnl script generated by Autoconf, you may include it under the same
++dnl distribution terms that you use for the rest of that program.
++dnl
++
++dnl AM_PATH_DVDNAV([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for DVDNAV, and define DVDNAV_CFLAGS and DVDNAV_LIBS
++dnl
++AC_DEFUN([AM_PATH_DVDNAV],
++[dnl
++dnl Get the cflags and libraries from the dvdnav-config script
++dnl
++AC_ARG_WITH(dvdnav-prefix,
++ AC_HELP_STRING([--with-dvdnav-prefix=DIR], [prefix where DVDNAV is installed (optional)]),
++ dvdnav_config_prefix="$withval", dvdnav_config_prefix="")
++AC_ARG_WITH(dvdnav-exec-prefix,
++ AC_HELP_STRING([--with-dvdnav-exec-prefix=DIR], [exec prefix where DVDNAV is installed (optional)]),
++ dvdnav_config_exec_prefix="$withval", dvdnav_config_exec_prefix="")
++AC_ARG_ENABLE(dvdnavtest,
++ AC_HELP_STRING([--disable-dvdnavtest], [do not try to compile and run a test DVDNAV program]),
++ enable_dvdnavtest=$enableval, enable_dvdnavtest=yes)
++
++ if test x$dvdnav_config_exec_prefix != x ; then
++ dvdnav_config_args="$dvdnav_config_args --exec-prefix=$dvdnav_config_exec_prefix"
++ if test x${DVDNAV_CONFIG+set} != xset ; then
++ DVDNAV_CONFIG=$dvdnav_config_exec_prefix/bin/dvdnav-config
++ fi
++ fi
++ if test x$dvdnav_config_prefix != x ; then
++ dvdnav_config_args="$dvdnav_config_args --prefix=$dvdnav_config_prefix"
++ if test x${DVDNAV_CONFIG+set} != xset ; then
++ DVDNAV_CONFIG=$dvdnav_config_prefix/bin/dvdnav-config
++ fi
++ fi
++
++ min_dvdnav_version=ifelse([$1], ,0.0.0,$1)
++ if test "x$enable_dvdnavtest" != "xyes" ; then
++ AC_MSG_CHECKING([for DVDNAV-LIB version >= $min_dvdnav_version])
++ else
++ AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no)
++ AC_MSG_CHECKING([for DVDNAV-LIB version >= $min_dvdnav_version])
++ no_dvdnav=""
++ if test "$DVDNAV_CONFIG" = "no" ; then
++ no_dvdnav=yes
++ else
++ DVDNAV_CFLAGS=`$DVDNAV_CONFIG $dvdnav_config_args --cflags`
++ DVDNAV_LIBS=`$DVDNAV_CONFIG $dvdnav_config_args --libs`
++ dvdnav_config_major_version=`$DVDNAV_CONFIG $dvdnav_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ dvdnav_config_minor_version=`$DVDNAV_CONFIG $dvdnav_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ dvdnav_config_sub_version=`$DVDNAV_CONFIG $dvdnav_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ dnl if test "x$enable_dvdnavtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
++ LIBS="$DVDNAV_LIBS $LIBS"
++dnl
++dnl Now check if the installed DVDNAV is sufficiently new. (Also sanity
++dnl checks the results of dvdnav-config to some extent
++dnl
++ AC_LANG_SAVE()
++ AC_LANG_C()
++ rm -f conf.dvdnavtest
++ AC_TRY_RUN([
++#include <dvdnav.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int
++main ()
++{
++ int major, minor, sub;
++ char *tmp_version;
++
++ system ("touch conf.dvdnavtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = (char *) strdup("$min_dvdnav_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &sub) != 3) {
++ printf("%s, bad version string\n", "$min_dvdnav_version");
++ exit(1);
++ }
++
++ if (($dvdnav_config_major_version > major) ||
++ (($dvdnav_config_major_version == major) && ($dvdnav_config_minor_version > minor)) ||
++ (($dvdnav_config_major_version == major) && ($dvdnav_config_minor_version == minor) && ($dvdnav_config_sub_version >= sub))) {
++ return 0;
++ } else {
++ printf("\n*** An old version of libdvdnav (%d.%d.%d) was found.\n",
++ $dvdnav_config_major_version, $dvdnav_config_minor_version, $dvdnav_config_sub_version);
++ printf("*** You need a version of libdvdnav newer than %d.%d.%d. The latest version of\n",
++ major, minor, sub);
++ printf("*** libdvdnav is always available from:\n");
++ printf("*** http://dvd.sourceforge.net\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the dvdnav-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of libdvdnav, but you can also set the DVDNAV_CONFIG environment to point to the\n");
++ printf("*** correct copy of dvdnav-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ return 1;
++}
++],, no_dvdnav=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_dvdnav" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$DVDNAV_CONFIG" = "no" ; then
++ echo "*** The dvdnav-config script installed by DVDNAV could not be found"
++ echo "*** If DVDNAV was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the DVDNAV_CONFIG environment variable to the"
++ echo "*** full path to dvdnav-config."
++ else
++ if test -f conf.dvdnavtest ; then
++ :
++ else
++ echo "*** Could not run DVDNAV test program, checking why..."
++ CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
++ LIBS="$LIBS $DVDNAV_LIBS"
++ AC_TRY_LINK([
++#include <dvdnav.h>
++#include <stdio.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding DVDNAV or finding the wrong"
++ echo "*** version of DVDNAV. If it is not finding DVDNAV, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means DVDNAV was incorrectly installed"
++ echo "*** or that you have moved DVDNAV since it was installed. In the latter case, you"
++ echo "*** may want to edit the dvdnav-config script: $DVDNAV_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ DVDNAV_CFLAGS=""
++ DVDNAV_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(DVDNAV_CFLAGS)
++ AC_SUBST(DVDNAV_LIBS)
++ AC_LANG_RESTORE()
++ rm -f conf.dvdnavtest
++])
+
+-m4_include([m4/_xine.m4])
+-m4_include([m4/aa.m4])
+-m4_include([m4/alsa.m4])
+-m4_include([m4/arts.m4])
+-m4_include([m4/as.m4])
+-m4_include([m4/caca.m4])
+-m4_include([m4/codeset.m4])
+-m4_include([m4/directx.m4])
+-m4_include([m4/dl.m4])
+-m4_include([m4/dvdnav.m4])
+-m4_include([m4/esd.m4])
+-m4_include([m4/ffmpeg.m4])
+-m4_include([m4/freetype2.m4])
+-m4_include([m4/gettext.m4])
+-m4_include([m4/glibc21.m4])
+-m4_include([m4/iconv.m4])
+-m4_include([m4/irixal.m4])
+-m4_include([m4/lcmessage.m4])
+-m4_include([m4/libFLAC.m4])
+-m4_include([m4/libfame.m4])
+-m4_include([m4/ogg.m4])
+-m4_include([m4/opengl.m4])
+-m4_include([m4/pkg.m4])
+-m4_include([m4/progtest.m4])
+-m4_include([m4/sdl.m4])
+-m4_include([m4/speex.m4])
+-m4_include([m4/theora.m4])
+-m4_include([m4/vorbis.m4])
+-m4_include([m4/xv.m4])
+diff -urNad xine-lib-vdr-1.0/config.guess /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.guess
+--- xine-lib-vdr-1.0/config.guess 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.guess 2005-02-13 01:07:42.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+-timestamp='2004-08-13'
++timestamp='2004-11-12'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -319,6 +319,9 @@
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
++ *:z/VM:*:*)
++ echo s390-ibm-zvmoe
++ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
+@@ -342,7 +345,7 @@
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+- DRS?6000:UNIX_SV:4.2*:7*)
++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
+@@ -824,6 +827,12 @@
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
++ crisv32:Linux:*:*)
++ echo crisv32-axis-linux-gnu
++ exit 0 ;;
++ frv:Linux:*:*)
++ echo frv-unknown-linux-gnu
++ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+@@ -1241,7 +1250,10 @@
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+- esac
++ esac ;;
++ *:XENIX:*:SysV)
++ echo i386-pc-xenix
++ exit 0 ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+diff -urNad xine-lib-vdr-1.0/config.h.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.h.in
+--- xine-lib-vdr-1.0/config.h.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.h.in 2005-02-13 01:07:33.000000000 +0000
+@@ -201,7 +201,7 @@
+ /* Define this if you have gnome-vfs installed */
+ #undef HAVE_GNOME_VFS
+
+-/* Define to 1 if you have the `hstrerror' function. */
++/* Define to 1 if you have 'hstrerror' in <netdb.h> */
+ #undef HAVE_HSTRERROR
+
+ /* Define if you have the iconv() function. */
+diff -urNad xine-lib-vdr-1.0/config.sub /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.sub
+--- xine-lib-vdr-1.0/config.sub 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/config.sub 2005-02-13 01:07:42.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+-timestamp='2004-06-24'
++timestamp='2004-11-30'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -267,7 +267,7 @@
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+- | x86 | xscale | xstormy16 | xtensa \
++ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+@@ -343,8 +343,8 @@
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+- | xtensa-* \
++ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | xstormy16-* | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+@@ -457,6 +457,9 @@
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
++ crisv32 | crisv32-* | etraxfs*)
++ basic_machine=crisv32-axis
++ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+@@ -486,6 +489,10 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ djgpp)
++ basic_machine=i586-pc
++ os=-msdosdjgpp
++ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+@@ -1026,6 +1033,10 @@
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
++ xbox)
++ basic_machine=i686-pc
++ os=-mingw32
++ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+@@ -1294,6 +1305,9 @@
+ -kaos*)
+ os=-kaos
+ ;;
++ -zvmoe)
++ os=-zvmoe
++ ;;
+ -none)
+ ;;
+ *)
+diff -urNad xine-lib-vdr-1.0/configure /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/configure
+--- xine-lib-vdr-1.0/configure 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/configure 2005-02-13 01:08:06.000000000 +0000
+@@ -464,7 +464,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE LT_CURRENT LT_REVISION LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE INTLDIR THREAD_CFLAGS THREAD_INCLUDES THREAD_LIBS GOOM_LIBS THREAD_CFLAGS_CONFIG THREAD_LIBS_CONFIG WIN32_CPPFLAGS WIN32_TRUE WIN32_FALSE DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS FFMPEG_CPPFLAGS FFMPEG_LIBS HAVE_FFMPEG_TRUE HAVE_FFMPEG_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_INCLUDES ZLIB_LIBS ZLIB_LIBS_CONFIG RT_LIBS OPENGL_CFLAGS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_SYNCFB_TRUE HAVE_SYNCFB_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE HAVE_XV_TRUE HAVE_XV_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_VLDXVMC_TRUE HAVE_VLDXVMC_FALSE HAVE_XXMC_TRUE HAVE_XXMC_FALSE XXMC_LIB HAVE_XVMC_TRUE HAVE_XVMC_FALSE XVMC_LIB AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE CACA_CONFIG CACA_CFLAGS CACA_LIBS HAVE_CACA_TRUE HAVE_CACA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_SUNDGA_TRUE HAVE_SUNDGA_FALSE SUNDGA_CFLAGS SUNDGA_LIBS HAVE_FB_TRUE HAVE_FB_FALSE HAVE_MACOSX_VIDEO_TRUE HAVE_MACOSX_VIDEO_FALSE HAVE_COREAUDIO_TRUE HAVE_COREAUDIO_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE POLYPAUDIO_CFLAGS POLYPAUDIO_LIBS HAVE_POLYPAUDIO_TRUE HAVE_POLYPAUDIO_FALSE DIRECTX_CPPFLAGS DIRECTX_AUDIO_LIBS DIRECTX_VIDEO_LIBS HAVE_DIRECTX_TRUE HAVE_DIRECTX_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_LIBSMBCLIENT_TRUE HAVE_LIBSMBCLIENT_FALSE LIBSMBCLIENT_LIBS HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE LIBMODPLUG_CFLAGS LIBMODPLUG_LIBS LIBOBJS DEBUG_CFLAGS ASFLAGS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS OBJC OBJCFLAGS HOST_OS_DARWIN_TRUE HOST_OS_DARWIN_FALSE HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE XINE_PLUGIN_MIN_SYMS HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_CONFIG_PREFIX XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS HAVE_SGMLTOOLS_TRUE HAVE_SGMLTOOLS_FALSE FIG2DEV HAVE_FIG2DEV_TRUE HAVE_FIG2DEV_FALSE MKINSTALLDIRS OBJCDEPMODE am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT XINE_MAJOR XINE_MINOR XINE_SUB XINE_IFACE_AGE XINE_BIN_AGE XINE_LT_CURRENT XINE_LT_REVISION XINE_LT_AGE TAR_NAME SPEC_VERSION LIBNAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP LN_S CCAS CCASFLAGS CCASCOMPILE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS STATIC ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INCLUDED_INTL_TRUE INCLUDED_INTL_FALSE INTLDIR THREAD_CFLAGS THREAD_INCLUDES THREAD_LIBS GOOM_LIBS THREAD_CFLAGS_CONFIG THREAD_LIBS_CONFIG WIN32_CPPFLAGS WIN32_TRUE WIN32_FALSE DYNAMIC_LD_LIBS LIBMPEG2_CFLAGS LIBFFMPEG_CFLAGS HAVE_MLIB_TRUE HAVE_MLIB_FALSE MLIB_LIBS MLIB_CFLAGS FFMPEG_CPPFLAGS FFMPEG_LIBS HAVE_FFMPEG_TRUE HAVE_FFMPEG_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X11_TRUE HAVE_X11_FALSE NET_LIBS HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE ZLIB_INCLUDES ZLIB_LIBS ZLIB_LIBS_CONFIG RT_LIBS OPENGL_CFLAGS OPENGL_LIBS GLUT_LIBS GLU_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE HAVE_SYNCFB_TRUE HAVE_SYNCFB_FALSE HAVE_V4L_TRUE HAVE_V4L_FALSE XV_LIB EXTRA_X_LIBS EXTRA_X_CFLAGS HAVE_XV_TRUE HAVE_XV_FALSE PPC_ARCH_TRUE PPC_ARCH_FALSE HAVE_VLDXVMC_TRUE HAVE_VLDXVMC_FALSE HAVE_XXMC_TRUE HAVE_XXMC_FALSE XXMC_LIB HAVE_XVMC_TRUE HAVE_XVMC_FALSE XVMC_LIB AALIB_CONFIG AAINFO AALIB_CFLAGS AALIB_LIBS HAVE_AA_TRUE HAVE_AA_FALSE CACA_CONFIG CACA_CFLAGS CACA_LIBS HAVE_CACA_TRUE HAVE_CACA_FALSE HAVE_SUNFB_TRUE HAVE_SUNFB_FALSE HAVE_SUNDGA_TRUE HAVE_SUNDGA_FALSE SUNDGA_CFLAGS SUNDGA_LIBS HAVE_FB_TRUE HAVE_FB_FALSE HAVE_MACOSX_VIDEO_TRUE HAVE_MACOSX_VIDEO_FALSE HAVE_COREAUDIO_TRUE HAVE_COREAUDIO_FALSE PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS HAVE_DIRECTFB_TRUE HAVE_DIRECTFB_FALSE SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVE_SDL_TRUE HAVE_SDL_FALSE LIBSTK_CFLAGS LIBSTK_LIBS HAVE_STK_TRUE HAVE_STK_FALSE POLYPAUDIO_CFLAGS POLYPAUDIO_LIBS HAVE_POLYPAUDIO_TRUE HAVE_POLYPAUDIO_FALSE DIRECTX_CPPFLAGS DIRECTX_AUDIO_LIBS DIRECTX_VIDEO_LIBS HAVE_DIRECTX_TRUE HAVE_DIRECTX_FALSE LIBFAME_CONFIG LIBFAME_CFLAGS LIBFAME_LIBS HAVE_DXR3_TRUE HAVE_DXR3_FALSE HAVE_LIBFAME_TRUE HAVE_LIBFAME_FALSE HAVE_LIBRTE_TRUE HAVE_LIBRTE_FALSE LINUX_INCLUDE HAVE_VIDIX_TRUE HAVE_VIDIX_FALSE HAVE_LINUX_TRUE HAVE_LINUX_FALSE BUILD_DHA_KMOD_TRUE BUILD_DHA_KMOD_FALSE MKNOD DEPMOD VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE THEORA_CFLAGS THEORA_LIBS THEORAFILE_LIBS THEORAENC_LIBS HAVE_THEORA_TRUE HAVE_THEORA_FALSE SPEEX_CFLAGS SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE LIBFLAC_CFLAGS LIBFLAC_LIBS HAVE_FLAC_TRUE HAVE_FLAC_FALSE HAVE_LIBMNG_TRUE HAVE_LIBMNG_FALSE MNG_LIBS LIBPNG_CONFIG HAVE_LIBPNG_TRUE HAVE_LIBPNG_FALSE PNG_CFLAGS PNG_LIBS FREETYPE_CONFIG FT2_CFLAGS FT2_LIBS HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_STATIC_LIB ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_ALSA09_TRUE HAVE_ALSA09_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS HAVE_ARTS_TRUE HAVE_ARTS_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE HAVE_LIBSMBCLIENT_TRUE HAVE_LIBSMBCLIENT_FALSE LIBSMBCLIENT_LIBS HAVE_SUNAUDIO_TRUE HAVE_SUNAUDIO_FALSE IRIXAL_CFLAGS IRIXAL_STATIC_LIB IRIXAL_LIBS HAVE_IRIXAL_TRUE HAVE_IRIXAL_FALSE KSTAT_LIBS HAVE_CDROM_IOCTLS_TRUE HAVE_CDROM_IOCTLS_FALSE DVDNAV_CONFIG DVDNAV_CFLAGS DVDNAV_LIBS HAVE_DVDNAV_TRUE HAVE_DVDNAV_FALSE LINUX_CDROM_TIMEOUT HAVE_BSDI_CDROM HAVE_DARWIN_CDROM HAVE_FREEBSD_CDROM HAVE_LINUX_CDROM HAVE_SOLARIS_CDROM HAVE_WIN32_CDROM LIBVCD_SYSDEP LIBCDIO_CFLAGS LIBCDIO_LIBS LIBISO9660_LIBS LIBVCD_CFLAGS LIBVCD_LIBS LIBVCDINFO_LIBS HAVE_VCDNAV_TRUE HAVE_VCDNAV_FALSE ENABLE_VCD_TRUE ENABLE_VCD_FALSE BUILD_ASF_TRUE BUILD_ASF_FALSE BUILD_FAAD_TRUE BUILD_FAAD_FALSE LIBMODPLUG_CFLAGS LIBMODPLUG_LIBS LIBOBJS DEBUG_CFLAGS ASFLAGS W32_NO_OPTIMIZE PASS1_CFLAGS PASS2_CFLAGS OBJC OBJCFLAGS HOST_OS_DARWIN_TRUE HOST_OS_DARWIN_FALSE HAVE_W32DLL_TRUE HAVE_W32DLL_FALSE W32DLL_DEP HAVE_FFMMX_TRUE HAVE_FFMMX_FALSE XINE_PLUGIN_MIN_SYMS HAVE_ARMV4L_TRUE HAVE_ARMV4L_FALSE XINE_CONFIG_PREFIX XINE_PLUGINPATH XINE_FONTPATH XINE_LOCALEPATH XINE_PLUGINDIR XINE_FONTDIR XINE_LOCALEDIR XINE_ACFLAGS XINE_DATADIR XINE_SCRIPTPATH XINE_BUILD_CC XINE_BUILD_OS XINE_BUILD_DATE w32_path INCLUDES ACLOCAL_DIR INSTALL_M4_TRUE INSTALL_M4_FALSE DEPCOMP SGMLTOOLS HAVE_SGMLTOOLS_TRUE HAVE_SGMLTOOLS_FALSE FIG2DEV HAVE_FIG2DEV_TRUE HAVE_FIG2DEV_FALSE mkdir_p MKINSTALLDIRS OBJCDEPMODE LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -1029,8 +1029,10 @@
+ Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+- --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors
++ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer
++ --disable-dependency-tracking Speeds up one-time builds
++ --enable-dependency-tracking Do not reject slow dependency extractors
+ --enable-static[=PKGS]
+ build static libraries [default=no]
+ --enable-shared[=PKGS]
+@@ -1049,6 +1051,7 @@
+ --enable-ipv6 enable use of IPv6
+ --disable-opengl do not build OpenGL plugin
+ --enable-static-xv Enable this to force linking against libXv.a
++ --disable-aalib do not build aalib
+ --disable-aalibtest do not try to compile and run a test AALIB program
+ --disable-cacatest do not try to compile and run a test CACA program
+ --disable-fb do not build linux framebuffer support
+@@ -1600,6 +1603,31 @@
+
+
+
++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++ enableval="$enable_maintainer_mode"
++ USE_MAINTAINER_MODE=$enableval
++else
++ USE_MAINTAINER_MODE=no
++fi;
++ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++ MAINTAINER_MODE_TRUE=
++ MAINTAINER_MODE_FALSE='#'
++else
++ MAINTAINER_MODE_TRUE='#'
++ MAINTAINER_MODE_FALSE=
++fi
++
++ MAINT=$MAINTAINER_MODE_TRUE
++
++
++
+
+
+ XINE_MAJOR=1
+@@ -1613,9 +1641,9 @@
+ fi
+
+
+-LT_CURRENT=12
+-LT_REVISION=1
+-LT_AGE=11
++XINE_LT_CURRENT=12
++XINE_LT_REVISION=1
++XINE_LT_AGE=11
+
+ if test -f .cvsversion; then
+ XINE_PRE="cvs"
+@@ -1766,7 +1794,7 @@
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+-am__api_version="1.9"
++am__api_version="1.6"
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -1904,6 +1932,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+
++
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+@@ -1917,39 +1946,6 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
+-fi
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2019,16 +2015,7 @@
+ SET_MAKE="MAKE=${MAKE-make}"
+ fi
+
+-rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-
+-# test to see if srcdir already configured
++ # test to see if srcdir already configured
+ if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+@@ -2036,16 +2023,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-
+-
+ # Define the identity of the package.
+ PACKAGE="xine-lib"
+ VERSION=$SPEC_VERSION
+@@ -2076,6 +2053,9 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+@@ -2168,13 +2148,6 @@
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+-
+-
+
+
+
+@@ -2190,22 +2163,34 @@
+ check_athlon=yes
+ fi
+
++# Add the stamp file to the list of files AC keeps track of,
++# along with our hook.
+ ac_config_headers="$ac_config_headers config.h"
+
+
+
+
++
++
+ saved_CFLAGS="$CFLAGS"
+-DEPDIR="${am__leading_dot}deps"
++rm -f .deps 2>/dev/null
++mkdir .deps 2>/dev/null
++if test -d .deps; then
++ DEPDIR=.deps
++else
++ # MS-DOS does not allow filenames that begin with a dot.
++ DEPDIR=_deps
++fi
++rmdir .deps 2>/dev/null
++
+
+ ac_config_commands="$ac_config_commands depfiles"
+
+
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+-am__doit:
++doit:
+ @echo done
+-.PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+@@ -2220,7 +2205,7 @@
+ # In particular we don't look at `^make:' because GNU make might
+ # be invoked under some other name (usually "gmake"), in which
+ # case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+@@ -3203,34 +3188,18 @@
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ echo '#include "conftest.h"' > conftest.c
++ echo 'int i;' > conftest.h
++ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+@@ -3248,25 +3217,13 @@
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ source=conftest.c object=conftest.o \
++ depfile=conftest.Po tmpdepfile=conftest.TPo \
++ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
++ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CC_dependencies_compiler_type=$depmode
+- break
+- fi
++ am_cv_CC_dependencies_compiler_type=$depmode
++ break
+ fi
+ done
+
+@@ -3283,25 +3240,14 @@
+
+
+
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+- am__fastdepCC_TRUE=
+- am__fastdepCC_FALSE='#'
+-else
+- am__fastdepCC_TRUE='#'
+- am__fastdepCC_FALSE=
+-fi
+
+-
+-
+-echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+-if test "${ac_cv_search_strerror+set}" = set; then
++ echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
++echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
++if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_strerror=no
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcposix $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3345,79 +3291,24 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_search_strerror="none required"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_strerror" = no; then
+- for ac_lib in cposix; do
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char strerror ();
+-int
+-main ()
+-{
+-strerror ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_search_strerror="-l$ac_lib"
+-break
++ ac_cv_lib_cposix_strerror=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++ac_cv_lib_cposix_strerror=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- done
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-LIBS=$ac_func_search_save_LIBS
++echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
++echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
++if test $ac_cv_lib_cposix_strerror = yes; then
++ LIBS="$LIBS -lcposix"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-echo "${ECHO_T}$ac_cv_search_strerror" >&6
+-if test "$ac_cv_search_strerror" != no; then
+- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
+
+-fi
++
+
+ CFLAGS="$saved_CFLAGS"
+ ac_ext=c
+@@ -4161,34 +4052,18 @@
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ echo '#include "conftest.h"' > conftest.c
++ echo 'int i;' > conftest.h
++ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+@@ -4206,25 +4081,13 @@
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ source=conftest.c object=conftest.o \
++ depfile=conftest.Po tmpdepfile=conftest.TPo \
++ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
++ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CC_dependencies_compiler_type=$depmode
+- break
+- fi
++ am_cv_CC_dependencies_compiler_type=$depmode
++ break
+ fi
+ done
+
+@@ -4240,18 +4103,6 @@
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+-
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+- am__fastdepCC_TRUE=
+- am__fastdepCC_FALSE='#'
+-else
+- am__fastdepCC_TRUE='#'
+- am__fastdepCC_FALSE=
+-fi
+-
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -5439,7 +5290,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5442 "configure"' > conftest.$ac_ext
++ echo '#line 5293 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -6431,34 +6282,18 @@
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ echo '#include "conftest.h"' > conftest.c
++ echo 'int i;' > conftest.h
++ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+@@ -6476,25 +6311,13 @@
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ source=conftest.c object=conftest.o \
++ depfile=conftest.Po tmpdepfile=conftest.TPo \
++ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
++ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CXX_dependencies_compiler_type=$depmode
+- break
+- fi
++ am_cv_CXX_dependencies_compiler_type=$depmode
++ break
+ fi
+ done
+
+@@ -6510,18 +6333,6 @@
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+-
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+- am__fastdepCXX_TRUE=
+- am__fastdepCXX_FALSE='#'
+-else
+- am__fastdepCXX_TRUE='#'
+- am__fastdepCXX_FALSE=
+-fi
+-
+-
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -6845,7 +6656,7 @@
+
+
+ # Provide some information about the compiler.
+-echo "$as_me:6848:" \
++echo "$as_me:6659:" \
+ "checking for Fortran 77 compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+@@ -7877,11 +7688,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:7880: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7691: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7884: \$? = $ac_status" >&5
++ echo "$as_me:7695: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -8110,11 +7921,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7924: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8117: \$? = $ac_status" >&5
++ echo "$as_me:7928: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -8170,11 +7981,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8173: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7984: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8177: \$? = $ac_status" >&5
++ echo "$as_me:7988: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -10358,7 +10169,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 10361 "configure"
++#line 10172 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10456,7 +10267,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 10459 "configure"
++#line 10270 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12633,11 +12444,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:12636: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12447: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:12640: \$? = $ac_status" >&5
++ echo "$as_me:12451: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -12693,11 +12504,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:12696: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12507: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:12700: \$? = $ac_status" >&5
++ echo "$as_me:12511: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14062,7 +13873,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 14065 "configure"
++#line 13876 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14160,7 +13971,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 14163 "configure"
++#line 13974 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14987,11 +14798,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14990: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14801: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14994: \$? = $ac_status" >&5
++ echo "$as_me:14805: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -15047,11 +14858,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15050: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14861: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15054: \$? = $ac_status" >&5
++ echo "$as_me:14865: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -17092,11 +16903,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17095: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16906: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17099: \$? = $ac_status" >&5
++ echo "$as_me:16910: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -17325,11 +17136,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17328: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17139: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17332: \$? = $ac_status" >&5
++ echo "$as_me:17143: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -17385,11 +17196,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17388: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17199: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17392: \$? = $ac_status" >&5
++ echo "$as_me:17203: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -19573,7 +19384,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 19576 "configure"
++#line 19387 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -19671,7 +19482,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 19674 "configure"
++#line 19485 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -28651,12 +28462,11 @@
+
+ if test x"$no_x" != "xyes"; then
+
+-
+ # Ensure that AC_PATH_XTRA is executed before this
+
+
+ # Set xv_path if its not done already
+- if test -z $xv_path; then
++ if test x$xv_path = x; then
+ xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
+ fi
+
+@@ -28689,7 +28499,7 @@
+ fi
+
+ # Try the other lib if prefered failed
+- if test -z $XV_LIB; then
++ if test x$XV_LIB = x; then
+ if ! test "x$xv_prefer_shared" = "xyes"; then
+
+ echo "$as_me:$LINENO: checking for libXv.so" >&5
+@@ -28719,7 +28529,7 @@
+ fi
+ fi
+
+- if ! test -z $XV_LIB; then
++ if ! test x$XV_LIB = x; then
+
+ echo "$as_me:$LINENO: checking for XvShmCreateImage in -lXv" >&5
+ echo $ECHO_N "checking for XvShmCreateImage in -lXv... $ECHO_C" >&6
+@@ -28816,17 +28626,6 @@
+ fi
+
+
+-
+-
+-if test x$ac_have_xv = "xyes"; then
+- HAVE_XV_TRUE=
+- HAVE_XV_FALSE='#'
+-else
+- HAVE_XV_TRUE='#'
+- HAVE_XV_FALSE=
+-fi
+-
+-
+ if test x$ac_have_xv = "xyes"; then
+ EXTRA_X_LIBS="-L$xv_path $XV_LIB -lXext"
+ EXTRA_X_CFLAGS=""
+@@ -28837,10 +28636,19 @@
+
+ fi
+
++fi
++
+
++if test x$ac_have_xv = "xyes"; then
++ HAVE_XV_TRUE=
++ HAVE_XV_FALSE='#'
++else
++ HAVE_XV_TRUE='#'
++ HAVE_XV_FALSE=
+ fi
+
+
++
+ host_or_hostalias="$host"
+ if test "$host_or_hostalias" = ""; then
+ host_or_hostalias="$host_alias"
+@@ -30145,6 +29953,15 @@
+
+
+
++# Check whether --enable-aalib or --disable-aalib was given.
++if test "${enable_aalib+set}" = set; then
++ enableval="$enable_aalib"
++ disable_aalib=yes
++else
++ disable_aalib=no
++fi;
++
++if test x$disable_aalib = "xno"; then
+
+ # Check whether --with-aalib-prefix or --without-aalib-prefix was given.
+ if test "${with_aalib_prefix+set}" = set; then
+@@ -30621,6 +30438,8 @@
+
+ rm -f conf.aalibtest
+
++fi
++
+
+
+ if test x$no_aalib != "xyes"; then
+@@ -30634,7 +30453,6 @@
+
+
+
+-
+ # Check whether --with-caca-prefix or --without-caca-prefix was given.
+ if test "${with_caca_prefix+set}" = set; then
+ withval="$with_caca_prefix"
+@@ -37824,7 +37642,7 @@
+ if test x"$internal_vcdnav" = "xno" && test x"$PKG_CONFIG" != "xno" ; then
+ echo "$as_me:$LINENO: checking for libcdio" >&5
+ echo $ECHO_N "checking for libcdio... $ECHO_C" >&6
+- if $PKG_CONFIG --atleast-version 0.64 libcdio; then
++ if $PKG_CONFIG --atleast-version 0.71 libcdio; then
+ echo "$as_me:$LINENO: result: found" >&5
+ echo "${ECHO_T}found" >&6
+ LIBCDIO_CFLAGS=`$PKG_CONFIG --cflags libcdio`
+@@ -37832,7 +37650,7 @@
+
+ echo "$as_me:$LINENO: checking for libvcdinfo" >&5
+ echo $ECHO_N "checking for libvcdinfo... $ECHO_C" >&6
+- if $PKG_CONFIG --atleast-version 0.7.19-cdio libvcdinfo; then
++ if $PKG_CONFIG --atleast-version 0.7.21 libvcdinfo; then
+ echo "$as_me:$LINENO: result: found" >&5
+ echo "${ECHO_T}found" >&6
+ LIBVCDINFO_CFLAGS=`$PKG_CONFIG --cflags libvcdinfo`
+@@ -41979,8 +41797,7 @@
+
+
+
+-
+-for ac_func in basename gettimeofday hstrerror setenv strndup strpbrk strsep strtok_r
++for ac_func in basename gettimeofday setenv strndup strpbrk strsep strtok_r
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -42092,6 +41909,127 @@
+
+
+
++cat >conftest.$ac_ext <<_ACEOF
++#include <netdb.h>
++int main(void) {
++ hstrerror(0);
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_function_system_hstrerror="yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++echo "$as_me:$LINENO: checking for hstrerror in -lresolv" >&5
++echo $ECHO_N "checking for hstrerror in -lresolv... $ECHO_C" >&6
++if test "${ac_cv_lib_resolv_hstrerror+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char hstrerror ();
++int
++main ()
++{
++hstrerror ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_lib_resolv_hstrerror=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_resolv_hstrerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_hstrerror" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_hstrerror" >&6
++if test $ac_cv_lib_resolv_hstrerror = yes; then
++ ac_cv_function_system_hstrerror="yes"
++fi
++
++if test x"$ac_cv_function_system_hstrerror" = "xyes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_HSTRERROR 1
++_ACEOF
++
++else
++ case $LIBOBJS in
++ "hstrerror.$ac_objext" | \
++ *" hstrerror.$ac_objext" | \
++ "hstrerror.$ac_objext "* | \
++ *" hstrerror.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS hstrerror.$ac_objext" ;;
++esac
++
++fi
++
++
++
+
+
+
+@@ -43942,34 +43880,18 @@
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+
+ am_cv_OBJC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ echo '#include "conftest.h"' > conftest.c
++ echo 'int i;' > conftest.h
++ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+@@ -43987,25 +43909,13 @@
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ source=conftest.c object=conftest.o \
++ depfile=conftest.Po tmpdepfile=conftest.TPo \
++ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
++ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_OBJC_dependencies_compiler_type=$depmode
+- break
+- fi
++ am_cv_OBJC_dependencies_compiler_type=$depmode
++ break
+ fi
+ done
+
+@@ -44022,21 +43932,9 @@
+
+
+
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then
+- am__fastdepOBJC_TRUE=
+- am__fastdepOBJC_FALSE='#'
+-else
+- am__fastdepOBJC_TRUE='#'
+- am__fastdepOBJC_FALSE=
+-fi
+-
+
+
+-
+-
+- ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h intl/Makefile lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libavcodec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/xine-engine/xineintl.h win32/Makefile win32/contrib/Makefile win32/contrib/pthreads/Makefile win32/contrib/zlib/Makefile win32/include/Makefile"
++ ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h intl/Makefile lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libavcodec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/xine-engine/xineintl.h src/vdr/Makefile win32/Makefile win32/contrib/Makefile win32/contrib/pthreads/Makefile win32/contrib/zlib/Makefile win32/include/Makefile"
+
+ ac_config_commands="$ac_config_commands default"
+
+@@ -44131,31 +44029,17 @@
+ LTLIBOBJS=$ac_ltlibobjs
+
+
+-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
++echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -44579,13 +44463,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepOBJC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+@@ -45088,6 +44965,8 @@
+ "src/liblpcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/liblpcm/Makefile" ;;
+ "src/libmad/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmad/Makefile" ;;
+ "src/libmpeg2/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmpeg2/Makefile" ;;
++ "src/libmusepack/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmusepack/Makefile" ;;
++ "src/libmusepack/musepack/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmusepack/musepack/Makefile" ;;
+ "src/libspudec/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libspudec/Makefile" ;;
+ "src/libspucc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libspucc/Makefile" ;;
+ "src/libspucmml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libspucmml/Makefile" ;;
+@@ -45127,6 +45006,7 @@
+ "src/xine-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;;
+ "src/xine-engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;;
+ "src/xine-engine/xineintl.h" ) CONFIG_FILES="$CONFIG_FILES src/xine-engine/xineintl.h" ;;
++ "src/vdr/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/vdr/Makefile" ;;
+ "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
+ "win32/contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/contrib/Makefile" ;;
+ "win32/contrib/pthreads/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/contrib/pthreads/Makefile" ;;
+@@ -45223,14 +45103,17 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
+ s,@XINE_MAJOR@,$XINE_MAJOR,;t t
+ s,@XINE_MINOR@,$XINE_MINOR,;t t
+ s,@XINE_SUB@,$XINE_SUB,;t t
+ s,@XINE_IFACE_AGE@,$XINE_IFACE_AGE,;t t
+ s,@XINE_BIN_AGE@,$XINE_BIN_AGE,;t t
+-s,@LT_CURRENT@,$LT_CURRENT,;t t
+-s,@LT_REVISION@,$LT_REVISION,;t t
+-s,@LT_AGE@,$LT_AGE,;t t
++s,@XINE_LT_CURRENT@,$XINE_LT_CURRENT,;t t
++s,@XINE_LT_REVISION@,$XINE_LT_REVISION,;t t
++s,@XINE_LT_AGE@,$XINE_LT_AGE,;t t
+ s,@TAR_NAME@,$TAR_NAME,;t t
+ s,@SPEC_VERSION@,$SPEC_VERSION,;t t
+ s,@LIBNAME@,$LIBNAME,;t t
+@@ -45249,7 +45132,6 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@CYGPATH_W@,$CYGPATH_W,;t t
+ s,@PACKAGE@,$PACKAGE,;t t
+ s,@VERSION@,$VERSION,;t t
+ s,@ACLOCAL@,$ACLOCAL,;t t
+@@ -45257,17 +45139,13 @@
+ s,@AUTOMAKE@,$AUTOMAKE,;t t
+ s,@AUTOHEADER@,$AUTOHEADER,;t t
+ s,@MAKEINFO@,$MAKEINFO,;t t
++s,@AMTAR@,$AMTAR,;t t
+ s,@install_sh@,$install_sh,;t t
+ s,@STRIP@,$STRIP,;t t
+ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+ s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s,@mkdir_p@,$mkdir_p,;t t
+ s,@AWK@,$AWK,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+-s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@AMTAR@,$AMTAR,;t t
+-s,@am__tar@,$am__tar,;t t
+-s,@am__untar@,$am__untar,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+@@ -45282,8 +45160,6 @@
+ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+ s,@CCDEPMODE@,$CCDEPMODE,;t t
+-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+ s,@CPP@,$CPP,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@LN_S@,$LN_S,;t t
+@@ -45305,8 +45181,6 @@
+ s,@CXXFLAGS@,$CXXFLAGS,;t t
+ s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+ s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+ s,@CXXCPP@,$CXXCPP,;t t
+ s,@F77@,$F77,;t t
+ s,@FFLAGS@,$FFLAGS,;t t
+@@ -45381,11 +45255,11 @@
+ s,@HAVE_SYNCFB_FALSE@,$HAVE_SYNCFB_FALSE,;t t
+ s,@HAVE_V4L_TRUE@,$HAVE_V4L_TRUE,;t t
+ s,@HAVE_V4L_FALSE@,$HAVE_V4L_FALSE,;t t
+-s,@HAVE_XV_TRUE@,$HAVE_XV_TRUE,;t t
+-s,@HAVE_XV_FALSE@,$HAVE_XV_FALSE,;t t
+ s,@XV_LIB@,$XV_LIB,;t t
+ s,@EXTRA_X_LIBS@,$EXTRA_X_LIBS,;t t
+ s,@EXTRA_X_CFLAGS@,$EXTRA_X_CFLAGS,;t t
++s,@HAVE_XV_TRUE@,$HAVE_XV_TRUE,;t t
++s,@HAVE_XV_FALSE@,$HAVE_XV_FALSE,;t t
+ s,@PPC_ARCH_TRUE@,$PPC_ARCH_TRUE,;t t
+ s,@PPC_ARCH_FALSE@,$PPC_ARCH_FALSE,;t t
+ s,@HAVE_VLDXVMC_TRUE@,$HAVE_VLDXVMC_TRUE,;t t
+@@ -45601,10 +45475,9 @@
+ s,@FIG2DEV@,$FIG2DEV,;t t
+ s,@HAVE_FIG2DEV_TRUE@,$HAVE_FIG2DEV_TRUE,;t t
+ s,@HAVE_FIG2DEV_FALSE@,$HAVE_FIG2DEV_FALSE,;t t
++s,@mkdir_p@,$mkdir_p,;t t
+ s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
+ s,@OBJCDEPMODE@,$OBJCDEPMODE,;t t
+-s,@am__fastdepOBJC_TRUE@,$am__fastdepOBJC_TRUE,;t t
+-s,@am__fastdepOBJC_FALSE@,$am__fastdepOBJC_FALSE,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+
+@@ -46066,29 +45939,13 @@
+ cat $tmp/config.h
+ rm -f $tmp/config.h
+ fi
+-# Compute $ac_file's index in $config_headers.
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $ac_file | $ac_file:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ # Run the commands associated with the file.
++ case $ac_file in
++ config.h ) # update the timestamp
++echo 'timestamp for config.h' >"./stamp-h1"
++ ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
+-echo X$ac_file |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+
+@@ -46371,21 +46228,27 @@
+ else
+ continue
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
++ # Extract the definition of DEP_FILES from the Makefile without
++ # running `make'.
++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ U=`sed -n -e '/^U = / s///p' < "$mf"`
++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++ # We invoke sed twice because it is the simplest approach to
++ # changing $(DEPDIR) to its actual value in the expansion.
++ for file in `sed -n -e '
++ /^DEP_FILES = .*\\\\$/ {
++ s/^DEP_FILES = //
++ :loop
++ s/\\\\$//
++ p
++ n
++ /\\\\$/ b loop
++ p
++ }
++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+@@ -46530,7 +46393,7 @@
+ echo " - stdin_fifo - rtp"
+ echo " - http - mms"
+ echo " - pnm - rtsp"
+-echo " - dvb"
++echo " - dvb - vdr"
+ if test x"$external_dvdnav" = "xyes"; then
+ echo " - dvd (external libs)"
+ else
+@@ -46676,6 +46539,7 @@
+ echo " - eq - eq2"
+ echo " - boxblur - denoise3d"
+ echo " - unsharp - tvtime"
++echo " - vdr"
+ echo " * SFX:"
+ echo " - goom - oscope"
+ echo " - fftscope - mosaico"
+diff -urNad xine-lib-vdr-1.0/doc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/Makefile.in
+--- xine-lib-vdr-1.0/doc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,87 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(docsdir)"
+-docsDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(docs_DATA)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -101,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -121,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -147,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -176,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -305,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -320,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -334,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -348,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -372,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -409,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -424,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -441,99 +271,45 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = man hackersguide faq
++
+ docs_DATA = README README.dvb README.dxr3 \
+ README.freebsd README.irix README.network_dvd README.opengl \
+ README.solaris README.syncfb README_xxmc.html
+
++
+ EXTRA_DIST = $(docs_DATA)
++
+ docsdir = $(prefix)/share/doc/xine
++subdir = doc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(docs_DATA)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = README Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -544,22 +320,23 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++docsDATA_INSTALL = $(INSTALL_DATA)
+ install-docsDATA: $(docs_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docsdir)" || $(mkdir_p) "$(DESTDIR)$(docsdir)"
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
+ @list='$(docs_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
+- $(docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f"; \
++ $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f; \
+ done
+
+ uninstall-docsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(docs_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(docsdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(docsdir)/$$f"; \
++ rm -f $(DESTDIR)$(docsdir)/$$f; \
+ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -616,10 +393,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -629,23 +407,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -654,24 +423,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -680,22 +433,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -710,17 +460,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -730,9 +478,8 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(docsdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -744,20 +491,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -765,8 +512,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -784,41 +529,34 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-docsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-docsDATA \
+- install-exec install-exec-am install-info install-info-am \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-docsDATA uninstall-hook \
+- uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-docsDATA install-exec \
++ install-exec-am install-exec-recursive install-info \
++ install-info-am install-info-recursive install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
++ uninstall uninstall-am uninstall-docsDATA uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/doc/faq/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/faq/Makefile.in
+--- xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/faq/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,78 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = doc/faq
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(docsdir)"
+-docsDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(docs_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -92,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -112,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -138,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -167,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -296,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -311,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -325,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -339,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -363,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -400,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -415,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -432,95 +271,34 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ docs_DATA = faq.html faq.txt
++
+ EXTRA_DIST = README faq.sgml $(docs_DATA)
++
+ docsdir = $(prefix)/share/doc/xine/faq
++subdir = doc/faq
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(docs_DATA)
++
++DIST_COMMON = README Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/faq/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/faq/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -531,44 +309,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++docsDATA_INSTALL = $(INSTALL_DATA)
+ install-docsDATA: $(docs_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docsdir)" || $(mkdir_p) "$(DESTDIR)$(docsdir)"
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
+ @list='$(docs_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
+- $(docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f"; \
++ $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f; \
+ done
+
+ uninstall-docsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(docs_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(docsdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(docsdir)/$$f"; \
++ rm -f $(DESTDIR)$(docsdir)/$$f; \
+ done
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -584,15 +357,15 @@
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$(top_distdir)" distdir="$(distdir)" \
++ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(docsdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -604,20 +377,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-local
+
+@@ -625,8 +398,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -644,35 +415,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-docsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+- dist-hook distclean distclean-generic distclean-libtool \
+- distclean-local distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-docsDATA install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-docsDATA uninstall-hook \
++ distclean distclean-generic distclean-libtool distclean-local \
++ distdir dvi dvi-am info info-am install install-am install-data \
++ install-data-am install-docsDATA install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-docsDATA \
+ uninstall-info-am
+
+
+diff -urNad xine-lib-vdr-1.0/doc/hackersguide/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in
+--- xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/hackersguide/Makefile.in 2005-02-13 01:07:52.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,78 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = doc/hackersguide
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(docsdir)"
+-docsDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(docs_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -92,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -112,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -138,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -167,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -296,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -311,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -325,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -339,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -363,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -400,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -415,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -432,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ hackersguide_sgml = hackersguide.sgml \
+ intro.sgml \
+ library.sgml \
+@@ -494,45 +286,32 @@
+ stream.sgml \
+ output.sgml
+
++
+ docs_DATA = hackersguide.html \
+ architecture.png library.png overlays.png post_frame.png
+
++
+ EXTRA_DIST = README $(hackersguide_sgml) \
+ architecture.fig library.fig overlays.fig post_frame.fig $(docs_DATA)
+
++
+ docsdir = $(prefix)/share/doc/xine/hackersguide
++subdir = doc/hackersguide
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(docs_DATA)
++
++DIST_COMMON = README Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/hackersguide/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/hackersguide/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -543,44 +322,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++docsDATA_INSTALL = $(INSTALL_DATA)
+ install-docsDATA: $(docs_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docsdir)" || $(mkdir_p) "$(DESTDIR)$(docsdir)"
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
+ @list='$(docs_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
+- $(docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f"; \
++ $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f; \
+ done
+
+ uninstall-docsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(docs_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(docsdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(docsdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(docsdir)/$$f"; \
++ rm -f $(DESTDIR)$(docsdir)/$$f; \
+ done
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -596,15 +370,15 @@
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$(top_distdir)" distdir="$(distdir)" \
++ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(docsdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(docsdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -616,20 +390,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-local
+
+@@ -637,8 +411,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -656,35 +428,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-docsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+- dist-hook distclean distclean-generic distclean-libtool \
+- distclean-local distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-docsDATA install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-docsDATA uninstall-hook \
++ distclean distclean-generic distclean-libtool distclean-local \
++ distdir dvi dvi-am info info-am install install-am install-data \
++ install-data-am install-docsDATA install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-docsDATA \
+ uninstall-info-am
+
+
+diff -urNad xine-lib-vdr-1.0/doc/man/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/Makefile.in
+--- xine-lib-vdr-1.0/doc/man/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,77 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = doc/man
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -91,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -111,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -137,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -166,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -295,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -310,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -324,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -338,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -362,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -399,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -414,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -431,93 +271,34 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = en
++subdir = doc/man
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/man/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -583,10 +364,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -596,23 +378,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -621,24 +394,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -647,22 +404,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -677,17 +431,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -697,6 +449,7 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -708,20 +461,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -729,8 +482,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -748,40 +499,33 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/doc/man/en/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/en/Makefile.in
+--- xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/doc/man/en/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = doc/man/en
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-man1dir = $(mandir)/man1
+-am__installdirs = "$(DESTDIR)$(man1dir)"
+-NROFF = nroff
+-MANS = $(man_MANS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,94 +271,33 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ man_MANS = xine-config.1
++
+ EXTRA_DIST = $(man_MANS)
++subdir = doc/man/en
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++NROFF = nroff
++MANS = $(man_MANS)
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/en/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/man/en/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -524,9 +308,11 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++ $(mkinstalldirs) $(DESTDIR)$(man1dir)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -545,8 +331,8 @@
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ done
+ uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+@@ -559,37 +345,27 @@
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 1*) ;; \
+- *) ext='1' ;; \
+- esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++ echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++ rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ done
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -607,10 +383,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(MANS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(man1dir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(man1dir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -622,28 +398,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -661,21 +435,13 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-man
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+@@ -684,14 +450,13 @@
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-man1 install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-man uninstall-man1
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man1 install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
++ uninstall-man uninstall-man1
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/include/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/include/Makefile.in
+--- xine-lib-vdr-1.0/include/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/include/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,79 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-subdir = include
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(srcdir)/xine.h.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-SOURCES =
+-DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(includedir)"
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -93,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -113,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -139,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -168,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -297,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -312,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -326,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -340,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -364,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -401,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -416,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -433,95 +271,32 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ EXTRA_DIST = xine.h.in
++
+ include_HEADERS = xine.h
++
+ CONFIG_CLEAN_FILES = xine.h
++subdir = include
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++DIST_SOURCES =
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in xine.h.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu include/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-xine.h: $(top_builddir)/config.status $(srcdir)/xine.h.in
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++xine.h: $(top_builddir)/config.status xine.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
+@@ -533,24 +308,30 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ done
+
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+- rm -f "$(DESTDIR)$(includedir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++ rm -f $(DESTDIR)$(includedir)/$$f; \
+ done
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -559,7 +340,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -571,24 +351,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -597,21 +361,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -629,10 +391,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -644,20 +406,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -665,8 +427,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -682,34 +442,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-exec \
+- install-exec-am install-includeHEADERS install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-data-local \
++ install-exec install-exec-am install-includeHEADERS \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-includeHEADERS uninstall-info-am
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-includeHEADERS uninstall-info-am
+
+
+ debug:
+diff -urNad xine-lib-vdr-1.0/lib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/lib/Makefile.in
+--- xine-lib-vdr-1.0/lib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/lib/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,100 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libxineposix_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common basename.c gettimeofday.c \
+- hstrerror.c setenv.c strndup.c strpbrk.c strsep.c strtok_r.c
+-subdir = lib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libxineposix_la_DEPENDENCIES = @LTLIBOBJS@
+-am_libxineposix_la_OBJECTS =
+-libxineposix_la_OBJECTS = $(am_libxineposix_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libxineposix_la_SOURCES)
+-DIST_SOURCES = $(libxineposix_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(includedir)"
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -114,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -134,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -160,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -189,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -318,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -333,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -347,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -361,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -385,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -422,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -437,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -454,105 +271,77 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = Makefile.common
++
+ noinst_LTLIBRARIES = libxineposix.la
++
+ noinst_HEADERS = os_internal.h
++
+ include_HEADERS = os_types.h
++
+ libxineposix_la_SOURCES =
+ libxineposix_la_LIBADD = @LTLIBOBJS@
++subdir = lib
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libxineposix_la_LDFLAGS =
++libxineposix_la_DEPENDENCIES = @LTLIBOBJS@
++am_libxineposix_la_OBJECTS =
++libxineposix_la_OBJECTS = $(am_libxineposix_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/basename.Plo \
++@AMDEP_TRUE@ $(DEPDIR)/gettimeofday.Plo $(DEPDIR)/hstrerror.Plo \
++@AMDEP_TRUE@ $(DEPDIR)/setenv.Plo $(DEPDIR)/strndup.Plo \
++@AMDEP_TRUE@ $(DEPDIR)/strpbrk.Plo $(DEPDIR)/strsep.Plo \
++@AMDEP_TRUE@ $(DEPDIR)/strtok_r.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libxineposix_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in basename.c gettimeofday.c hstrerror.c setenv.c \
++ strndup.c strpbrk.c strsep.c strtok_r.c
++SOURCES = $(libxineposix_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu lib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -560,7 +349,7 @@
+ $(LINK) $(libxineposix_la_LDFLAGS) $(libxineposix_la_OBJECTS) $(libxineposix_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -574,26 +363,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtok_r.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf $(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -604,6 +394,12 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -613,7 +409,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -625,24 +420,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -651,22 +430,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -684,10 +460,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -699,31 +475,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf $(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -741,8 +514,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf $(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -750,31 +522,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-man install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-includeHEADERS \
+- uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-includeHEADERS \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-includeHEADERS uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/m4/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/m4/Makefile.in
+--- xine-lib-vdr-1.0/m4/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/m4/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,78 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = m4
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(m4datadir)"
+-m4dataDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(m4data_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -92,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -112,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -138,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -167,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -296,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -311,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -325,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -339,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -363,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -400,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -415,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -432,63 +271,18 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+-@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
++
+ @INSTALL_M4_TRUE@m4datadir = $(ACLOCAL_DIR)
++@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
++
+ m4data_DATA = xine.m4
++
+ EXTRA_DIST = \
+ aa.m4 \
+ alsa.m4 \
+@@ -522,38 +316,22 @@
+ _xine.m4 \
+ xv.m4
+
++subdir = m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(m4data_DATA)
++
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu m4/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -564,44 +342,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++m4dataDATA_INSTALL = $(INSTALL_DATA)
+ install-m4dataDATA: $(m4data_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
++ $(mkinstalldirs) $(DESTDIR)$(m4datadir)
+ @list='$(m4data_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
+- $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
++ $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
+ done
+
+ uninstall-m4dataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(m4data_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
+- rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \
++ rm -f $(DESTDIR)$(m4datadir)/$$f; \
+ done
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -619,10 +392,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(m4datadir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(m4datadir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -634,28 +407,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -673,35 +444,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-m4dataDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am \
+- install-m4dataDATA install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-m4dataDATA install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-hook uninstall-info-am uninstall-m4dataDATA
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am \
++ uninstall-m4dataDATA
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/misc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/Makefile.in
+--- xine-lib-vdr-1.0/misc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,94 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(srcdir)/SlackBuild.in $(srcdir)/build_rpms.sh.in \
+- $(srcdir)/libxine.pc.in $(srcdir)/relchk.sh.in \
+- $(srcdir)/xine-config.in $(srcdir)/xine-lib.spec.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = misc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = SlackBuild build_rpms.sh libxine.pc relchk.sh \
+- xine-config xine-lib.spec
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(bin_SCRIPTS)
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pkgconfig_DATA)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -108,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -128,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -154,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -183,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -312,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -327,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -341,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -355,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -379,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -416,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -431,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -448,61 +271,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = fonts
++
+ EXTRA_DIST = build_rpms.sh \
+ cdda_server.c \
+ SlackBuild.in \
+@@ -515,62 +292,59 @@
+ libdvdcss-1.2.6-network.patch \
+ Makefile.common
+
++
+ bin_SCRIPTS = xine-config
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libxine.pc
++subdir = misc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES = SlackBuild build_rpms.sh libxine.pc relchk.sh \
++ xine-config xine-lib.spec
++SCRIPTS = $(bin_SCRIPTS)
++
++DIST_SOURCES =
++DATA = $(pkgconfig_DATA)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in SlackBuild.in build_rpms.sh.in \
++ libxine.pc.in relchk.sh.in xine-config.in xine-lib.spec.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu misc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-SlackBuild: $(top_builddir)/config.status $(srcdir)/SlackBuild.in
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++SlackBuild: $(top_builddir)/config.status SlackBuild.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-build_rpms.sh: $(top_builddir)/config.status $(srcdir)/build_rpms.sh.in
++build_rpms.sh: $(top_builddir)/config.status build_rpms.sh.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-libxine.pc: $(top_builddir)/config.status $(srcdir)/libxine.pc.in
++libxine.pc: $(top_builddir)/config.status libxine.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-relchk.sh: $(top_builddir)/config.status $(srcdir)/relchk.sh.in
++relchk.sh: $(top_builddir)/config.status relchk.sh.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-xine-config: $(top_builddir)/config.status $(srcdir)/xine-config.in
++xine-config: $(top_builddir)/config.status xine-config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-xine-lib.spec: $(top_builddir)/config.status $(srcdir)/xine-lib.spec.in
++xine-lib.spec: $(top_builddir)/config.status xine-lib.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ else :; fi; \
+ done
+
+@@ -578,8 +352,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bindir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
+ mostlyclean-libtool:
+@@ -591,22 +365,23 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
++ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
+ done
+
+ uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
++ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
+ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -663,10 +438,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -676,23 +452,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -701,24 +468,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -727,22 +478,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -757,17 +505,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -777,9 +523,8 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -791,20 +536,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -812,8 +557,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -831,21 +574,13 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
+ uninstall-pkgconfigDATA
+ @$(NORMAL_INSTALL)
+@@ -853,20 +588,22 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-binSCRIPTS \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-pkgconfigDATA install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook \
+- uninstall-info-am uninstall-pkgconfigDATA
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-binSCRIPTS \
++ install-data install-data-am install-data-recursive \
++ install-exec install-exec-am install-exec-recursive \
++ install-info install-info-am install-info-recursive install-man \
++ install-pkgconfigDATA install-recursive install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ installdirs-recursive maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
++ uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
++ uninstall-info-recursive uninstall-pkgconfigDATA \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/misc/fonts/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/fonts/Makefile.in
+--- xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/misc/fonts/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,78 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = misc/fonts
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(datadir)"
+-dataDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(data_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++datadir = $(XINE_FONTDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -92,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -112,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -138,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -167,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -296,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -311,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -325,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -339,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -363,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -400,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -415,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -432,58 +272,10 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = $(XINE_FONTDIR)
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+ data_DATA = \
+@@ -529,38 +321,22 @@
+ # font used for osd
+ #
+ EXTRA_DIST = cetus.ttf README.cetus $(data_DATA)
++subdir = misc/fonts
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DATA = $(data_DATA)
++
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/fonts/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu misc/fonts/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -571,44 +347,39 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++dataDATA_INSTALL = $(INSTALL_DATA)
+ install-dataDATA: $(data_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
++ $(mkinstalldirs) $(DESTDIR)$(datadir)
+ @list='$(data_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
+- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
++ $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \
+ done
+
+ uninstall-dataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(data_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
+- rm -f "$(DESTDIR)$(datadir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
++ rm -f $(DESTDIR)$(datadir)/$$f; \
+ done
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -626,10 +397,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(datadir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(datadir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -641,28 +412,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -680,35 +449,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-dataDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook \
+- install-dataDATA install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-dataDATA install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-dataDATA uninstall-hook uninstall-info-am
++ mostlyclean-libtool uninstall uninstall-am uninstall-dataDATA \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/mkinstalldirs /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/mkinstalldirs
+--- xine-lib-vdr-1.0/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/mkinstalldirs 2005-02-13 01:07:33.000000000 +0000
+@@ -0,0 +1,99 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain
++
++errstatus=0
++dirmode=""
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++
++# process command line arguments
++while test $# -gt 0 ; do
++ case "${1}" in
++ -h | --help | --h* ) # -h for help
++ echo "${usage}" 1>&2; exit 0 ;;
++ -m ) # -m PERM arg
++ shift
++ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
++ dirmode="${1}"
++ shift ;;
++ -- ) shift; break ;; # stop option processing
++ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
++ * ) break ;; # first non-opt arg
++ esac
++done
++
++for file
++do
++ if test -d "$file"; then
++ shift
++ else
++ break
++ fi
++done
++
++case $# in
++0) exit 0 ;;
++esac
++
++case $dirmode in
++'')
++ if mkdir -p -- . 2>/dev/null; then
++ echo "mkdir -p -- $*"
++ exec mkdir -p -- "$@"
++ fi ;;
++*)
++ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++ echo "mkdir -m $dirmode -p -- $*"
++ exec mkdir -m "$dirmode" -p -- "$@"
++ fi ;;
++esac
++
++for file
++do
++ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++ shift
++
++ pathcomp=
++ for d
++ do
++ pathcomp="$pathcomp$d"
++ case "$pathcomp" in
++ -* ) pathcomp=./$pathcomp ;;
++ esac
++
++ if test ! -d "$pathcomp"; then
++ echo "mkdir $pathcomp"
++
++ mkdir "$pathcomp" || lasterr=$?
++
++ if test ! -d "$pathcomp"; then
++ errstatus=$lasterr
++ else
++ if test ! -z "$dirmode"; then
++ echo "chmod $dirmode $pathcomp"
++
++ lasterr=""
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
++ fi
++ fi
++
++ pathcomp="$pathcomp/"
++ done
++done
++
++exit $errstatus
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 3
++# End:
++# mkinstalldirs ends here
+diff -urNad xine-lib-vdr-1.0/src/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/Makefile.in
+--- xine-lib-vdr-1.0/src/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,77 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -91,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -111,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -137,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -166,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -295,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -310,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -324,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -338,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -362,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -399,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -414,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -431,58 +271,10 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+
+@@ -515,40 +307,30 @@
+ libreal \
+ libfaad \
+ libflac \
+- post
++ libmusepack \
++ post \
++ vdr
+
++subdir = src
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -614,10 +396,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -627,23 +410,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -652,24 +426,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -678,22 +436,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -708,17 +463,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -728,6 +481,7 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -739,20 +493,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -760,8 +514,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -779,40 +531,33 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/audio_out/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/audio_out/Makefile.in
+--- xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/audio_out/Makefile.in 2005-02-13 01:07:53.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,168 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) $(xineplug_ao_out_arts_la_SOURCES) $(xineplug_ao_out_coreaudio_la_SOURCES) $(xineplug_ao_out_directx_la_SOURCES) $(xineplug_ao_out_esd_la_SOURCES) $(xineplug_ao_out_file_la_SOURCES) $(xineplug_ao_out_none_la_SOURCES) $(xineplug_ao_out_oss_la_SOURCES) $(xineplug_ao_out_polypaudio_la_SOURCES) $(xineplug_ao_out_sun_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/audio_out
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_ao_out_alsa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_alsa_la_OBJECTS = audio_alsa_out.lo
+-xineplug_ao_out_alsa_la_OBJECTS = \
+- $(am_xineplug_ao_out_alsa_la_OBJECTS)
+-@HAVE_ALSA09_TRUE@@HAVE_ALSA_TRUE@am_xineplug_ao_out_alsa_la_rpath = \
+-@HAVE_ALSA09_TRUE@@HAVE_ALSA_TRUE@ -rpath $(libdir)
+-xineplug_ao_out_arts_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_ao_out_arts_la_OBJECTS = audio_arts_out.lo
+-xineplug_ao_out_arts_la_OBJECTS = \
+- $(am_xineplug_ao_out_arts_la_OBJECTS)
+-@HAVE_ARTS_TRUE@am_xineplug_ao_out_arts_la_rpath = -rpath $(libdir)
+-xineplug_ao_out_coreaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_coreaudio_la_OBJECTS = \
+- xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo
+-xineplug_ao_out_coreaudio_la_OBJECTS = \
+- $(am_xineplug_ao_out_coreaudio_la_OBJECTS)
+-@HAVE_COREAUDIO_TRUE@am_xineplug_ao_out_coreaudio_la_rpath = -rpath \
+-@HAVE_COREAUDIO_TRUE@ $(libdir)
+-xineplug_ao_out_directx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_directx_la_OBJECTS = \
+- xineplug_ao_out_directx_la-audio_directx_out.lo
+-xineplug_ao_out_directx_la_OBJECTS = \
+- $(am_xineplug_ao_out_directx_la_OBJECTS)
+-@HAVE_DIRECTX_TRUE@am_xineplug_ao_out_directx_la_rpath = -rpath \
+-@HAVE_DIRECTX_TRUE@ $(libdir)
+-xineplug_ao_out_esd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_esd_la_OBJECTS = audio_esd_out.lo
+-xineplug_ao_out_esd_la_OBJECTS = $(am_xineplug_ao_out_esd_la_OBJECTS)
+-@HAVE_ESD_TRUE@am_xineplug_ao_out_esd_la_rpath = -rpath $(libdir)
+-xineplug_ao_out_file_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_file_la_OBJECTS = audio_file_out.lo
+-xineplug_ao_out_file_la_OBJECTS = \
+- $(am_xineplug_ao_out_file_la_OBJECTS)
+-xineplug_ao_out_none_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_none_la_OBJECTS = audio_none_out.lo
+-xineplug_ao_out_none_la_OBJECTS = \
+- $(am_xineplug_ao_out_none_la_OBJECTS)
+-xineplug_ao_out_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_oss_la_OBJECTS = audio_oss_out.lo
+-xineplug_ao_out_oss_la_OBJECTS = $(am_xineplug_ao_out_oss_la_OBJECTS)
+-@HAVE_OSS_TRUE@am_xineplug_ao_out_oss_la_rpath = -rpath $(libdir)
+-xineplug_ao_out_polypaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_ao_out_polypaudio_la_OBJECTS = audio_polyp_out.lo
+-xineplug_ao_out_polypaudio_la_OBJECTS = \
+- $(am_xineplug_ao_out_polypaudio_la_OBJECTS)
+-@HAVE_POLYPAUDIO_TRUE@am_xineplug_ao_out_polypaudio_la_rpath = -rpath \
+-@HAVE_POLYPAUDIO_TRUE@ $(libdir)
+-xineplug_ao_out_sun_la_LIBADD =
+-am_xineplug_ao_out_sun_la_OBJECTS = audio_sun_out.lo
+-xineplug_ao_out_sun_la_OBJECTS = $(am_xineplug_ao_out_sun_la_OBJECTS)
+-@HAVE_SUNAUDIO_TRUE@am_xineplug_ao_out_sun_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
+- $(xineplug_ao_out_arts_la_SOURCES) \
+- $(xineplug_ao_out_coreaudio_la_SOURCES) \
+- $(xineplug_ao_out_directx_la_SOURCES) \
+- $(xineplug_ao_out_esd_la_SOURCES) \
+- $(xineplug_ao_out_file_la_SOURCES) \
+- $(xineplug_ao_out_none_la_SOURCES) \
+- $(xineplug_ao_out_oss_la_SOURCES) \
+- $(xineplug_ao_out_polypaudio_la_SOURCES) \
+- $(xineplug_ao_out_sun_la_SOURCES)
+-DIST_SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
+- $(xineplug_ao_out_arts_la_SOURCES) \
+- $(xineplug_ao_out_coreaudio_la_SOURCES) \
+- $(xineplug_ao_out_directx_la_SOURCES) \
+- $(xineplug_ao_out_esd_la_SOURCES) \
+- $(xineplug_ao_out_file_la_SOURCES) \
+- $(xineplug_ao_out_none_la_SOURCES) \
+- $(xineplug_ao_out_oss_la_SOURCES) \
+- $(xineplug_ao_out_polypaudio_la_SOURCES) \
+- $(xineplug_ao_out_sun_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -182,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -202,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -228,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -257,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -386,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -401,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -415,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -429,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -453,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -490,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -505,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -522,75 +272,38 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) \
+ $(POLYPAUDIO_CFLAGS)
+
++
+ EXTRA_DIST = audio_irixal_out.c
++
+ @HAVE_OSS_TRUE@oss_module = xineplug_ao_out_oss.la
++
+ @HAVE_ALSA09_TRUE@@HAVE_ALSA_TRUE@alsa_module = xineplug_ao_out_alsa.la
++
+ @HAVE_ESD_TRUE@esd_module = xineplug_ao_out_esd.la
++
+ @HAVE_SUNAUDIO_TRUE@sun_module = xineplug_ao_out_sun.la
+
++
+ #if HAVE_IRIXAL
+ #irixal_module = xineplug_ao_out_irixal.la
+ #endif
+ @HAVE_ARTS_TRUE@arts_module = xineplug_ao_out_arts.la
++
+ @HAVE_DIRECTX_TRUE@directx_module = xineplug_ao_out_directx.la
++@HAVE_DIRECTX_TRUE@directx2_module = xineplug_ao_out_directx2.la
++
+ @HAVE_COREAUDIO_TRUE@coreaudio_module = xineplug_ao_out_coreaudio.la
++
+ @HAVE_POLYPAUDIO_TRUE@polypaudio_module = xineplug_ao_out_polypaudio.la
+
+ # IMPORTANT:
+@@ -606,7 +319,9 @@
+ $(esd_module) \
+ $(directx_module) \
+ $(coreaudio_module) \
+- $(polypaudio_module)
++ $(polypaudio_module) \
++ $(directx2_module)
++
+
+
+ #lib_LTLIBRARIES = \
+@@ -619,31 +334,39 @@
+ xineplug_ao_out_none_la_SOURCES = audio_none_out.c
+ xineplug_ao_out_none_la_LIBADD = $(XINE_LIB)
+ xineplug_ao_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_file_la_SOURCES = audio_file_out.c
+ xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
+ xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
+ xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
+ xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
+ xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
+ xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c
+ xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS) $(XINE_LIB)
+ xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
+ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+
++
+ #xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c
+ #xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
+ #xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c
+ xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
+ xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_directx_la_SOURCES = audio_directx_out.c
+ xineplug_ao_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
+ xineplug_ao_out_directx_la_LIBADD = $(DIRECTX_AUDIO_LIBS) $(XINE_LIB)
+ xineplug_ao_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_ao_out_coreaudio_la_SOURCES = audio_coreaudio_out.c
+ xineplug_ao_out_coreaudio_la_LIBADD = $(XINE_LIB)
+ # The "-Wl,-framework -Wl,..." is needed for libtool versions before
+@@ -654,98 +377,181 @@
+ -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+
+ xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework AudioUnit
++
+ xineplug_ao_out_polypaudio_la_SOURCES = audio_polyp_out.c
+ xineplug_ao_out_polypaudio_la_LIBADD = $(POLYPAUDIO_LIBS) $(XINE_LIB)
+ xineplug_ao_out_polypaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c
++xineplug_ao_out_directx2_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
++xineplug_ao_out_directx2_la_LIBADD = $(XINE_LIB) $(DIRECTX_AUDIO_LIBS)
++xineplug_ao_out_directx2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/audio_out
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_ao_out_alsa_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_alsa_la_OBJECTS = audio_alsa_out.lo
++xineplug_ao_out_alsa_la_OBJECTS = $(am_xineplug_ao_out_alsa_la_OBJECTS)
++xineplug_ao_out_arts_la_DEPENDENCIES =
++am_xineplug_ao_out_arts_la_OBJECTS = audio_arts_out.lo
++xineplug_ao_out_arts_la_OBJECTS = $(am_xineplug_ao_out_arts_la_OBJECTS)
++xineplug_ao_out_coreaudio_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_coreaudio_la_OBJECTS = \
++ xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo
++xineplug_ao_out_coreaudio_la_OBJECTS = \
++ $(am_xineplug_ao_out_coreaudio_la_OBJECTS)
++xineplug_ao_out_directx_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_directx_la_OBJECTS = audio_directx_out.lo
++xineplug_ao_out_directx_la_OBJECTS = \
++ $(am_xineplug_ao_out_directx_la_OBJECTS)
++xineplug_ao_out_directx2_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_directx2_la_OBJECTS = audio_directx2_out.lo
++xineplug_ao_out_directx2_la_OBJECTS = \
++ $(am_xineplug_ao_out_directx2_la_OBJECTS)
++xineplug_ao_out_esd_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_esd_la_OBJECTS = audio_esd_out.lo
++xineplug_ao_out_esd_la_OBJECTS = $(am_xineplug_ao_out_esd_la_OBJECTS)
++xineplug_ao_out_file_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_file_la_OBJECTS = audio_file_out.lo
++xineplug_ao_out_file_la_OBJECTS = $(am_xineplug_ao_out_file_la_OBJECTS)
++xineplug_ao_out_none_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_none_la_OBJECTS = audio_none_out.lo
++xineplug_ao_out_none_la_OBJECTS = $(am_xineplug_ao_out_none_la_OBJECTS)
++xineplug_ao_out_oss_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_oss_la_OBJECTS = audio_oss_out.lo
++xineplug_ao_out_oss_la_OBJECTS = $(am_xineplug_ao_out_oss_la_OBJECTS)
++xineplug_ao_out_polypaudio_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_ao_out_polypaudio_la_OBJECTS = audio_polyp_out.lo
++xineplug_ao_out_polypaudio_la_OBJECTS = \
++ $(am_xineplug_ao_out_polypaudio_la_OBJECTS)
++xineplug_ao_out_sun_la_LIBADD =
++am_xineplug_ao_out_sun_la_OBJECTS = audio_sun_out.lo
++xineplug_ao_out_sun_la_OBJECTS = $(am_xineplug_ao_out_sun_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_alsa_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_arts_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_directx2_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_directx_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_esd_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_file_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_none_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_oss_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_polyp_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_sun_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) \
++ $(xineplug_ao_out_arts_la_SOURCES) \
++ $(xineplug_ao_out_coreaudio_la_SOURCES) \
++ $(xineplug_ao_out_directx_la_SOURCES) \
++ $(xineplug_ao_out_directx2_la_SOURCES) \
++ $(xineplug_ao_out_esd_la_SOURCES) \
++ $(xineplug_ao_out_file_la_SOURCES) \
++ $(xineplug_ao_out_none_la_SOURCES) \
++ $(xineplug_ao_out_oss_la_SOURCES) \
++ $(xineplug_ao_out_polypaudio_la_SOURCES) \
++ $(xineplug_ao_out_sun_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_ao_out_alsa_la_SOURCES) $(xineplug_ao_out_arts_la_SOURCES) $(xineplug_ao_out_coreaudio_la_SOURCES) $(xineplug_ao_out_directx_la_SOURCES) $(xineplug_ao_out_directx2_la_SOURCES) $(xineplug_ao_out_esd_la_SOURCES) $(xineplug_ao_out_file_la_SOURCES) $(xineplug_ao_out_none_la_SOURCES) $(xineplug_ao_out_oss_la_SOURCES) $(xineplug_ao_out_polypaudio_la_SOURCES) $(xineplug_ao_out_sun_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/audio_out/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/audio_out/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_ao_out_alsa.la: $(xineplug_ao_out_alsa_la_OBJECTS) $(xineplug_ao_out_alsa_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_alsa_la_rpath) $(xineplug_ao_out_alsa_la_LDFLAGS) $(xineplug_ao_out_alsa_la_OBJECTS) $(xineplug_ao_out_alsa_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_alsa_la_LDFLAGS) $(xineplug_ao_out_alsa_la_OBJECTS) $(xineplug_ao_out_alsa_la_LIBADD) $(LIBS)
+ xineplug_ao_out_arts.la: $(xineplug_ao_out_arts_la_OBJECTS) $(xineplug_ao_out_arts_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_arts_la_rpath) $(xineplug_ao_out_arts_la_LDFLAGS) $(xineplug_ao_out_arts_la_OBJECTS) $(xineplug_ao_out_arts_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_arts_la_LDFLAGS) $(xineplug_ao_out_arts_la_OBJECTS) $(xineplug_ao_out_arts_la_LIBADD) $(LIBS)
++xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo: \
++ audio_coreaudio_out.c
+ xineplug_ao_out_coreaudio.la: $(xineplug_ao_out_coreaudio_la_OBJECTS) $(xineplug_ao_out_coreaudio_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_coreaudio_la_rpath) $(xineplug_ao_out_coreaudio_la_LDFLAGS) $(xineplug_ao_out_coreaudio_la_OBJECTS) $(xineplug_ao_out_coreaudio_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_coreaudio_la_LDFLAGS) $(xineplug_ao_out_coreaudio_la_OBJECTS) $(xineplug_ao_out_coreaudio_la_LIBADD) $(LIBS)
+ xineplug_ao_out_directx.la: $(xineplug_ao_out_directx_la_OBJECTS) $(xineplug_ao_out_directx_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_directx_la_rpath) $(xineplug_ao_out_directx_la_LDFLAGS) $(xineplug_ao_out_directx_la_OBJECTS) $(xineplug_ao_out_directx_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_directx_la_LDFLAGS) $(xineplug_ao_out_directx_la_OBJECTS) $(xineplug_ao_out_directx_la_LIBADD) $(LIBS)
++xineplug_ao_out_directx2.la: $(xineplug_ao_out_directx2_la_OBJECTS) $(xineplug_ao_out_directx2_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_directx2_la_LDFLAGS) $(xineplug_ao_out_directx2_la_OBJECTS) $(xineplug_ao_out_directx2_la_LIBADD) $(LIBS)
+ xineplug_ao_out_esd.la: $(xineplug_ao_out_esd_la_OBJECTS) $(xineplug_ao_out_esd_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_esd_la_rpath) $(xineplug_ao_out_esd_la_LDFLAGS) $(xineplug_ao_out_esd_la_OBJECTS) $(xineplug_ao_out_esd_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_esd_la_LDFLAGS) $(xineplug_ao_out_esd_la_OBJECTS) $(xineplug_ao_out_esd_la_LIBADD) $(LIBS)
+ xineplug_ao_out_file.la: $(xineplug_ao_out_file_la_OBJECTS) $(xineplug_ao_out_file_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_ao_out_file_la_LDFLAGS) $(xineplug_ao_out_file_la_OBJECTS) $(xineplug_ao_out_file_la_LIBADD) $(LIBS)
+ xineplug_ao_out_none.la: $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_ao_out_none_la_LDFLAGS) $(xineplug_ao_out_none_la_OBJECTS) $(xineplug_ao_out_none_la_LIBADD) $(LIBS)
+ xineplug_ao_out_oss.la: $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_oss_la_rpath) $(xineplug_ao_out_oss_la_LDFLAGS) $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_oss_la_LDFLAGS) $(xineplug_ao_out_oss_la_OBJECTS) $(xineplug_ao_out_oss_la_LIBADD) $(LIBS)
+ xineplug_ao_out_polypaudio.la: $(xineplug_ao_out_polypaudio_la_OBJECTS) $(xineplug_ao_out_polypaudio_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_polypaudio_la_rpath) $(xineplug_ao_out_polypaudio_la_LDFLAGS) $(xineplug_ao_out_polypaudio_la_OBJECTS) $(xineplug_ao_out_polypaudio_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_polypaudio_la_LDFLAGS) $(xineplug_ao_out_polypaudio_la_OBJECTS) $(xineplug_ao_out_polypaudio_la_LIBADD) $(LIBS)
+ xineplug_ao_out_sun.la: $(xineplug_ao_out_sun_la_OBJECTS) $(xineplug_ao_out_sun_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_ao_out_sun_la_rpath) $(xineplug_ao_out_sun_la_LDFLAGS) $(xineplug_ao_out_sun_la_OBJECTS) $(xineplug_ao_out_sun_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_ao_out_sun_la_LDFLAGS) $(xineplug_ao_out_sun_la_OBJECTS) $(xineplug_ao_out_sun_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_alsa_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_arts_out.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_directx2_out.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_directx_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_esd_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_file_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_none_out.Plo@am__quote@
+@@ -753,42 +559,46 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_polyp_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_sun_out.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_ao_out_directx_la-audio_directx_out.Plo@am__quote@
++
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+-xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo: audio_coreaudio_out.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_coreaudio_la_CFLAGS) $(CFLAGS) -MT xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo -MD -MP -MF "$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Tpo" -c -o xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo `test -f 'audio_coreaudio_out.c' || echo '$(srcdir)/'`audio_coreaudio_out.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Tpo" "$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Plo"; else rm -f "$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_coreaudio_out.c' object='xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_coreaudio_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo `test -f 'audio_coreaudio_out.c' || echo '$(srcdir)/'`audio_coreaudio_out.c
++xineplug_ao_out_coreaudio_la-audio_coreaudio_out.o: audio_coreaudio_out.c
++@AMDEP_TRUE@ source='audio_coreaudio_out.c' object='xineplug_ao_out_coreaudio_la-audio_coreaudio_out.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Po' tmpdepfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_coreaudio_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_coreaudio_la-audio_coreaudio_out.o `test -f 'audio_coreaudio_out.c' || echo '$(srcdir)/'`audio_coreaudio_out.c
+
+-xineplug_ao_out_directx_la-audio_directx_out.lo: audio_directx_out.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_ao_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_ao_out_directx_la-audio_directx_out.lo -MD -MP -MF "$(DEPDIR)/xineplug_ao_out_directx_la-audio_directx_out.Tpo" -c -o xineplug_ao_out_directx_la-audio_directx_out.lo `test -f 'audio_directx_out.c' || echo '$(srcdir)/'`audio_directx_out.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_ao_out_directx_la-audio_directx_out.Tpo" "$(DEPDIR)/xineplug_ao_out_directx_la-audio_directx_out.Plo"; else rm -f "$(DEPDIR)/xineplug_ao_out_directx_la-audio_directx_out.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='audio_directx_out.c' object='xineplug_ao_out_directx_la-audio_directx_out.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_ao_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_directx_la-audio_directx_out.lo `test -f 'audio_directx_out.c' || echo '$(srcdir)/'`audio_directx_out.c
++xineplug_ao_out_coreaudio_la-audio_coreaudio_out.obj: audio_coreaudio_out.c
++@AMDEP_TRUE@ source='audio_coreaudio_out.c' object='xineplug_ao_out_coreaudio_la-audio_coreaudio_out.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Po' tmpdepfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_coreaudio_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_coreaudio_la-audio_coreaudio_out.obj `cygpath -w audio_coreaudio_out.c`
++
++xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo: audio_coreaudio_out.c
++@AMDEP_TRUE@ source='audio_coreaudio_out.c' object='xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.Plo' tmpdepfile='$(DEPDIR)/xineplug_ao_out_coreaudio_la-audio_coreaudio_out.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_ao_out_coreaudio_la_CFLAGS) $(CFLAGS) -c -o xineplug_ao_out_coreaudio_la-audio_coreaudio_out.lo `test -f 'audio_coreaudio_out.c' || echo '$(srcdir)/'`audio_coreaudio_out.c
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -800,6 +610,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -808,7 +623,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -820,24 +634,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -846,22 +644,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -879,10 +674,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -894,31 +689,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -936,8 +728,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -945,30 +736,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/demuxers/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/demuxers/Makefile.in
+--- xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/demuxers/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,233 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_dmx_asf_la_SOURCES) $(xineplug_dmx_audio_la_SOURCES) $(xineplug_dmx_avi_la_SOURCES) $(xineplug_dmx_fli_la_SOURCES) $(xineplug_dmx_flv_la_SOURCES) $(xineplug_dmx_games_la_SOURCES) $(xineplug_dmx_iff_la_SOURCES) $(xineplug_dmx_image_la_SOURCES) $(xineplug_dmx_matroska_la_SOURCES) $(xineplug_dmx_mng_la_SOURCES) $(xineplug_dmx_mpeg_la_SOURCES) $(xineplug_dmx_mpeg_block_la_SOURCES) $(xineplug_dmx_mpeg_elem_la_SOURCES) $(xineplug_dmx_mpeg_pes_la_SOURCES) $(xineplug_dmx_mpeg_ts_la_SOURCES) $(xineplug_dmx_nsv_la_SOURCES) $(xineplug_dmx_ogg_la_SOURCES) $(xineplug_dmx_pva_la_SOURCES) $(xineplug_dmx_qt_la_SOURCES) $(xineplug_dmx_rawdv_la_SOURCES) $(xineplug_dmx_real_la_SOURCES) $(xineplug_dmx_slave_la_SOURCES) $(xineplug_dmx_yuv4mpeg2_la_SOURCES) $(xineplug_dmx_yuv_frames_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/demuxers
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_dmx_asf_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_asf_la_OBJECTS = demux_asf.lo
+-xineplug_dmx_asf_la_OBJECTS = $(am_xineplug_dmx_asf_la_OBJECTS)
+-@BUILD_ASF_TRUE@am_xineplug_dmx_asf_la_rpath = -rpath $(libdir)
+-am__DEPENDENCIES_2 =
+-xineplug_dmx_audio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_dmx_audio_la_OBJECTS = group_audio.lo demux_aud.lo \
+- demux_aiff.lo demux_cdda.lo demux_mpgaudio.lo demux_nsf.lo \
+- demux_realaudio.lo demux_snd.lo demux_voc.lo demux_vox.lo \
+- demux_wav.lo demux_ac3.lo id3.lo demux_aac.lo demux_mod.lo \
+- demux_flac.lo
+-xineplug_dmx_audio_la_OBJECTS = $(am_xineplug_dmx_audio_la_OBJECTS)
+-xineplug_dmx_avi_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_avi_la_OBJECTS = demux_avi.lo
+-xineplug_dmx_avi_la_OBJECTS = $(am_xineplug_dmx_avi_la_OBJECTS)
+-xineplug_dmx_fli_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_fli_la_OBJECTS = demux_fli.lo
+-xineplug_dmx_fli_la_OBJECTS = $(am_xineplug_dmx_fli_la_OBJECTS)
+-xineplug_dmx_flv_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_flv_la_OBJECTS = demux_flv.lo
+-xineplug_dmx_flv_la_OBJECTS = $(am_xineplug_dmx_flv_la_OBJECTS)
+-xineplug_dmx_games_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_games_la_OBJECTS = group_games.lo demux_eawve.lo \
+- demux_idcin.lo demux_ipmovie.lo demux_roq.lo demux_vqa.lo \
+- demux_wc3movie.lo demux_str.lo demux_film.lo demux_smjpeg.lo \
+- demux_4xm.lo demux_vmd.lo
+-xineplug_dmx_games_la_OBJECTS = $(am_xineplug_dmx_games_la_OBJECTS)
+-xineplug_dmx_iff_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_iff_la_OBJECTS = demux_iff.lo
+-xineplug_dmx_iff_la_OBJECTS = $(am_xineplug_dmx_iff_la_OBJECTS)
+-xineplug_dmx_image_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_image_la_OBJECTS = demux_image.lo
+-xineplug_dmx_image_la_OBJECTS = $(am_xineplug_dmx_image_la_OBJECTS)
+-@HAVE_LIBPNG_TRUE@am_xineplug_dmx_image_la_rpath = -rpath $(libdir)
+-xineplug_dmx_matroska_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_dmx_matroska_la_OBJECTS = demux_matroska.lo ebml.lo
+-xineplug_dmx_matroska_la_OBJECTS = \
+- $(am_xineplug_dmx_matroska_la_OBJECTS)
+-xineplug_dmx_mng_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
+-am_xineplug_dmx_mng_la_OBJECTS = demux_mng.lo
+-xineplug_dmx_mng_la_OBJECTS = $(am_xineplug_dmx_mng_la_OBJECTS)
+-@HAVE_LIBMNG_TRUE@am_xineplug_dmx_mng_la_rpath = -rpath $(libdir)
+-xineplug_dmx_mpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_mpeg_la_OBJECTS = demux_mpeg.lo
+-xineplug_dmx_mpeg_la_OBJECTS = $(am_xineplug_dmx_mpeg_la_OBJECTS)
+-xineplug_dmx_mpeg_block_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_mpeg_block_la_OBJECTS = demux_mpeg_block.lo
+-xineplug_dmx_mpeg_block_la_OBJECTS = \
+- $(am_xineplug_dmx_mpeg_block_la_OBJECTS)
+-xineplug_dmx_mpeg_elem_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_mpeg_elem_la_OBJECTS = demux_elem.lo
+-xineplug_dmx_mpeg_elem_la_OBJECTS = \
+- $(am_xineplug_dmx_mpeg_elem_la_OBJECTS)
+-xineplug_dmx_mpeg_pes_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_mpeg_pes_la_OBJECTS = demux_mpeg_pes.lo
+-xineplug_dmx_mpeg_pes_la_OBJECTS = \
+- $(am_xineplug_dmx_mpeg_pes_la_OBJECTS)
+-xineplug_dmx_mpeg_ts_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_mpeg_ts_la_OBJECTS = demux_ts.lo
+-xineplug_dmx_mpeg_ts_la_OBJECTS = \
+- $(am_xineplug_dmx_mpeg_ts_la_OBJECTS)
+-xineplug_dmx_nsv_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_nsv_la_OBJECTS = demux_nsv.lo
+-xineplug_dmx_nsv_la_OBJECTS = $(am_xineplug_dmx_nsv_la_OBJECTS)
+-xineplug_dmx_ogg_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_ogg_la_OBJECTS = demux_ogg.lo
+-xineplug_dmx_ogg_la_OBJECTS = $(am_xineplug_dmx_ogg_la_OBJECTS)
+-@HAVE_VORBIS_TRUE@am_xineplug_dmx_ogg_la_rpath = -rpath $(libdir)
+-xineplug_dmx_pva_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_pva_la_OBJECTS = demux_pva.lo
+-xineplug_dmx_pva_la_OBJECTS = $(am_xineplug_dmx_pva_la_OBJECTS)
+-xineplug_dmx_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_dmx_qt_la_OBJECTS = demux_qt.lo
+-xineplug_dmx_qt_la_OBJECTS = $(am_xineplug_dmx_qt_la_OBJECTS)
+-xineplug_dmx_rawdv_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_rawdv_la_OBJECTS = demux_rawdv.lo
+-xineplug_dmx_rawdv_la_OBJECTS = $(am_xineplug_dmx_rawdv_la_OBJECTS)
+-xineplug_dmx_real_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_real_la_OBJECTS = demux_real.lo
+-xineplug_dmx_real_la_OBJECTS = $(am_xineplug_dmx_real_la_OBJECTS)
+-xineplug_dmx_slave_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_slave_la_OBJECTS = demux_slave.lo
+-xineplug_dmx_slave_la_OBJECTS = $(am_xineplug_dmx_slave_la_OBJECTS)
+-xineplug_dmx_yuv4mpeg2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_yuv4mpeg2_la_OBJECTS = demux_yuv4mpeg2.lo
+-xineplug_dmx_yuv4mpeg2_la_OBJECTS = \
+- $(am_xineplug_dmx_yuv4mpeg2_la_OBJECTS)
+-xineplug_dmx_yuv_frames_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_yuv_frames_la_OBJECTS = demux_yuv_frames.lo
+-xineplug_dmx_yuv_frames_la_OBJECTS = \
+- $(am_xineplug_dmx_yuv_frames_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_dmx_asf_la_SOURCES) \
+- $(xineplug_dmx_audio_la_SOURCES) \
+- $(xineplug_dmx_avi_la_SOURCES) $(xineplug_dmx_fli_la_SOURCES) \
+- $(xineplug_dmx_flv_la_SOURCES) \
+- $(xineplug_dmx_games_la_SOURCES) \
+- $(xineplug_dmx_iff_la_SOURCES) \
+- $(xineplug_dmx_image_la_SOURCES) \
+- $(xineplug_dmx_matroska_la_SOURCES) \
+- $(xineplug_dmx_mng_la_SOURCES) $(xineplug_dmx_mpeg_la_SOURCES) \
+- $(xineplug_dmx_mpeg_block_la_SOURCES) \
+- $(xineplug_dmx_mpeg_elem_la_SOURCES) \
+- $(xineplug_dmx_mpeg_pes_la_SOURCES) \
+- $(xineplug_dmx_mpeg_ts_la_SOURCES) \
+- $(xineplug_dmx_nsv_la_SOURCES) $(xineplug_dmx_ogg_la_SOURCES) \
+- $(xineplug_dmx_pva_la_SOURCES) $(xineplug_dmx_qt_la_SOURCES) \
+- $(xineplug_dmx_rawdv_la_SOURCES) \
+- $(xineplug_dmx_real_la_SOURCES) \
+- $(xineplug_dmx_slave_la_SOURCES) \
+- $(xineplug_dmx_yuv4mpeg2_la_SOURCES) \
+- $(xineplug_dmx_yuv_frames_la_SOURCES)
+-DIST_SOURCES = $(xineplug_dmx_asf_la_SOURCES) \
+- $(xineplug_dmx_audio_la_SOURCES) \
+- $(xineplug_dmx_avi_la_SOURCES) $(xineplug_dmx_fli_la_SOURCES) \
+- $(xineplug_dmx_flv_la_SOURCES) \
+- $(xineplug_dmx_games_la_SOURCES) \
+- $(xineplug_dmx_iff_la_SOURCES) \
+- $(xineplug_dmx_image_la_SOURCES) \
+- $(xineplug_dmx_matroska_la_SOURCES) \
+- $(xineplug_dmx_mng_la_SOURCES) $(xineplug_dmx_mpeg_la_SOURCES) \
+- $(xineplug_dmx_mpeg_block_la_SOURCES) \
+- $(xineplug_dmx_mpeg_elem_la_SOURCES) \
+- $(xineplug_dmx_mpeg_pes_la_SOURCES) \
+- $(xineplug_dmx_mpeg_ts_la_SOURCES) \
+- $(xineplug_dmx_nsv_la_SOURCES) $(xineplug_dmx_ogg_la_SOURCES) \
+- $(xineplug_dmx_pva_la_SOURCES) $(xineplug_dmx_qt_la_SOURCES) \
+- $(xineplug_dmx_rawdv_la_SOURCES) \
+- $(xineplug_dmx_real_la_SOURCES) \
+- $(xineplug_dmx_slave_la_SOURCES) \
+- $(xineplug_dmx_yuv4mpeg2_la_SOURCES) \
+- $(xineplug_dmx_yuv_frames_la_SOURCES)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -247,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -267,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -293,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -322,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -451,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -466,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -480,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -494,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -518,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -555,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -570,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -587,68 +272,26 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(SPEEX_CFLAGS) $(LIBMODPLUG_CFLAGS)
+
++
+ # Sensing of OGG/VORBIS, ZLIB and ASF is broken in cvscompile.sh.
+ @HAVE_VORBIS_TRUE@ogg_module = xineplug_dmx_ogg.la
++
+ @BUILD_ASF_TRUE@asf_module = xineplug_dmx_asf.la
++
+ @HAVE_LIBMNG_TRUE@mng_module = xineplug_dmx_mng.la
++
+ @HAVE_LIBPNG_TRUE@image_module = xineplug_dmx_image.la
+
++
+ # IMPORTANT:
+ # ---------
+ # All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
+@@ -674,51 +317,67 @@
+ xineplug_dmx_iff.la \
+ xineplug_dmx_flv.la
+
++
+ xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
+ xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB)
+ xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_avi_la_SOURCES = demux_avi.c
+ xineplug_dmx_avi_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_avi_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c
+ xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_block_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
+ xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c
+ xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mpeg_pes_la_SOURCES = demux_mpeg_pes.c
+ xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_pes_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c
+ xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_mpeg_ts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_qt_la_SOURCES = demux_qt.c
+ xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
+ xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_asf_la_SOURCES = demux_asf.c
+ xineplug_dmx_asf_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_fli_la_SOURCES = demux_fli.c
+ xineplug_dmx_fli_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_fli_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_yuv4mpeg2_la_SOURCES = demux_yuv4mpeg2.c
+ xineplug_dmx_yuv4mpeg2_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_yuv4mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_real_la_SOURCES = demux_real.c
+ xineplug_dmx_real_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_rawdv_la_SOURCES = demux_rawdv.c
+ xineplug_dmx_rawdv_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_rawdv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_mng_la_SOURCES = demux_mng.c
+ xineplug_dmx_mng_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) $(MNG_LIBS)
+ xineplug_dmx_mng_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_pva_la_SOURCES = demux_pva.c
+ xineplug_dmx_pva_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_pva_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \
+ demux_idcin.c demux_ipmovie.c demux_roq.c \
+ demux_vqa.c demux_wc3movie.c demux_str.c \
+@@ -727,99 +386,281 @@
+
+ xineplug_dmx_games_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_games_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
+ demux_cdda.c demux_mpgaudio.c demux_nsf.c \
+ demux_realaudio.c demux_snd.c demux_voc.c \
+ demux_vox.c demux_wav.c demux_ac3.c id3.c \
+- demux_aac.c demux_mod.c demux_flac.c
++ demux_aac.c demux_mod.c demux_flac.c \
++ demux_mpc.c
+
+ xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS)
+ xineplug_dmx_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c
+ xineplug_dmx_yuv_frames_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_yuv_frames_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_slave_la_SOURCES = demux_slave.c
+ xineplug_dmx_slave_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_slave_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_image_la_SOURCES = demux_image.c
+ xineplug_dmx_image_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_image_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_nsv_la_SOURCES = demux_nsv.c
+ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_nsv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_matroska_la_SOURCES = demux_matroska.c ebml.c
+ xineplug_dmx_matroska_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
+ xineplug_dmx_matroska_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_iff_la_SOURCES = demux_iff.c
+ xineplug_dmx_iff_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_iff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_dmx_flv_la_SOURCES = demux_flv.c
+ xineplug_dmx_flv_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_flv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ include_HEADERS = demux.h
+ noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h
++subdir = src/demuxers
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_dmx_asf_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_asf_la_OBJECTS = demux_asf.lo
++xineplug_dmx_asf_la_OBJECTS = $(am_xineplug_dmx_asf_la_OBJECTS)
++xineplug_dmx_audio_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_audio_la_OBJECTS = group_audio.lo demux_aud.lo \
++ demux_aiff.lo demux_cdda.lo demux_mpgaudio.lo demux_nsf.lo \
++ demux_realaudio.lo demux_snd.lo demux_voc.lo demux_vox.lo \
++ demux_wav.lo demux_ac3.lo id3.lo demux_aac.lo demux_mod.lo \
++ demux_flac.lo demux_mpc.lo
++xineplug_dmx_audio_la_OBJECTS = $(am_xineplug_dmx_audio_la_OBJECTS)
++xineplug_dmx_avi_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_avi_la_OBJECTS = demux_avi.lo
++xineplug_dmx_avi_la_OBJECTS = $(am_xineplug_dmx_avi_la_OBJECTS)
++xineplug_dmx_fli_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_fli_la_OBJECTS = demux_fli.lo
++xineplug_dmx_fli_la_OBJECTS = $(am_xineplug_dmx_fli_la_OBJECTS)
++xineplug_dmx_flv_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_flv_la_OBJECTS = demux_flv.lo
++xineplug_dmx_flv_la_OBJECTS = $(am_xineplug_dmx_flv_la_OBJECTS)
++xineplug_dmx_games_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_games_la_OBJECTS = group_games.lo demux_eawve.lo \
++ demux_idcin.lo demux_ipmovie.lo demux_roq.lo demux_vqa.lo \
++ demux_wc3movie.lo demux_str.lo demux_film.lo demux_smjpeg.lo \
++ demux_4xm.lo demux_vmd.lo
++xineplug_dmx_games_la_OBJECTS = $(am_xineplug_dmx_games_la_OBJECTS)
++xineplug_dmx_iff_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_iff_la_OBJECTS = demux_iff.lo
++xineplug_dmx_iff_la_OBJECTS = $(am_xineplug_dmx_iff_la_OBJECTS)
++xineplug_dmx_image_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_image_la_OBJECTS = demux_image.lo
++xineplug_dmx_image_la_OBJECTS = $(am_xineplug_dmx_image_la_OBJECTS)
++xineplug_dmx_matroska_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_matroska_la_OBJECTS = demux_matroska.lo ebml.lo
++xineplug_dmx_matroska_la_OBJECTS = \
++ $(am_xineplug_dmx_matroska_la_OBJECTS)
++xineplug_dmx_mng_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mng_la_OBJECTS = demux_mng.lo
++xineplug_dmx_mng_la_OBJECTS = $(am_xineplug_dmx_mng_la_OBJECTS)
++xineplug_dmx_mpeg_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mpeg_la_OBJECTS = demux_mpeg.lo
++xineplug_dmx_mpeg_la_OBJECTS = $(am_xineplug_dmx_mpeg_la_OBJECTS)
++xineplug_dmx_mpeg_block_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mpeg_block_la_OBJECTS = demux_mpeg_block.lo
++xineplug_dmx_mpeg_block_la_OBJECTS = \
++ $(am_xineplug_dmx_mpeg_block_la_OBJECTS)
++xineplug_dmx_mpeg_elem_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mpeg_elem_la_OBJECTS = demux_elem.lo
++xineplug_dmx_mpeg_elem_la_OBJECTS = \
++ $(am_xineplug_dmx_mpeg_elem_la_OBJECTS)
++xineplug_dmx_mpeg_pes_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mpeg_pes_la_OBJECTS = demux_mpeg_pes.lo
++xineplug_dmx_mpeg_pes_la_OBJECTS = \
++ $(am_xineplug_dmx_mpeg_pes_la_OBJECTS)
++xineplug_dmx_mpeg_ts_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_mpeg_ts_la_OBJECTS = demux_ts.lo
++xineplug_dmx_mpeg_ts_la_OBJECTS = $(am_xineplug_dmx_mpeg_ts_la_OBJECTS)
++xineplug_dmx_nsv_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_nsv_la_OBJECTS = demux_nsv.lo
++xineplug_dmx_nsv_la_OBJECTS = $(am_xineplug_dmx_nsv_la_OBJECTS)
++xineplug_dmx_ogg_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_ogg_la_OBJECTS = demux_ogg.lo
++xineplug_dmx_ogg_la_OBJECTS = $(am_xineplug_dmx_ogg_la_OBJECTS)
++xineplug_dmx_pva_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_pva_la_OBJECTS = demux_pva.lo
++xineplug_dmx_pva_la_OBJECTS = $(am_xineplug_dmx_pva_la_OBJECTS)
++xineplug_dmx_qt_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_qt_la_OBJECTS = demux_qt.lo
++xineplug_dmx_qt_la_OBJECTS = $(am_xineplug_dmx_qt_la_OBJECTS)
++xineplug_dmx_rawdv_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_rawdv_la_OBJECTS = demux_rawdv.lo
++xineplug_dmx_rawdv_la_OBJECTS = $(am_xineplug_dmx_rawdv_la_OBJECTS)
++xineplug_dmx_real_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_real_la_OBJECTS = demux_real.lo
++xineplug_dmx_real_la_OBJECTS = $(am_xineplug_dmx_real_la_OBJECTS)
++xineplug_dmx_slave_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_slave_la_OBJECTS = demux_slave.lo
++xineplug_dmx_slave_la_OBJECTS = $(am_xineplug_dmx_slave_la_OBJECTS)
++xineplug_dmx_yuv4mpeg2_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_yuv4mpeg2_la_OBJECTS = demux_yuv4mpeg2.lo
++xineplug_dmx_yuv4mpeg2_la_OBJECTS = \
++ $(am_xineplug_dmx_yuv4mpeg2_la_OBJECTS)
++xineplug_dmx_yuv_frames_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_yuv_frames_la_OBJECTS = demux_yuv_frames.lo
++xineplug_dmx_yuv_frames_la_OBJECTS = \
++ $(am_xineplug_dmx_yuv_frames_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/demux_4xm.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_aac.Plo ./$(DEPDIR)/demux_ac3.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_aiff.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_asf.Plo ./$(DEPDIR)/demux_aud.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_avi.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_cdda.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_eawve.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_elem.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_film.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_flac.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_fli.Plo ./$(DEPDIR)/demux_flv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_idcin.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_iff.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_image.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_ipmovie.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_matroska.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mng.Plo ./$(DEPDIR)/demux_mod.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mpc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mpeg.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mpeg_block.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mpeg_pes.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_mpgaudio.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_nsf.Plo ./$(DEPDIR)/demux_nsv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_ogg.Plo ./$(DEPDIR)/demux_pva.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_qt.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_rawdv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_real.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_realaudio.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_roq.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_slave.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_smjpeg.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_snd.Plo ./$(DEPDIR)/demux_str.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_ts.Plo ./$(DEPDIR)/demux_vmd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_voc.Plo ./$(DEPDIR)/demux_vox.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_vqa.Plo ./$(DEPDIR)/demux_wav.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_wc3movie.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_yuv4mpeg2.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_yuv_frames.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ebml.Plo ./$(DEPDIR)/group_audio.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/group_games.Plo ./$(DEPDIR)/id3.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_dmx_asf_la_SOURCES) \
++ $(xineplug_dmx_audio_la_SOURCES) $(xineplug_dmx_avi_la_SOURCES) \
++ $(xineplug_dmx_fli_la_SOURCES) $(xineplug_dmx_flv_la_SOURCES) \
++ $(xineplug_dmx_games_la_SOURCES) $(xineplug_dmx_iff_la_SOURCES) \
++ $(xineplug_dmx_image_la_SOURCES) \
++ $(xineplug_dmx_matroska_la_SOURCES) \
++ $(xineplug_dmx_mng_la_SOURCES) $(xineplug_dmx_mpeg_la_SOURCES) \
++ $(xineplug_dmx_mpeg_block_la_SOURCES) \
++ $(xineplug_dmx_mpeg_elem_la_SOURCES) \
++ $(xineplug_dmx_mpeg_pes_la_SOURCES) \
++ $(xineplug_dmx_mpeg_ts_la_SOURCES) \
++ $(xineplug_dmx_nsv_la_SOURCES) $(xineplug_dmx_ogg_la_SOURCES) \
++ $(xineplug_dmx_pva_la_SOURCES) $(xineplug_dmx_qt_la_SOURCES) \
++ $(xineplug_dmx_rawdv_la_SOURCES) \
++ $(xineplug_dmx_real_la_SOURCES) \
++ $(xineplug_dmx_slave_la_SOURCES) \
++ $(xineplug_dmx_yuv4mpeg2_la_SOURCES) \
++ $(xineplug_dmx_yuv_frames_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in
++SOURCES = $(xineplug_dmx_asf_la_SOURCES) $(xineplug_dmx_audio_la_SOURCES) $(xineplug_dmx_avi_la_SOURCES) $(xineplug_dmx_fli_la_SOURCES) $(xineplug_dmx_flv_la_SOURCES) $(xineplug_dmx_games_la_SOURCES) $(xineplug_dmx_iff_la_SOURCES) $(xineplug_dmx_image_la_SOURCES) $(xineplug_dmx_matroska_la_SOURCES) $(xineplug_dmx_mng_la_SOURCES) $(xineplug_dmx_mpeg_la_SOURCES) $(xineplug_dmx_mpeg_block_la_SOURCES) $(xineplug_dmx_mpeg_elem_la_SOURCES) $(xineplug_dmx_mpeg_pes_la_SOURCES) $(xineplug_dmx_mpeg_ts_la_SOURCES) $(xineplug_dmx_nsv_la_SOURCES) $(xineplug_dmx_ogg_la_SOURCES) $(xineplug_dmx_pva_la_SOURCES) $(xineplug_dmx_qt_la_SOURCES) $(xineplug_dmx_rawdv_la_SOURCES) $(xineplug_dmx_real_la_SOURCES) $(xineplug_dmx_slave_la_SOURCES) $(xineplug_dmx_yuv4mpeg2_la_SOURCES) $(xineplug_dmx_yuv_frames_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/demuxers/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/demuxers/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_dmx_asf.la: $(xineplug_dmx_asf_la_OBJECTS) $(xineplug_dmx_asf_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_dmx_asf_la_rpath) $(xineplug_dmx_asf_la_LDFLAGS) $(xineplug_dmx_asf_la_OBJECTS) $(xineplug_dmx_asf_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_dmx_asf_la_LDFLAGS) $(xineplug_dmx_asf_la_OBJECTS) $(xineplug_dmx_asf_la_LIBADD) $(LIBS)
+ xineplug_dmx_audio.la: $(xineplug_dmx_audio_la_OBJECTS) $(xineplug_dmx_audio_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_audio_la_LDFLAGS) $(xineplug_dmx_audio_la_OBJECTS) $(xineplug_dmx_audio_la_LIBADD) $(LIBS)
+ xineplug_dmx_avi.la: $(xineplug_dmx_avi_la_OBJECTS) $(xineplug_dmx_avi_la_DEPENDENCIES)
+@@ -833,11 +674,11 @@
+ xineplug_dmx_iff.la: $(xineplug_dmx_iff_la_OBJECTS) $(xineplug_dmx_iff_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_iff_la_LDFLAGS) $(xineplug_dmx_iff_la_OBJECTS) $(xineplug_dmx_iff_la_LIBADD) $(LIBS)
+ xineplug_dmx_image.la: $(xineplug_dmx_image_la_OBJECTS) $(xineplug_dmx_image_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_dmx_image_la_rpath) $(xineplug_dmx_image_la_LDFLAGS) $(xineplug_dmx_image_la_OBJECTS) $(xineplug_dmx_image_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_dmx_image_la_LDFLAGS) $(xineplug_dmx_image_la_OBJECTS) $(xineplug_dmx_image_la_LIBADD) $(LIBS)
+ xineplug_dmx_matroska.la: $(xineplug_dmx_matroska_la_OBJECTS) $(xineplug_dmx_matroska_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_matroska_la_LDFLAGS) $(xineplug_dmx_matroska_la_OBJECTS) $(xineplug_dmx_matroska_la_LIBADD) $(LIBS)
+ xineplug_dmx_mng.la: $(xineplug_dmx_mng_la_OBJECTS) $(xineplug_dmx_mng_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_dmx_mng_la_rpath) $(xineplug_dmx_mng_la_LDFLAGS) $(xineplug_dmx_mng_la_OBJECTS) $(xineplug_dmx_mng_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_dmx_mng_la_LDFLAGS) $(xineplug_dmx_mng_la_OBJECTS) $(xineplug_dmx_mng_la_LIBADD) $(LIBS)
+ xineplug_dmx_mpeg.la: $(xineplug_dmx_mpeg_la_OBJECTS) $(xineplug_dmx_mpeg_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_mpeg_la_LDFLAGS) $(xineplug_dmx_mpeg_la_OBJECTS) $(xineplug_dmx_mpeg_la_LIBADD) $(LIBS)
+ xineplug_dmx_mpeg_block.la: $(xineplug_dmx_mpeg_block_la_OBJECTS) $(xineplug_dmx_mpeg_block_la_DEPENDENCIES)
+@@ -851,7 +692,7 @@
+ xineplug_dmx_nsv.la: $(xineplug_dmx_nsv_la_OBJECTS) $(xineplug_dmx_nsv_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_nsv_la_LDFLAGS) $(xineplug_dmx_nsv_la_OBJECTS) $(xineplug_dmx_nsv_la_LIBADD) $(LIBS)
+ xineplug_dmx_ogg.la: $(xineplug_dmx_ogg_la_OBJECTS) $(xineplug_dmx_ogg_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_dmx_ogg_la_rpath) $(xineplug_dmx_ogg_la_LDFLAGS) $(xineplug_dmx_ogg_la_OBJECTS) $(xineplug_dmx_ogg_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_dmx_ogg_la_LDFLAGS) $(xineplug_dmx_ogg_la_OBJECTS) $(xineplug_dmx_ogg_la_LIBADD) $(LIBS)
+ xineplug_dmx_pva.la: $(xineplug_dmx_pva_la_OBJECTS) $(xineplug_dmx_pva_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_pva_la_LDFLAGS) $(xineplug_dmx_pva_la_OBJECTS) $(xineplug_dmx_pva_la_LIBADD) $(LIBS)
+ xineplug_dmx_qt.la: $(xineplug_dmx_qt_la_OBJECTS) $(xineplug_dmx_qt_la_DEPENDENCIES)
+@@ -868,7 +709,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_yuv_frames_la_LDFLAGS) $(xineplug_dmx_yuv_frames_la_OBJECTS) $(xineplug_dmx_yuv_frames_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -894,6 +735,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_matroska.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mng.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mod.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mpc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mpeg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mpeg_block.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_mpeg_pes.Plo@am__quote@
+@@ -925,26 +767,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group_games.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -955,6 +798,12 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -964,7 +813,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -976,24 +824,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -1002,22 +834,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -1035,10 +864,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -1050,31 +879,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -1092,8 +918,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -1101,33 +926,23 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook \
+- uninstall-includeHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-includeHEADERS install-info \
++ install-info-am install-libLTLIBRARIES install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ tags uninstall uninstall-am uninstall-includeHEADERS \
++ uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/dxr3/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/dxr3/Makefile.in
+--- xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/dxr3/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,132 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_dxr3_spu_la_SOURCES) $(xineplug_decode_dxr3_video_la_SOURCES) $(xineplug_vo_out_dxr3_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/dxr3
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 =
+-@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_DEPENDENCIES = \
+-@HAVE_DVDNAV_FALSE@ $(am__DEPENDENCIES_1)
+-@HAVE_DVDNAV_TRUE@xineplug_decode_dxr3_spu_la_DEPENDENCIES = \
+-@HAVE_DVDNAV_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+-am__xineplug_decode_dxr3_spu_la_SOURCES_DIST = dxr3_decode_spu.c \
+- nav_read.c
+-@HAVE_DVDNAV_FALSE@am_xineplug_decode_dxr3_spu_la_OBJECTS = \
+-@HAVE_DVDNAV_FALSE@ dxr3_decode_spu.lo nav_read.lo
+-@HAVE_DVDNAV_TRUE@am_xineplug_decode_dxr3_spu_la_OBJECTS = \
+-@HAVE_DVDNAV_TRUE@ dxr3_decode_spu.lo
+-xineplug_decode_dxr3_spu_la_OBJECTS = \
+- $(am_xineplug_decode_dxr3_spu_la_OBJECTS)
+-@HAVE_DXR3_TRUE@am_xineplug_decode_dxr3_spu_la_rpath = -rpath \
+-@HAVE_DXR3_TRUE@ $(libdir)
+-xineplug_decode_dxr3_video_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_dxr3_video_la_OBJECTS = dxr3_decode_video.lo
+-xineplug_decode_dxr3_video_la_OBJECTS = \
+- $(am_xineplug_decode_dxr3_video_la_OBJECTS)
+-@HAVE_DXR3_TRUE@am_xineplug_decode_dxr3_video_la_rpath = -rpath \
+-@HAVE_DXR3_TRUE@ $(libdir)
+-@HAVE_LIBFAME_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
+-@HAVE_X11_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2)
+-xineplug_vo_out_dxr3_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_dxr3_la_OBJECTS = alphablend.lo \
+- dxr3_mpeg_encoders.lo dxr3_spu_encoder.lo dxr3_scr.lo \
+- video_out_dxr3.lo
+-xineplug_vo_out_dxr3_la_OBJECTS = \
+- $(am_xineplug_vo_out_dxr3_la_OBJECTS)
+-@HAVE_DXR3_TRUE@am_xineplug_vo_out_dxr3_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_dxr3_spu_la_SOURCES) \
+- $(xineplug_decode_dxr3_video_la_SOURCES) \
+- $(xineplug_vo_out_dxr3_la_SOURCES)
+-DIST_SOURCES = $(am__xineplug_decode_dxr3_spu_la_SOURCES_DIST) \
+- $(xineplug_decode_dxr3_video_la_SOURCES) \
+- $(xineplug_vo_out_dxr3_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -146,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -166,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -192,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -221,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -350,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -365,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -379,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -393,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -417,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -454,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -469,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -486,61 +272,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS)
++
+ @HAVE_DXR3_TRUE@dxr3_modules = xineplug_decode_dxr3_video.la \
+ @HAVE_DXR3_TRUE@ xineplug_decode_dxr3_spu.la \
+ @HAVE_DXR3_TRUE@ xineplug_vo_out_dxr3.la
+@@ -548,17 +288,21 @@
+ @HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext
+ @HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS)
+ @HAVE_LIBRTE_TRUE@link_rte = -lrte
++
+ lib_LTLIBRARIES = $(dxr3_modules)
++
+ xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
+ xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_dxr3_video_la_LDFLAGS = -avoid-version -module
+-@HAVE_DVDNAV_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
++
+ @HAVE_DVDNAV_TRUE@AM_CPPFLAGS = $(DVDNAV_CFLAGS)
+-@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
++@HAVE_DVDNAV_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
+ @HAVE_DVDNAV_TRUE@xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c
+-@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
++@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c
+ @HAVE_DVDNAV_TRUE@xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
++@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module
++
+ xineplug_vo_out_dxr3_la_SOURCES = \
+ alphablend.c \
+ dxr3_mpeg_encoders.c \
+@@ -566,8 +310,10 @@
+ dxr3_scr.c \
+ video_out_dxr3.c
+
++
+ xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
+ xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ em8300.h \
+ alphablend.h \
+@@ -575,75 +321,124 @@
+ dxr3_scr.h \
+ video_out_dxr3.h
+
++subdir = src/dxr3
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++@HAVE_DVDNAV_TRUE@xineplug_decode_dxr3_spu_la_DEPENDENCIES = \
++@HAVE_DVDNAV_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_DVDNAV_FALSE@xineplug_decode_dxr3_spu_la_DEPENDENCIES = \
++@HAVE_DVDNAV_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_DVDNAV_TRUE@am_xineplug_decode_dxr3_spu_la_OBJECTS = \
++@HAVE_DVDNAV_TRUE@ dxr3_decode_spu.lo
++@HAVE_DVDNAV_FALSE@am_xineplug_decode_dxr3_spu_la_OBJECTS = \
++@HAVE_DVDNAV_FALSE@ dxr3_decode_spu.lo nav_read.lo
++xineplug_decode_dxr3_spu_la_OBJECTS = \
++ $(am_xineplug_decode_dxr3_spu_la_OBJECTS)
++xineplug_decode_dxr3_video_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_dxr3_video_la_OBJECTS = dxr3_decode_video.lo
++xineplug_decode_dxr3_video_la_OBJECTS = \
++ $(am_xineplug_decode_dxr3_video_la_OBJECTS)
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_FALSE@@HAVE_X11_TRUE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_FALSE@@HAVE_X11_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_FALSE@@HAVE_X11_FALSE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_FALSE@@HAVE_X11_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_TRUE@@HAVE_X11_TRUE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_TRUE@@HAVE_X11_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_TRUE@@HAVE_X11_FALSE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_FALSE@@HAVE_LIBRTE_TRUE@@HAVE_X11_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_FALSE@@HAVE_X11_TRUE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_FALSE@@HAVE_X11_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_FALSE@@HAVE_X11_FALSE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_FALSE@@HAVE_X11_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_TRUE@@HAVE_X11_TRUE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_TRUE@@HAVE_X11_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_TRUE@@HAVE_X11_FALSE@xineplug_vo_out_dxr3_la_DEPENDENCIES = \
++@HAVE_LIBFAME_TRUE@@HAVE_LIBRTE_TRUE@@HAVE_X11_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_dxr3_la_OBJECTS = alphablend.lo dxr3_mpeg_encoders.lo \
++ dxr3_spu_encoder.lo dxr3_scr.lo video_out_dxr3.lo
++xineplug_vo_out_dxr3_la_OBJECTS = $(am_xineplug_vo_out_dxr3_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alphablend.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dxr3_decode_spu.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dxr3_decode_video.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dxr3_mpeg_encoders.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dxr3_scr.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dxr3_spu_encoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/nav_read.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_dxr3.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_dxr3_spu_la_SOURCES) \
++ $(xineplug_decode_dxr3_video_la_SOURCES) \
++ $(xineplug_vo_out_dxr3_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_dxr3_spu_la_SOURCES) $(xineplug_decode_dxr3_video_la_SOURCES) $(xineplug_vo_out_dxr3_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/dxr3/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/dxr3/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_dxr3_spu.la: $(xineplug_decode_dxr3_spu_la_OBJECTS) $(xineplug_decode_dxr3_spu_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_dxr3_spu_la_rpath) $(xineplug_decode_dxr3_spu_la_LDFLAGS) $(xineplug_decode_dxr3_spu_la_OBJECTS) $(xineplug_decode_dxr3_spu_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_dxr3_spu_la_LDFLAGS) $(xineplug_decode_dxr3_spu_la_OBJECTS) $(xineplug_decode_dxr3_spu_la_LIBADD) $(LIBS)
+ xineplug_decode_dxr3_video.la: $(xineplug_decode_dxr3_video_la_OBJECTS) $(xineplug_decode_dxr3_video_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_dxr3_video_la_rpath) $(xineplug_decode_dxr3_video_la_LDFLAGS) $(xineplug_decode_dxr3_video_la_OBJECTS) $(xineplug_decode_dxr3_video_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_dxr3_video_la_LDFLAGS) $(xineplug_decode_dxr3_video_la_OBJECTS) $(xineplug_decode_dxr3_video_la_LIBADD) $(LIBS)
+ xineplug_vo_out_dxr3.la: $(xineplug_vo_out_dxr3_la_OBJECTS) $(xineplug_vo_out_dxr3_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_dxr3_la_rpath) $(xineplug_vo_out_dxr3_la_LDFLAGS) $(xineplug_vo_out_dxr3_la_OBJECTS) $(xineplug_vo_out_dxr3_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_dxr3_la_LDFLAGS) $(xineplug_vo_out_dxr3_la_OBJECTS) $(xineplug_vo_out_dxr3_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -657,26 +452,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nav_read.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_dxr3.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -688,6 +484,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -696,7 +497,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -708,24 +508,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -734,22 +518,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -767,10 +548,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -782,31 +563,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -824,8 +602,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -833,30 +610,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/Makefile.in
+--- xine-lib-vdr-1.0/src/input/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,196 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_inp_cdda_la_SOURCES) $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) $(xineplug_inp_file_la_SOURCES) $(xineplug_inp_gnome_vfs_la_SOURCES) $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_smb_la_SOURCES) $(xineplug_inp_stdin_fifo_la_SOURCES) $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcdo_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/input
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_inp_cdda_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_cdda_la_OBJECTS = input_cdda.lo media_helper.lo \
+- sha1.lo base64.lo
+-xineplug_inp_cdda_la_OBJECTS = $(am_xineplug_inp_cdda_la_OBJECTS)
+-xineplug_inp_dvb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_dvb_la_OBJECTS = input_dvb.lo net_buf_ctrl.lo
+-xineplug_inp_dvb_la_OBJECTS = $(am_xineplug_inp_dvb_la_OBJECTS)
+-@WIN32_FALSE@am_xineplug_inp_dvb_la_rpath = -rpath $(libdir)
+-am__DEPENDENCIES_2 =
+-@HAVE_DVDNAV_FALSE@am__DEPENDENCIES_3 = libdvdnav/libdvdnav.la
+-@HAVE_DVDNAV_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
+-xineplug_inp_dvd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_3)
+-am_xineplug_inp_dvd_la_OBJECTS = input_dvd.lo media_helper.lo
+-xineplug_inp_dvd_la_OBJECTS = $(am_xineplug_inp_dvd_la_OBJECTS)
+-xineplug_inp_file_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_file_la_OBJECTS = input_file.lo
+-xineplug_inp_file_la_OBJECTS = $(am_xineplug_inp_file_la_OBJECTS)
+-xineplug_inp_gnome_vfs_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_inp_gnome_vfs_la_OBJECTS = input_gnome_vfs.lo \
+- net_buf_ctrl.lo
+-xineplug_inp_gnome_vfs_la_OBJECTS = \
+- $(am_xineplug_inp_gnome_vfs_la_OBJECTS)
+-@HAVE_GNOME_VFS_TRUE@am_xineplug_inp_gnome_vfs_la_rpath = -rpath \
+-@HAVE_GNOME_VFS_TRUE@ $(libdir)
+-xineplug_inp_http_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_http_la_OBJECTS = input_http.lo net_buf_ctrl.lo \
+- http_helper.lo
+-xineplug_inp_http_la_OBJECTS = $(am_xineplug_inp_http_la_OBJECTS)
+-xineplug_inp_mms_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_mms_la_OBJECTS = input_mms.lo net_buf_ctrl.lo mms.lo \
+- mmsh.lo http_helper.lo
+-xineplug_inp_mms_la_OBJECTS = $(am_xineplug_inp_mms_la_OBJECTS)
+-xineplug_inp_net_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_net_la_OBJECTS = input_net.lo net_buf_ctrl.lo
+-xineplug_inp_net_la_OBJECTS = $(am_xineplug_inp_net_la_OBJECTS)
+-xineplug_inp_pnm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_pnm_la_OBJECTS = input_pnm.lo net_buf_ctrl.lo pnm.lo
+-xineplug_inp_pnm_la_OBJECTS = $(am_xineplug_inp_pnm_la_OBJECTS)
+-xineplug_inp_pvr_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_pvr_la_OBJECTS = input_pvr.lo
+-xineplug_inp_pvr_la_OBJECTS = $(am_xineplug_inp_pvr_la_OBJECTS)
+-@HAVE_V4L_TRUE@am_xineplug_inp_pvr_la_rpath = -rpath $(libdir)
+-xineplug_inp_rtp_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_rtp_la_OBJECTS = input_rtp.lo net_buf_ctrl.lo
+-xineplug_inp_rtp_la_OBJECTS = $(am_xineplug_inp_rtp_la_OBJECTS)
+-@WIN32_FALSE@am_xineplug_inp_rtp_la_rpath = -rpath $(libdir)
+-xineplug_inp_rtsp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- libreal/libreal.la librtsp/librtsp.la
+-am_xineplug_inp_rtsp_la_OBJECTS = input_rtsp.lo net_buf_ctrl.lo
+-xineplug_inp_rtsp_la_OBJECTS = $(am_xineplug_inp_rtsp_la_OBJECTS)
+-xineplug_inp_smb_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_inp_smb_la_OBJECTS = input_smb.lo
+-xineplug_inp_smb_la_OBJECTS = $(am_xineplug_inp_smb_la_OBJECTS)
+-@HAVE_LIBSMBCLIENT_TRUE@am_xineplug_inp_smb_la_rpath = -rpath \
+-@HAVE_LIBSMBCLIENT_TRUE@ $(libdir)
+-xineplug_inp_stdin_fifo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_stdin_fifo_la_OBJECTS = input_stdin_fifo.lo \
+- net_buf_ctrl.lo
+-xineplug_inp_stdin_fifo_la_OBJECTS = \
+- $(am_xineplug_inp_stdin_fifo_la_OBJECTS)
+-xineplug_inp_v4l_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_inp_v4l_la_OBJECTS = input_v4l.lo
+-xineplug_inp_v4l_la_OBJECTS = $(am_xineplug_inp_v4l_la_OBJECTS)
+-@HAVE_V4L_TRUE@am_xineplug_inp_v4l_la_rpath = -rpath $(libdir)
+-xineplug_inp_vcdo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_inp_vcdo_la_OBJECTS = input_vcd.lo media_helper.lo
+-xineplug_inp_vcdo_la_OBJECTS = $(am_xineplug_inp_vcdo_la_OBJECTS)
+-@HAVE_CDROM_IOCTLS_TRUE@am_xineplug_inp_vcdo_la_rpath = -rpath \
+-@HAVE_CDROM_IOCTLS_TRUE@ $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_inp_cdda_la_SOURCES) \
+- $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) \
+- $(xineplug_inp_file_la_SOURCES) \
+- $(xineplug_inp_gnome_vfs_la_SOURCES) \
+- $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) \
+- $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) \
+- $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) \
+- $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_smb_la_SOURCES) \
+- $(xineplug_inp_stdin_fifo_la_SOURCES) \
+- $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcdo_la_SOURCES)
+-DIST_SOURCES = $(xineplug_inp_cdda_la_SOURCES) \
+- $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) \
+- $(xineplug_inp_file_la_SOURCES) \
+- $(xineplug_inp_gnome_vfs_la_SOURCES) \
+- $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) \
+- $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) \
+- $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) \
+- $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_smb_la_SOURCES) \
+- $(xineplug_inp_stdin_fifo_la_SOURCES) \
+- $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcdo_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = vcd dvb libreal librtsp libdvdnav
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -210,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -230,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -256,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -285,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -414,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -429,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -443,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -457,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -481,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -518,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -533,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -550,85 +272,45 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c
+-@HAVE_DVDNAV_FALSE@SUBDIRS = vcd dvb libreal librtsp libdvdnav
++
+ @HAVE_DVDNAV_TRUE@SUBDIRS = vcd dvb libreal librtsp
++@HAVE_DVDNAV_FALSE@SUBDIRS = vcd dvb libreal librtsp libdvdnav
++
+
+ # IMPORTANT:
+ # ---------
+ # All of xine input plugins should be named like the scheme "xineplug_inp_"
+ #
+ @HAVE_CDROM_IOCTLS_TRUE@in_vcd = xineplug_inp_vcdo.la
++
+ @HAVE_V4L_TRUE@in_v4l = xineplug_inp_v4l.la
+ @HAVE_V4L_TRUE@in_pvr = xineplug_inp_pvr.la
++
+ @HAVE_GNOME_VFS_TRUE@in_gnome_vfs = xineplug_inp_gnome_vfs.la
++
+ @HAVE_LIBSMBCLIENT_TRUE@in_smb = xineplug_inp_smb.la
+
+ # For DVD
+ in_dvd = xineplug_inp_dvd.la
+-@HAVE_DVDNAV_FALSE@DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav/
+ @HAVE_DVDNAV_TRUE@DVD_CFLAGS = $(DVDNAV_CFLAGS)
+-@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la
++@HAVE_DVDNAV_FALSE@DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav/
+ @HAVE_DVDNAV_TRUE@link_dvdnav = $(DVDNAV_LIBS)
++@HAVE_DVDNAV_FALSE@link_dvdnav = libdvdnav/libdvdnav.la
+
+ # not ported to native Windows
+ @WIN32_FALSE@in_rtp = xineplug_inp_rtp.la
+ @WIN32_FALSE@in_dvb = xineplug_inp_dvb.la
++
+ AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS)
++
+ lib_LTLIBRARIES = \
+ xineplug_inp_file.la \
+ xineplug_inp_http.la \
+@@ -647,126 +329,256 @@
+ $(in_dvb) \
+ xineplug_inp_cdda.la
+
++
+ xineplug_inp_file_la_SOURCES = input_file.c
+ xineplug_inp_file_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
+ xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
+ xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
+ xineplug_inp_net_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_net_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c http_helper.c
+ xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@
+ xineplug_inp_mms_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
+ xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_vcdo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
+ xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_rtp_la_SOURCES = input_rtp.c net_buf_ctrl.c
+ xineplug_inp_rtp_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c http_helper.c
+ xineplug_inp_http_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_http_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c
+ xineplug_inp_pnm_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_pnm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
+ xineplug_inp_dvb_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_dvb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
+ xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) libreal/libreal.la librtsp/librtsp.la
+ xineplug_inp_rtsp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h
+ xineplug_inp_cdda_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_cdda_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_v4l_la_SOURCES = input_v4l.c
+ xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
+ xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c
+ xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
+ xineplug_inp_gnome_vfs_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_smb_la_SOURCES = input_smb.c
+ xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB)
+ xineplug_inp_smb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_inp_pvr_la_SOURCES = input_pvr.c
+ xineplug_inp_pvr_la_LIBADD = $(XINE_LIB)
+ xineplug_inp_pvr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ include_HEADERS = input_plugin.h
+ noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h
++subdir = src/input
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_inp_cdda_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_cdda_la_OBJECTS = input_cdda.lo media_helper.lo sha1.lo \
++ base64.lo
++xineplug_inp_cdda_la_OBJECTS = $(am_xineplug_inp_cdda_la_OBJECTS)
++xineplug_inp_dvb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_dvb_la_OBJECTS = input_dvb.lo net_buf_ctrl.lo
++xineplug_inp_dvb_la_OBJECTS = $(am_xineplug_inp_dvb_la_OBJECTS)
++@HAVE_DVDNAV_TRUE@xineplug_inp_dvd_la_DEPENDENCIES = \
++@HAVE_DVDNAV_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_DVDNAV_FALSE@xineplug_inp_dvd_la_DEPENDENCIES = \
++@HAVE_DVDNAV_FALSE@ $(top_builddir)/src/xine-engine/libxine.la \
++@HAVE_DVDNAV_FALSE@ libdvdnav/libdvdnav.la
++am_xineplug_inp_dvd_la_OBJECTS = input_dvd.lo media_helper.lo
++xineplug_inp_dvd_la_OBJECTS = $(am_xineplug_inp_dvd_la_OBJECTS)
++xineplug_inp_file_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_file_la_OBJECTS = input_file.lo
++xineplug_inp_file_la_OBJECTS = $(am_xineplug_inp_file_la_OBJECTS)
++xineplug_inp_gnome_vfs_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_gnome_vfs_la_OBJECTS = input_gnome_vfs.lo \
++ net_buf_ctrl.lo
++xineplug_inp_gnome_vfs_la_OBJECTS = \
++ $(am_xineplug_inp_gnome_vfs_la_OBJECTS)
++xineplug_inp_http_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_http_la_OBJECTS = input_http.lo net_buf_ctrl.lo \
++ http_helper.lo
++xineplug_inp_http_la_OBJECTS = $(am_xineplug_inp_http_la_OBJECTS)
++xineplug_inp_mms_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_mms_la_OBJECTS = input_mms.lo net_buf_ctrl.lo mms.lo \
++ mmsh.lo http_helper.lo
++xineplug_inp_mms_la_OBJECTS = $(am_xineplug_inp_mms_la_OBJECTS)
++xineplug_inp_net_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_net_la_OBJECTS = input_net.lo net_buf_ctrl.lo
++xineplug_inp_net_la_OBJECTS = $(am_xineplug_inp_net_la_OBJECTS)
++xineplug_inp_pnm_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_pnm_la_OBJECTS = input_pnm.lo net_buf_ctrl.lo pnm.lo
++xineplug_inp_pnm_la_OBJECTS = $(am_xineplug_inp_pnm_la_OBJECTS)
++xineplug_inp_pvr_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_pvr_la_OBJECTS = input_pvr.lo
++xineplug_inp_pvr_la_OBJECTS = $(am_xineplug_inp_pvr_la_OBJECTS)
++xineplug_inp_rtp_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_rtp_la_OBJECTS = input_rtp.lo net_buf_ctrl.lo
++xineplug_inp_rtp_la_OBJECTS = $(am_xineplug_inp_rtp_la_OBJECTS)
++xineplug_inp_rtsp_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la libreal/libreal.la \
++ librtsp/librtsp.la
++am_xineplug_inp_rtsp_la_OBJECTS = input_rtsp.lo net_buf_ctrl.lo
++xineplug_inp_rtsp_la_OBJECTS = $(am_xineplug_inp_rtsp_la_OBJECTS)
++xineplug_inp_smb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_smb_la_OBJECTS = input_smb.lo
++xineplug_inp_smb_la_OBJECTS = $(am_xineplug_inp_smb_la_OBJECTS)
++xineplug_inp_stdin_fifo_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_stdin_fifo_la_OBJECTS = input_stdin_fifo.lo \
++ net_buf_ctrl.lo
++xineplug_inp_stdin_fifo_la_OBJECTS = \
++ $(am_xineplug_inp_stdin_fifo_la_OBJECTS)
++xineplug_inp_v4l_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_v4l_la_OBJECTS = input_v4l.lo
++xineplug_inp_v4l_la_OBJECTS = $(am_xineplug_inp_v4l_la_OBJECTS)
++xineplug_inp_vcdo_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_vcdo_la_OBJECTS = input_vcd.lo media_helper.lo
++xineplug_inp_vcdo_la_OBJECTS = $(am_xineplug_inp_vcdo_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/base64.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/http_helper.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_cdda.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_dvb.Plo ./$(DEPDIR)/input_dvd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_file.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_gnome_vfs.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_http.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_mms.Plo ./$(DEPDIR)/input_net.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_pnm.Plo ./$(DEPDIR)/input_pvr.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_rtp.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_rtsp.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_smb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_stdin_fifo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_v4l.Plo ./$(DEPDIR)/input_vcd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/media_helper.Plo ./$(DEPDIR)/mms.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mmsh.Plo ./$(DEPDIR)/net_buf_ctrl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pnm.Plo ./$(DEPDIR)/sha1.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_inp_cdda_la_SOURCES) \
++ $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) \
++ $(xineplug_inp_file_la_SOURCES) \
++ $(xineplug_inp_gnome_vfs_la_SOURCES) \
++ $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) \
++ $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) \
++ $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) \
++ $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_smb_la_SOURCES) \
++ $(xineplug_inp_stdin_fifo_la_SOURCES) \
++ $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcdo_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in
++DIST_SUBDIRS = vcd dvb libreal librtsp libdvdnav
++SOURCES = $(xineplug_inp_cdda_la_SOURCES) $(xineplug_inp_dvb_la_SOURCES) $(xineplug_inp_dvd_la_SOURCES) $(xineplug_inp_file_la_SOURCES) $(xineplug_inp_gnome_vfs_la_SOURCES) $(xineplug_inp_http_la_SOURCES) $(xineplug_inp_mms_la_SOURCES) $(xineplug_inp_net_la_SOURCES) $(xineplug_inp_pnm_la_SOURCES) $(xineplug_inp_pvr_la_SOURCES) $(xineplug_inp_rtp_la_SOURCES) $(xineplug_inp_rtsp_la_SOURCES) $(xineplug_inp_smb_la_SOURCES) $(xineplug_inp_stdin_fifo_la_SOURCES) $(xineplug_inp_v4l_la_SOURCES) $(xineplug_inp_vcdo_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_inp_cdda.la: $(xineplug_inp_cdda_la_OBJECTS) $(xineplug_inp_cdda_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_cdda_la_LDFLAGS) $(xineplug_inp_cdda_la_OBJECTS) $(xineplug_inp_cdda_la_LIBADD) $(LIBS)
+ xineplug_inp_dvb.la: $(xineplug_inp_dvb_la_OBJECTS) $(xineplug_inp_dvb_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_dvb_la_rpath) $(xineplug_inp_dvb_la_LDFLAGS) $(xineplug_inp_dvb_la_OBJECTS) $(xineplug_inp_dvb_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_dvb_la_LDFLAGS) $(xineplug_inp_dvb_la_OBJECTS) $(xineplug_inp_dvb_la_LIBADD) $(LIBS)
+ xineplug_inp_dvd.la: $(xineplug_inp_dvd_la_OBJECTS) $(xineplug_inp_dvd_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_dvd_la_LDFLAGS) $(xineplug_inp_dvd_la_OBJECTS) $(xineplug_inp_dvd_la_LIBADD) $(LIBS)
+ xineplug_inp_file.la: $(xineplug_inp_file_la_OBJECTS) $(xineplug_inp_file_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_file_la_LDFLAGS) $(xineplug_inp_file_la_OBJECTS) $(xineplug_inp_file_la_LIBADD) $(LIBS)
+ xineplug_inp_gnome_vfs.la: $(xineplug_inp_gnome_vfs_la_OBJECTS) $(xineplug_inp_gnome_vfs_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_gnome_vfs_la_rpath) $(xineplug_inp_gnome_vfs_la_LDFLAGS) $(xineplug_inp_gnome_vfs_la_OBJECTS) $(xineplug_inp_gnome_vfs_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_gnome_vfs_la_LDFLAGS) $(xineplug_inp_gnome_vfs_la_OBJECTS) $(xineplug_inp_gnome_vfs_la_LIBADD) $(LIBS)
+ xineplug_inp_http.la: $(xineplug_inp_http_la_OBJECTS) $(xineplug_inp_http_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_http_la_LDFLAGS) $(xineplug_inp_http_la_OBJECTS) $(xineplug_inp_http_la_LIBADD) $(LIBS)
+ xineplug_inp_mms.la: $(xineplug_inp_mms_la_OBJECTS) $(xineplug_inp_mms_la_DEPENDENCIES)
+@@ -776,22 +588,22 @@
+ xineplug_inp_pnm.la: $(xineplug_inp_pnm_la_OBJECTS) $(xineplug_inp_pnm_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_pnm_la_LDFLAGS) $(xineplug_inp_pnm_la_OBJECTS) $(xineplug_inp_pnm_la_LIBADD) $(LIBS)
+ xineplug_inp_pvr.la: $(xineplug_inp_pvr_la_OBJECTS) $(xineplug_inp_pvr_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_pvr_la_rpath) $(xineplug_inp_pvr_la_LDFLAGS) $(xineplug_inp_pvr_la_OBJECTS) $(xineplug_inp_pvr_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_pvr_la_LDFLAGS) $(xineplug_inp_pvr_la_OBJECTS) $(xineplug_inp_pvr_la_LIBADD) $(LIBS)
+ xineplug_inp_rtp.la: $(xineplug_inp_rtp_la_OBJECTS) $(xineplug_inp_rtp_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_rtp_la_rpath) $(xineplug_inp_rtp_la_LDFLAGS) $(xineplug_inp_rtp_la_OBJECTS) $(xineplug_inp_rtp_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_rtp_la_LDFLAGS) $(xineplug_inp_rtp_la_OBJECTS) $(xineplug_inp_rtp_la_LIBADD) $(LIBS)
+ xineplug_inp_rtsp.la: $(xineplug_inp_rtsp_la_OBJECTS) $(xineplug_inp_rtsp_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_rtsp_la_LDFLAGS) $(xineplug_inp_rtsp_la_OBJECTS) $(xineplug_inp_rtsp_la_LIBADD) $(LIBS)
+ xineplug_inp_smb.la: $(xineplug_inp_smb_la_OBJECTS) $(xineplug_inp_smb_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_smb_la_rpath) $(xineplug_inp_smb_la_LDFLAGS) $(xineplug_inp_smb_la_OBJECTS) $(xineplug_inp_smb_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_smb_la_LDFLAGS) $(xineplug_inp_smb_la_OBJECTS) $(xineplug_inp_smb_la_LIBADD) $(LIBS)
+ xineplug_inp_stdin_fifo.la: $(xineplug_inp_stdin_fifo_la_OBJECTS) $(xineplug_inp_stdin_fifo_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_inp_stdin_fifo_la_LDFLAGS) $(xineplug_inp_stdin_fifo_la_OBJECTS) $(xineplug_inp_stdin_fifo_la_LIBADD) $(LIBS)
+ xineplug_inp_v4l.la: $(xineplug_inp_v4l_la_OBJECTS) $(xineplug_inp_v4l_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_v4l_la_rpath) $(xineplug_inp_v4l_la_LDFLAGS) $(xineplug_inp_v4l_la_OBJECTS) $(xineplug_inp_v4l_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_v4l_la_LDFLAGS) $(xineplug_inp_v4l_la_OBJECTS) $(xineplug_inp_v4l_la_LIBADD) $(LIBS)
+ xineplug_inp_vcdo.la: $(xineplug_inp_vcdo_la_OBJECTS) $(xineplug_inp_vcdo_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_vcdo_la_rpath) $(xineplug_inp_vcdo_la_LDFLAGS) $(xineplug_inp_vcdo_la_OBJECTS) $(xineplug_inp_vcdo_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_vcdo_la_LDFLAGS) $(xineplug_inp_vcdo_la_OBJECTS) $(xineplug_inp_vcdo_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -821,26 +633,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnm.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -851,6 +664,7 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -906,10 +720,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -919,23 +734,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -944,24 +750,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -970,22 +760,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -1002,15 +789,13 @@
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1020,9 +805,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -1034,31 +818,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -1076,8 +857,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -1085,14 +865,6 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+@@ -1100,22 +872,24 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-includeHEADERS install-info \
++ install-info-am install-info-recursive install-libLTLIBRARIES \
++ install-man install-recursive install-strip installcheck \
++ installcheck-am installdirs installdirs-am \
++ installdirs-recursive maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/dvb/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/dvb/Makefile.in
+--- xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/dvb/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/dvb
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,96 +271,33 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ noinst_HEADERS = \
+ dmx.h \
+ frontend.h
+
++subdir = src/input/dvb
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/dvb/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/dvb/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -527,6 +309,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -535,7 +322,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -547,24 +333,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -573,22 +343,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -606,7 +373,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -618,20 +387,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -639,8 +408,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -658,35 +425,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in
+--- xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libdvdnav/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,94 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libdvdnav_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/libdvdnav
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libdvdnav_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_libdvdnav_la_OBJECTS = decoder.lo dvdnav.lo highlight.lo \
+- navigation.lo read_cache.lo remap.lo searching.lo settings.lo \
+- vm.lo vmcmd.lo ifo_read.lo md5.lo nav_print.lo nav_read.lo \
+- dvd_reader.lo dvd_input.lo dvd_udf.lo
+-libdvdnav_la_OBJECTS = $(am_libdvdnav_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdvdnav_la_SOURCES)
+-DIST_SOURCES = $(libdvdnav_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -108,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -128,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -154,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -183,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -312,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -327,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -341,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -355,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -379,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -416,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -431,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -448,62 +271,17 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE -DHAVE_DLFCN_H
++
+ noinst_LTLIBRARIES = libdvdnav.la
++
+ libdvdnav_la_SOURCES = \
+ decoder.c \
+ dvdnav.c \
+@@ -525,6 +303,7 @@
+
+ libdvdnav_la_LIBADD = $(THREAD_LIBS)
+ libdvdnav_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ decoder.h \
+ dvdnav.h \
+@@ -547,45 +326,65 @@
+ dvd_udf.h \
+ bswap.h
+
++subdir = src/input/libdvdnav
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libdvdnav_la_DEPENDENCIES =
++am_libdvdnav_la_OBJECTS = decoder.lo dvdnav.lo highlight.lo \
++ navigation.lo read_cache.lo remap.lo searching.lo settings.lo \
++ vm.lo vmcmd.lo ifo_read.lo md5.lo nav_print.lo nav_read.lo \
++ dvd_reader.lo dvd_input.lo dvd_udf.lo
++libdvdnav_la_OBJECTS = $(am_libdvdnav_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dvd_input.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dvd_reader.Plo ./$(DEPDIR)/dvd_udf.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dvdnav.Plo ./$(DEPDIR)/highlight.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ifo_read.Plo ./$(DEPDIR)/md5.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/nav_print.Plo ./$(DEPDIR)/nav_read.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/navigation.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/read_cache.Plo ./$(DEPDIR)/remap.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/searching.Plo ./$(DEPDIR)/settings.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vm.Plo ./$(DEPDIR)/vmcmd.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libdvdnav_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libdvdnav_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/libdvdnav/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/libdvdnav/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -593,7 +392,7 @@
+ $(LINK) $(libdvdnav_la_LDFLAGS) $(libdvdnav_la_OBJECTS) $(libdvdnav_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -616,26 +415,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vm.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmcmd.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -647,6 +447,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -655,7 +460,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -667,24 +471,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -693,22 +481,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -726,7 +511,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -738,31 +525,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -780,8 +564,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -789,29 +572,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/libreal/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libreal/Makefile.in
+--- xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/libreal/Makefile.in 2005-02-13 01:07:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,90 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libreal_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/libreal
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libreal_la_LIBADD =
+-am_libreal_la_OBJECTS = real.lo asmrp.lo rmff.lo sdpplin.lo
+-libreal_la_OBJECTS = $(am_libreal_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libreal_la_SOURCES)
+-DIST_SOURCES = $(libreal_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -104,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -124,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -150,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -179,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -308,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -323,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -337,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -351,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -375,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -412,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -427,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -444,114 +271,80 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -I$(srcdir)/../librtsp
++
+ noinst_LTLIBRARIES = libreal.la
++
+ libreal_la_SOURCES = \
+ real.c \
+ asmrp.c \
+ rmff.c \
+ sdpplin.c
+
++
+ libreal_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ real.h \
+ asmrp.h \
+ rmff.h \
+ sdpplin.h
+
++subdir = src/input/libreal
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libreal_la_LIBADD =
++am_libreal_la_OBJECTS = real.lo asmrp.lo rmff.lo sdpplin.lo
++libreal_la_OBJECTS = $(am_libreal_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/asmrp.Plo ./$(DEPDIR)/real.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rmff.Plo ./$(DEPDIR)/sdpplin.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libreal_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libreal_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/libreal/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/libreal/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -559,7 +352,7 @@
+ $(LINK) $(libreal_la_LDFLAGS) $(libreal_la_OBJECTS) $(libreal_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -569,26 +362,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmff.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdpplin.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -600,6 +394,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -608,7 +407,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -620,24 +418,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -646,22 +428,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -679,7 +458,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -691,31 +472,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -733,8 +511,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -742,29 +519,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/librtsp/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in
+--- xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/librtsp/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,90 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(librtsp_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/librtsp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-librtsp_la_LIBADD =
+-am_librtsp_la_OBJECTS = rtsp.lo rtsp_session.lo
+-librtsp_la_OBJECTS = $(am_librtsp_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(librtsp_la_SOURCES)
+-DIST_SOURCES = $(librtsp_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -104,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -124,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -150,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -179,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -308,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -323,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -337,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -351,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -375,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -412,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -427,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -444,110 +271,76 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -I$(srcdir)/../libreal
++
+ noinst_LTLIBRARIES = librtsp.la
++
+ librtsp_la_SOURCES = \
+ rtsp.c \
+ rtsp_session.c
+
++
+ librtsp_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ rtsp.h \
+ rtsp_session.h
+
++subdir = src/input/librtsp
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++librtsp_la_LIBADD =
++am_librtsp_la_OBJECTS = rtsp.lo rtsp_session.lo
++librtsp_la_OBJECTS = $(am_librtsp_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/rtsp.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rtsp_session.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(librtsp_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(librtsp_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/librtsp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/librtsp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -555,7 +348,7 @@
+ $(LINK) $(librtsp_la_LDFLAGS) $(librtsp_la_OBJECTS) $(librtsp_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -563,26 +356,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtsp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtsp_session.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -594,6 +388,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -602,7 +401,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -614,24 +412,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -640,22 +422,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -673,7 +452,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -685,31 +466,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -727,8 +505,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -736,29 +513,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,118 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_inp_vcd_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 =
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@xineplug_inp_vcd_la_DEPENDENCIES = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__DEPENDENCIES_1) \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__DEPENDENCIES_2) \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__DEPENDENCIES_2)
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@xineplug_inp_vcd_la_DEPENDENCIES = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@ $(am__DEPENDENCIES_1) \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@ $(am__DEPENDENCIES_2)
+-am__xineplug_inp_vcd_la_SOURCES_DIST = xineplug_inp_vcd.c vcdplayer.c \
+- vcdio.c xine-extra.c
+-am__objects_1 = xineplug_inp_vcd.lo vcdplayer.lo vcdio.lo \
+- xine-extra.lo
+-@ENABLE_VCD_TRUE@am_xineplug_inp_vcd_la_OBJECTS = $(am__objects_1)
+-xineplug_inp_vcd_la_OBJECTS = $(am_xineplug_inp_vcd_la_OBJECTS)
+-@ENABLE_VCD_TRUE@am_xineplug_inp_vcd_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_inp_vcd_la_SOURCES)
+-DIST_SOURCES = $(am__xineplug_inp_vcd_la_SOURCES_DIST)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -132,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -152,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -178,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -207,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -336,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -351,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -365,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -379,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -403,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -440,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -455,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -472,135 +272,117 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = libcdio libvcd
++
+ vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
++
+ EXTRA_DIST = $(vcd_SRCS)
++
+ @ENABLE_VCD_TRUE@lib_LTLIBRARIES = xineplug_inp_vcd.la
++
+ @ENABLE_VCD_TRUE@AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
++
+ @ENABLE_VCD_TRUE@xineplug_inp_vcd_la_SOURCES = $(vcd_SRCS)
+ @ENABLE_VCD_TRUE@xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS)
++
+ noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
++subdir = src/input/vcd
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++@ENABLE_VCD_FALSE@@HAVE_VCDNAV_TRUE@xineplug_inp_vcd_la_DEPENDENCIES =
++@ENABLE_VCD_FALSE@@HAVE_VCDNAV_FALSE@xineplug_inp_vcd_la_DEPENDENCIES =
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@xineplug_inp_vcd_la_DEPENDENCIES = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@xineplug_inp_vcd_la_DEPENDENCIES = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++am__objects_1 = xineplug_inp_vcd.lo vcdplayer.lo vcdio.lo xine-extra.lo
++@ENABLE_VCD_TRUE@am_xineplug_inp_vcd_la_OBJECTS = $(am__objects_1)
++xineplug_inp_vcd_la_OBJECTS = $(am_xineplug_inp_vcd_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vcdio.Plo ./$(DEPDIR)/vcdplayer.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine-extra.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xineplug_inp_vcd.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_inp_vcd_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_inp_vcd_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_inp_vcd.la: $(xineplug_inp_vcd_la_OBJECTS) $(xineplug_inp_vcd_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_inp_vcd_la_rpath) $(xineplug_inp_vcd_la_LDFLAGS) $(xineplug_inp_vcd_la_OBJECTS) $(xineplug_inp_vcd_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_vcd_la_LDFLAGS) $(xineplug_inp_vcd_la_OBJECTS) $(xineplug_inp_vcd_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -610,26 +392,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine-extra.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_inp_vcd.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -695,10 +478,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -708,23 +492,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -733,24 +508,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -759,22 +518,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -789,17 +545,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -809,9 +563,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -823,31 +576,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -865,8 +615,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -874,35 +623,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/MSWindows/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libcdio/MSWindows
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,93 +271,28 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = aspi32.c aspi32.h ioctl.c win32.c win32.h
++subdir = src/input/vcd/libcdio/MSWindows
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libcdio/MSWindows/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libcdio/MSWindows/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -522,24 +306,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -557,7 +335,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -569,28 +349,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -608,34 +386,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,117 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libcdio_la_SOURCES) $(libiso9660_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libcdio
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libcdio_la_LIBADD =
+-am__libcdio_la_SOURCES_DIST = image/bincue.c image/nrg.c \
+- MSWindows/aspi32.c MSWindows/aspi32.h MSWindows/ioctl.c \
+- MSWindows/win32.c MSWindows/win32.h _cdio_bsdi.c \
+- _cdio_freebsd.c _cdio_generic.c _cdio_linux.c _cdio_osx.c \
+- _cdio_stdio.c _cdio_stream.c _cdio_sunos.c cdio.c cd_types.c \
+- ds.c logging.c sector.c util.c
+-am__objects_1 = bincue.lo nrg.lo aspi32.lo ioctl.lo win32.lo \
+- _cdio_bsdi.lo _cdio_freebsd.lo _cdio_generic.lo _cdio_linux.lo \
+- _cdio_osx.lo _cdio_stdio.lo _cdio_stream.lo _cdio_sunos.lo \
+- cdio.lo cd_types.lo ds.lo logging.lo sector.lo util.lo
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libcdio_la_OBJECTS = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_1)
+-libcdio_la_OBJECTS = $(am_libcdio_la_OBJECTS)
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libcdio_la_rpath =
+-libiso9660_la_LIBADD =
+-am__libiso9660_la_SOURCES_DIST = iso9660.c iso9660_fs.c xa.c
+-am__objects_2 = iso9660.lo iso9660_fs.lo xa.lo
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libiso9660_la_OBJECTS = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_2)
+-libiso9660_la_OBJECTS = $(am_libiso9660_la_OBJECTS)
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libiso9660_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libcdio_la_SOURCES) $(libiso9660_la_SOURCES)
+-DIST_SOURCES = $(am__libcdio_la_SOURCES_DIST) \
+- $(am__libiso9660_la_SOURCES_DIST)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -131,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -151,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -177,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -206,124 +133,14 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
++
+ INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -335,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -350,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -364,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -378,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -402,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -439,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -454,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -471,161 +272,182 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = cdio MSWindows image
++
+ libcdio_SRCS = \
+- image/bincue.c \
+- image/nrg.c \
+- MSWindows/aspi32.c \
+- MSWindows/aspi32.h \
+- MSWindows/ioctl.c \
+- MSWindows/win32.c \
+- MSWindows/win32.h \
+ _cdio_bsdi.c \
+- _cdio_freebsd.c \
+ _cdio_generic.c \
+ _cdio_linux.c \
+ _cdio_osx.c \
+ _cdio_stdio.c \
++ _cdio_stdio.h \
+ _cdio_stream.c \
++ _cdio_stream.h \
+ _cdio_sunos.c \
+- cdio.c \
+ cd_types.c \
++ cdio.c \
++ cdtext.c \
++ cdtext_private.h \
+ ds.c \
++ FreeBSD/freebsd.c \
++ FreeBSD/freebsd.h \
++ FreeBSD/freebsd_cam.c \
++ FreeBSD/freebsd_ioctl.c \
++ generic.h \
++ image.h \
++ image/bincue.c \
++ image/cdrdao.c \
++ image_common.h \
++ image/nrg.c \
++ image/nrg.h \
++ MSWindows/aspi32.c \
++ MSWindows/aspi32.h \
++ MSWindows/win32_ioctl.c \
++ MSWindows/win32.c \
++ MSWindows/win32.h \
+ logging.c \
++ scsi_mmc.c \
++ scsi_mmc_private.h \
+ sector.c \
+ util.c
+
++
+ libiso9660_SRCS = \
+ iso9660.c \
++ iso9660_private.h \
+ iso9660_fs.c \
+ xa.c
+
++
+ EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS)
++
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@noinst_LTLIBRARIES = libcdio.la libiso9660.la
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libcdio_la_SOURCES = $(libcdio_SRCS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libcdio_la_LDFLAGS = -avoid-version -module
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libiso9660_la_SOURCES = $(libiso9660_SRCS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libiso9660_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+- bytesex_asm.h \
+ cdio_assert.h \
+ _cdio_stdio.h \
+- ds.h \
+ scsi_mmc.h \
+- bytesex.h \
+ cdio_private.h \
+ _cdio_stream.h \
+- iso9660_private.h
++ iso9660_private.h \
++ portable.h
++
++subdir = src/input/vcd/libcdio
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libcdio_la_LIBADD =
++am__objects_1 = _cdio_bsdi.lo _cdio_generic.lo _cdio_linux.lo \
++ _cdio_osx.lo _cdio_stdio.lo _cdio_stream.lo _cdio_sunos.lo \
++ cd_types.lo cdio.lo cdtext.lo ds.lo freebsd.lo freebsd_cam.lo \
++ freebsd_ioctl.lo bincue.lo cdrdao.lo nrg.lo aspi32.lo \
++ win32_ioctl.lo win32.lo logging.lo scsi_mmc.lo sector.lo \
++ util.lo
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libcdio_la_OBJECTS = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_1)
++libcdio_la_OBJECTS = $(am_libcdio_la_OBJECTS)
++libiso9660_la_LIBADD =
++am__objects_2 = iso9660.lo iso9660_fs.lo xa.lo
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libiso9660_la_OBJECTS = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_2)
++libiso9660_la_OBJECTS = $(am_libiso9660_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_cdio_bsdi.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_generic.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_linux.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_osx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_stdio.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_stream.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/_cdio_sunos.Plo ./$(DEPDIR)/aspi32.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/bincue.Plo ./$(DEPDIR)/cd_types.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cdio.Plo ./$(DEPDIR)/cdrdao.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cdtext.Plo ./$(DEPDIR)/ds.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/freebsd.Plo ./$(DEPDIR)/freebsd_cam.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/freebsd_ioctl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/iso9660.Plo ./$(DEPDIR)/iso9660_fs.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/logging.Plo ./$(DEPDIR)/nrg.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/scsi_mmc.Plo ./$(DEPDIR)/sector.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/util.Plo ./$(DEPDIR)/win32.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/win32_ioctl.Plo ./$(DEPDIR)/xa.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libcdio_la_SOURCES) $(libiso9660_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libcdio_la_SOURCES) $(libiso9660_la_SOURCES)
+
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libcdio/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libcdio/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
++freebsd.lo: FreeBSD/freebsd.c
++freebsd_cam.lo: FreeBSD/freebsd_cam.c
++freebsd_ioctl.lo: FreeBSD/freebsd_ioctl.c
++bincue.lo: image/bincue.c
++cdrdao.lo: image/cdrdao.c
++nrg.lo: image/nrg.c
++aspi32.lo: MSWindows/aspi32.c
++win32_ioctl.lo: MSWindows/win32_ioctl.c
++win32.lo: MSWindows/win32.c
+ libcdio.la: $(libcdio_la_OBJECTS) $(libcdio_la_DEPENDENCIES)
+- $(LINK) $(am_libcdio_la_rpath) $(libcdio_la_LDFLAGS) $(libcdio_la_OBJECTS) $(libcdio_la_LIBADD) $(LIBS)
++ $(LINK) $(libcdio_la_LDFLAGS) $(libcdio_la_OBJECTS) $(libcdio_la_LIBADD) $(LIBS)
+ libiso9660.la: $(libiso9660_la_OBJECTS) $(libiso9660_la_DEPENDENCIES)
+- $(LINK) $(am_libiso9660_la_rpath) $(libiso9660_la_LDFLAGS) $(libiso9660_la_OBJECTS) $(libiso9660_la_LIBADD) $(LIBS)
++ $(LINK) $(libiso9660_la_LDFLAGS) $(libiso9660_la_OBJECTS) $(libiso9660_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cdio_bsdi.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cdio_freebsd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cdio_generic.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cdio_linux.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cdio_osx.Plo@am__quote@
+@@ -636,72 +458,206 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bincue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_types.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdio.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdrdao.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdtext.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ds.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioctl.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd_cam.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd_ioctl.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso9660.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso9660_fs.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nrg.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi_mmc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sector.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_ioctl.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xa.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
++freebsd.o: FreeBSD/freebsd.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd.c' object='freebsd.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd.Po' tmpdepfile='$(DEPDIR)/freebsd.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd.o `test -f 'FreeBSD/freebsd.c' || echo '$(srcdir)/'`FreeBSD/freebsd.c
++
++freebsd.obj: FreeBSD/freebsd.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd.c' object='freebsd.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd.Po' tmpdepfile='$(DEPDIR)/freebsd.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd.obj `cygpath -w FreeBSD/freebsd.c`
++
++freebsd.lo: FreeBSD/freebsd.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd.c' object='freebsd.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd.Plo' tmpdepfile='$(DEPDIR)/freebsd.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd.lo `test -f 'FreeBSD/freebsd.c' || echo '$(srcdir)/'`FreeBSD/freebsd.c
++
++freebsd_cam.o: FreeBSD/freebsd_cam.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_cam.c' object='freebsd_cam.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_cam.Po' tmpdepfile='$(DEPDIR)/freebsd_cam.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_cam.o `test -f 'FreeBSD/freebsd_cam.c' || echo '$(srcdir)/'`FreeBSD/freebsd_cam.c
++
++freebsd_cam.obj: FreeBSD/freebsd_cam.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_cam.c' object='freebsd_cam.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_cam.Po' tmpdepfile='$(DEPDIR)/freebsd_cam.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_cam.obj `cygpath -w FreeBSD/freebsd_cam.c`
++
++freebsd_cam.lo: FreeBSD/freebsd_cam.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_cam.c' object='freebsd_cam.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_cam.Plo' tmpdepfile='$(DEPDIR)/freebsd_cam.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_cam.lo `test -f 'FreeBSD/freebsd_cam.c' || echo '$(srcdir)/'`FreeBSD/freebsd_cam.c
++
++freebsd_ioctl.o: FreeBSD/freebsd_ioctl.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_ioctl.c' object='freebsd_ioctl.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_ioctl.Po' tmpdepfile='$(DEPDIR)/freebsd_ioctl.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_ioctl.o `test -f 'FreeBSD/freebsd_ioctl.c' || echo '$(srcdir)/'`FreeBSD/freebsd_ioctl.c
++
++freebsd_ioctl.obj: FreeBSD/freebsd_ioctl.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_ioctl.c' object='freebsd_ioctl.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_ioctl.Po' tmpdepfile='$(DEPDIR)/freebsd_ioctl.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_ioctl.obj `cygpath -w FreeBSD/freebsd_ioctl.c`
++
++freebsd_ioctl.lo: FreeBSD/freebsd_ioctl.c
++@AMDEP_TRUE@ source='FreeBSD/freebsd_ioctl.c' object='freebsd_ioctl.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/freebsd_ioctl.Plo' tmpdepfile='$(DEPDIR)/freebsd_ioctl.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_ioctl.lo `test -f 'FreeBSD/freebsd_ioctl.c' || echo '$(srcdir)/'`FreeBSD/freebsd_ioctl.c
++
++bincue.o: image/bincue.c
++@AMDEP_TRUE@ source='image/bincue.c' object='bincue.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/bincue.Po' tmpdepfile='$(DEPDIR)/bincue.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bincue.o `test -f 'image/bincue.c' || echo '$(srcdir)/'`image/bincue.c
++
++bincue.obj: image/bincue.c
++@AMDEP_TRUE@ source='image/bincue.c' object='bincue.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/bincue.Po' tmpdepfile='$(DEPDIR)/bincue.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bincue.obj `cygpath -w image/bincue.c`
+
+ bincue.lo: image/bincue.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bincue.lo -MD -MP -MF "$(DEPDIR)/bincue.Tpo" -c -o bincue.lo `test -f 'image/bincue.c' || echo '$(srcdir)/'`image/bincue.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bincue.Tpo" "$(DEPDIR)/bincue.Plo"; else rm -f "$(DEPDIR)/bincue.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='image/bincue.c' object='bincue.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bincue.lo `test -f 'image/bincue.c' || echo '$(srcdir)/'`image/bincue.c
++@AMDEP_TRUE@ source='image/bincue.c' object='bincue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/bincue.Plo' tmpdepfile='$(DEPDIR)/bincue.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bincue.lo `test -f 'image/bincue.c' || echo '$(srcdir)/'`image/bincue.c
++
++cdrdao.o: image/cdrdao.c
++@AMDEP_TRUE@ source='image/cdrdao.c' object='cdrdao.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/cdrdao.Po' tmpdepfile='$(DEPDIR)/cdrdao.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrdao.o `test -f 'image/cdrdao.c' || echo '$(srcdir)/'`image/cdrdao.c
++
++cdrdao.obj: image/cdrdao.c
++@AMDEP_TRUE@ source='image/cdrdao.c' object='cdrdao.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/cdrdao.Po' tmpdepfile='$(DEPDIR)/cdrdao.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrdao.obj `cygpath -w image/cdrdao.c`
++
++cdrdao.lo: image/cdrdao.c
++@AMDEP_TRUE@ source='image/cdrdao.c' object='cdrdao.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/cdrdao.Plo' tmpdepfile='$(DEPDIR)/cdrdao.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrdao.lo `test -f 'image/cdrdao.c' || echo '$(srcdir)/'`image/cdrdao.c
++
++nrg.o: image/nrg.c
++@AMDEP_TRUE@ source='image/nrg.c' object='nrg.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/nrg.Po' tmpdepfile='$(DEPDIR)/nrg.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nrg.o `test -f 'image/nrg.c' || echo '$(srcdir)/'`image/nrg.c
++
++nrg.obj: image/nrg.c
++@AMDEP_TRUE@ source='image/nrg.c' object='nrg.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/nrg.Po' tmpdepfile='$(DEPDIR)/nrg.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nrg.obj `cygpath -w image/nrg.c`
+
+ nrg.lo: image/nrg.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nrg.lo -MD -MP -MF "$(DEPDIR)/nrg.Tpo" -c -o nrg.lo `test -f 'image/nrg.c' || echo '$(srcdir)/'`image/nrg.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/nrg.Tpo" "$(DEPDIR)/nrg.Plo"; else rm -f "$(DEPDIR)/nrg.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='image/nrg.c' object='nrg.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nrg.lo `test -f 'image/nrg.c' || echo '$(srcdir)/'`image/nrg.c
++@AMDEP_TRUE@ source='image/nrg.c' object='nrg.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/nrg.Plo' tmpdepfile='$(DEPDIR)/nrg.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nrg.lo `test -f 'image/nrg.c' || echo '$(srcdir)/'`image/nrg.c
++
++aspi32.o: MSWindows/aspi32.c
++@AMDEP_TRUE@ source='MSWindows/aspi32.c' object='aspi32.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/aspi32.Po' tmpdepfile='$(DEPDIR)/aspi32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aspi32.o `test -f 'MSWindows/aspi32.c' || echo '$(srcdir)/'`MSWindows/aspi32.c
++
++aspi32.obj: MSWindows/aspi32.c
++@AMDEP_TRUE@ source='MSWindows/aspi32.c' object='aspi32.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/aspi32.Po' tmpdepfile='$(DEPDIR)/aspi32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aspi32.obj `cygpath -w MSWindows/aspi32.c`
+
+ aspi32.lo: MSWindows/aspi32.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aspi32.lo -MD -MP -MF "$(DEPDIR)/aspi32.Tpo" -c -o aspi32.lo `test -f 'MSWindows/aspi32.c' || echo '$(srcdir)/'`MSWindows/aspi32.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/aspi32.Tpo" "$(DEPDIR)/aspi32.Plo"; else rm -f "$(DEPDIR)/aspi32.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MSWindows/aspi32.c' object='aspi32.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aspi32.lo `test -f 'MSWindows/aspi32.c' || echo '$(srcdir)/'`MSWindows/aspi32.c
++@AMDEP_TRUE@ source='MSWindows/aspi32.c' object='aspi32.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/aspi32.Plo' tmpdepfile='$(DEPDIR)/aspi32.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aspi32.lo `test -f 'MSWindows/aspi32.c' || echo '$(srcdir)/'`MSWindows/aspi32.c
+
+-ioctl.lo: MSWindows/ioctl.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ioctl.lo -MD -MP -MF "$(DEPDIR)/ioctl.Tpo" -c -o ioctl.lo `test -f 'MSWindows/ioctl.c' || echo '$(srcdir)/'`MSWindows/ioctl.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/ioctl.Tpo" "$(DEPDIR)/ioctl.Plo"; else rm -f "$(DEPDIR)/ioctl.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MSWindows/ioctl.c' object='ioctl.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ioctl.lo `test -f 'MSWindows/ioctl.c' || echo '$(srcdir)/'`MSWindows/ioctl.c
++win32_ioctl.o: MSWindows/win32_ioctl.c
++@AMDEP_TRUE@ source='MSWindows/win32_ioctl.c' object='win32_ioctl.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32_ioctl.Po' tmpdepfile='$(DEPDIR)/win32_ioctl.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_ioctl.o `test -f 'MSWindows/win32_ioctl.c' || echo '$(srcdir)/'`MSWindows/win32_ioctl.c
++
++win32_ioctl.obj: MSWindows/win32_ioctl.c
++@AMDEP_TRUE@ source='MSWindows/win32_ioctl.c' object='win32_ioctl.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32_ioctl.Po' tmpdepfile='$(DEPDIR)/win32_ioctl.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_ioctl.obj `cygpath -w MSWindows/win32_ioctl.c`
++
++win32_ioctl.lo: MSWindows/win32_ioctl.c
++@AMDEP_TRUE@ source='MSWindows/win32_ioctl.c' object='win32_ioctl.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32_ioctl.Plo' tmpdepfile='$(DEPDIR)/win32_ioctl.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32_ioctl.lo `test -f 'MSWindows/win32_ioctl.c' || echo '$(srcdir)/'`MSWindows/win32_ioctl.c
++
++win32.o: MSWindows/win32.c
++@AMDEP_TRUE@ source='MSWindows/win32.c' object='win32.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32.Po' tmpdepfile='$(DEPDIR)/win32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32.o `test -f 'MSWindows/win32.c' || echo '$(srcdir)/'`MSWindows/win32.c
++
++win32.obj: MSWindows/win32.c
++@AMDEP_TRUE@ source='MSWindows/win32.c' object='win32.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32.Po' tmpdepfile='$(DEPDIR)/win32.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32.obj `cygpath -w MSWindows/win32.c`
+
+ win32.lo: MSWindows/win32.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT win32.lo -MD -MP -MF "$(DEPDIR)/win32.Tpo" -c -o win32.lo `test -f 'MSWindows/win32.c' || echo '$(srcdir)/'`MSWindows/win32.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/win32.Tpo" "$(DEPDIR)/win32.Plo"; else rm -f "$(DEPDIR)/win32.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MSWindows/win32.c' object='win32.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32.lo `test -f 'MSWindows/win32.c' || echo '$(srcdir)/'`MSWindows/win32.c
++@AMDEP_TRUE@ source='MSWindows/win32.c' object='win32.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/win32.Plo' tmpdepfile='$(DEPDIR)/win32.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o win32.lo `test -f 'MSWindows/win32.c' || echo '$(srcdir)/'`MSWindows/win32.c
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -767,10 +723,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -780,23 +737,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -805,24 +753,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -831,22 +763,20 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc $(distdir)/MSWindows $(distdir)/image
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/FreeBSD $(distdir)/MSWindows $(distdir)/image
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -861,17 +791,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -881,6 +809,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -892,31 +821,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -934,8 +860,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -943,34 +868,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/cdio/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libcdio/cdio
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,93 +271,47 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+-noinst_HEADERS = cdio.h cd_types.h iso9660.h logging.h sector.h types.h util.h version.h xa.h
++
++noinst_HEADERS = \
++ bytesex.h \
++ bytesex_asm.h \
++ cdio.h \
++ cdtext.h \
++ cdtext.h \
++ cd_types.h \
++ ds.h \
++ dvd.h \
++ iso9660.h \
++ logging.h \
++ sector.h \
++ scsi_mmc.h \
++ types.h \
++ util.h \
++ version.h \
++ xa.h
++
++subdir = src/input/vcd/libcdio/cdio
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libcdio/cdio/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libcdio/cdio/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -524,6 +323,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -532,7 +336,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -544,24 +347,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -570,22 +357,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -603,7 +387,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -615,20 +401,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -636,8 +422,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -655,35 +439,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libcdio/image/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libcdio/image
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,93 +271,28 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = bincue.c nrg.c
++subdir = src/input/vcd/libcdio/image
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libcdio/image/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libcdio/image/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -522,24 +306,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -557,7 +335,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -569,28 +349,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -608,34 +386,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,119 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libvcd_la_SOURCES) $(libvcdinfo_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libvcd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcd_la_DEPENDENCIES = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__DEPENDENCIES_1) \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__DEPENDENCIES_1)
+-am__libvcd_la_SOURCES_DIST = vcd.c data_structures.c directory.c \
+- files.c image.c image_bincue.c image_cdrdao.c image_nrg.c \
+- logging.c mpeg.c mpeg_stream.c pbc.c salloc.c sector.c \
+- stream.c stream_stdio.c util.c
+-am__objects_1 = vcd.lo data_structures.lo directory.lo files.lo \
+- image.lo image_bincue.lo image_cdrdao.lo image_nrg.lo \
+- logging.lo mpeg.lo mpeg_stream.lo pbc.lo salloc.lo sector.lo \
+- stream.lo stream_stdio.lo util.lo
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcd_la_OBJECTS = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_1)
+-libvcd_la_OBJECTS = $(am_libvcd_la_OBJECTS)
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcd_la_rpath =
+-libvcdinfo_la_LIBADD =
+-am__libvcdinfo_la_SOURCES_DIST = info.c inf.c info_private.c \
+- vcd_read.c
+-am__objects_2 = info.lo inf.lo info_private.lo vcd_read.lo
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcdinfo_la_OBJECTS = \
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_2)
+-libvcdinfo_la_OBJECTS = $(am_libvcdinfo_la_OBJECTS)
+-@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcdinfo_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libvcd_la_SOURCES) $(libvcdinfo_la_SOURCES)
+-DIST_SOURCES = $(am__libvcd_la_SOURCES_DIST) \
+- $(am__libvcdinfo_la_SOURCES_DIST)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -133,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -153,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -179,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -208,124 +133,14 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
++
+ INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -337,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -352,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -366,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -380,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -404,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -441,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -456,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -473,61 +272,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = libvcd
++
+ libvcd_SRCS = \
+ vcd.c \
+ data_structures.c \
+@@ -547,19 +300,23 @@
+ stream_stdio.c \
+ util.c
+
++
+ libvcdinfo_SRCS = \
+ info.c \
+ inf.c \
+ info_private.c \
+ vcd_read.c
+
++
+ EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS)
++
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@noinst_LTLIBRARIES = libvcd.la libvcdinfo.la
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcd_la_SOURCES = $(libvcd_SRCS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcd_la_LDFLAGS = -avoid-version -module
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS)
+ @ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcdinfo_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ vcd_assert.h \
+ data_structures.h \
+@@ -582,55 +339,93 @@
+ stream.h \
+ vcd_read.h
+
++subdir = src/input/vcd/libvcd
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++@ENABLE_VCD_FALSE@@HAVE_VCDNAV_TRUE@libvcd_la_DEPENDENCIES =
++@ENABLE_VCD_FALSE@@HAVE_VCDNAV_FALSE@libvcd_la_DEPENDENCIES =
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_TRUE@libvcd_la_DEPENDENCIES =
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@libvcd_la_DEPENDENCIES =
++am__objects_1 = vcd.lo data_structures.lo directory.lo files.lo image.lo \
++ image_bincue.lo image_cdrdao.lo image_nrg.lo logging.lo mpeg.lo \
++ mpeg_stream.lo pbc.lo salloc.lo sector.lo stream.lo \
++ stream_stdio.lo util.lo
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcd_la_OBJECTS = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_1)
++libvcd_la_OBJECTS = $(am_libvcd_la_OBJECTS)
++libvcdinfo_la_LIBADD =
++am__objects_2 = info.lo inf.lo info_private.lo vcd_read.lo
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@am_libvcdinfo_la_OBJECTS = \
++@ENABLE_VCD_TRUE@@HAVE_VCDNAV_FALSE@ $(am__objects_2)
++libvcdinfo_la_OBJECTS = $(am_libvcdinfo_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/data_structures.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/directory.Plo ./$(DEPDIR)/files.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/image.Plo ./$(DEPDIR)/image_bincue.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/image_cdrdao.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/image_nrg.Plo ./$(DEPDIR)/inf.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/info.Plo ./$(DEPDIR)/info_private.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/logging.Plo ./$(DEPDIR)/mpeg.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpeg_stream.Plo ./$(DEPDIR)/pbc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/salloc.Plo ./$(DEPDIR)/sector.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/stream.Plo ./$(DEPDIR)/stream_stdio.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/util.Plo ./$(DEPDIR)/vcd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vcd_read.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libvcd_la_SOURCES) $(libvcdinfo_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libvcd_la_SOURCES) $(libvcdinfo_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libvcd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libvcd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libvcd.la: $(libvcd_la_OBJECTS) $(libvcd_la_DEPENDENCIES)
+- $(LINK) $(am_libvcd_la_rpath) $(libvcd_la_LDFLAGS) $(libvcd_la_OBJECTS) $(libvcd_la_LIBADD) $(LIBS)
++ $(LINK) $(libvcd_la_LDFLAGS) $(libvcd_la_OBJECTS) $(libvcd_la_LIBADD) $(LIBS)
+ libvcdinfo.la: $(libvcdinfo_la_OBJECTS) $(libvcdinfo_la_DEPENDENCIES)
+- $(LINK) $(am_libvcdinfo_la_rpath) $(libvcdinfo_la_LDFLAGS) $(libvcdinfo_la_OBJECTS) $(libvcdinfo_la_LIBADD) $(LIBS)
++ $(LINK) $(libvcdinfo_la_LDFLAGS) $(libvcdinfo_la_OBJECTS) $(libvcdinfo_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -657,26 +452,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcd_read.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -742,10 +538,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -755,23 +552,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -780,24 +568,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -806,22 +578,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -836,17 +605,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -856,6 +623,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -867,31 +635,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -909,8 +674,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -918,34 +682,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in
+--- xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/input/vcd/libvcd/libvcd/Makefile.in 2005-02-13 01:07:55.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/input/vcd/libvcd/libvcd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,93 +271,30 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ noinst_HEADERS = files.h inf.h logging.h types.h files_private.h info.h sector.h version.h
++subdir = src/input/vcd/libvcd/libvcd
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/input/vcd/libvcd/libvcd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/input/vcd/libvcd/libvcd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -524,6 +306,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -532,7 +319,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -544,24 +330,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -570,22 +340,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -603,7 +370,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -615,20 +384,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -636,8 +405,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -655,35 +422,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/liba52/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liba52/Makefile.in
+--- xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liba52/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,100 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_a52_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/liba52
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_a52_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo \
+- crc.lo downmix.lo imdct.lo parse.lo xine_decoder.lo
+-xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_a52_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_a52_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -114,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -134,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -160,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -189,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -318,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -333,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -347,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -361,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -385,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -422,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -437,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -454,61 +272,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_a52.la
++
+ xineplug_decode_a52_la_SOURCES = \
+ bitstream.c \
+ bit_allocate.c \
+@@ -518,71 +290,87 @@
+ parse.c \
+ xine_decoder.c
+
++
+ xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = \
+ a52.h \
+ a52_internal.h \
+ bitstream.h \
+ tables.h
+
++subdir = src/liba52
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_a52_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo crc.lo \
++ downmix.lo imdct.lo parse.lo xine_decoder.lo
++xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit_allocate.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/bitstream.Plo ./$(DEPDIR)/crc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/downmix.Plo ./$(DEPDIR)/imdct.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/parse.Plo ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_a52_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_a52_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/liba52/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/liba52/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -590,7 +378,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_a52_la_LDFLAGS) $(xineplug_decode_a52_la_OBJECTS) $(xineplug_decode_a52_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -603,26 +391,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -634,6 +423,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -642,7 +436,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -654,24 +447,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -680,22 +457,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -713,10 +487,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -728,31 +502,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -770,8 +541,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -779,30 +549,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libdts/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libdts/Makefile.in
+--- xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libdts/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,100 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_dts_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libdts
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_dts_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_dts_la_OBJECTS = bitstream.lo downmix.lo parse.lo \
+- xine_decoder.lo
+-xineplug_decode_dts_la_OBJECTS = $(am_xineplug_decode_dts_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_dts_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_dts_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -114,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -134,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -160,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -189,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -318,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -333,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -347,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -361,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -385,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -422,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -437,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -454,124 +272,92 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_dts.la
++
+ xineplug_decode_dts_la_SOURCES = bitstream.c downmix.c parse.c xine_decoder.c
+ xineplug_decode_dts_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_dts_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
++
+ noinst_HEADERS = bitstream.h dts.h dts_internal.h tables.h tables_adpcm.h \
+ tables_fir.h tables_huffman.h tables_quantization.h tables_vq.h
+
++subdir = src/libdts
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_dts_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_dts_la_OBJECTS = bitstream.lo downmix.lo parse.lo \
++ xine_decoder.lo
++xineplug_decode_dts_la_OBJECTS = $(am_xineplug_decode_dts_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bitstream.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/downmix.Plo ./$(DEPDIR)/parse.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_dts_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_dts_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libdts/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libdts/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -579,7 +365,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_dts_la_LDFLAGS) $(xineplug_decode_dts_la_OBJECTS) $(xineplug_decode_dts_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -589,26 +375,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -620,6 +407,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -628,7 +420,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -640,24 +431,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -666,22 +441,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -699,10 +471,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -714,31 +486,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -756,8 +525,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -765,30 +533,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libfaad/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/Makefile.in
+--- xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,114 +13,68 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_faad_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libfaad
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_faad_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_faad_la_OBJECTS = bits.lo cfft.lo common.lo \
+- decoder.lo drc.lo error.lo filtbank.lo hcr.lo huffman.lo \
+- ic_predict.lo is.lo lt_predict.lo mdct.lo mp4.lo ms.lo \
+- output.lo pns.lo pulse.lo rvlc.lo sbr_dct.lo sbr_dec.lo \
+- sbr_e_nf.lo sbr_fbt.lo sbr_hfadj.lo sbr_hfgen.lo sbr_huff.lo \
+- sbr_qmf.lo sbr_syntax.lo sbr_tf_grid.lo specrec.lo ssr.lo \
+- ssr_fb.lo ssr_ipqf.lo syntax.lo tns.lo xine_decoder.lo
+-xineplug_decode_faad_la_OBJECTS = \
+- $(am_xineplug_decode_faad_la_OBJECTS)
+-@BUILD_FAAD_TRUE@am_xineplug_decode_faad_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_faad_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_faad_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
+ VPATH = @srcdir@:@srcdir@/codebook:
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -128,16 +82,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -148,18 +93,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -174,26 +111,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -203,124 +135,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -332,7 +153,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -347,9 +167,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -361,12 +179,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -375,23 +191,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -399,16 +207,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -436,9 +241,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -451,6 +253,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -468,63 +273,19 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = codebook
++
+ @BUILD_FAAD_TRUE@faad_module = xineplug_decode_faad.la
++
+ lib_LTLIBRARIES = $(faad_module)
++
+ xineplug_decode_faad_la_SOURCES = \
+ bits.c \
+ cfft.c \
+@@ -563,8 +324,10 @@
+ tns.c \
+ xine_decoder.c
+
++
+ xineplug_decode_faad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_decode_faad_la_LIBADD = $(XINE_LIB)
++
+ noinst_HEADERS = \
+ analysis.h \
+ bits.h \
+@@ -612,71 +375,110 @@
+ syntax.h \
+ tns.h
+
++subdir = src/libfaad
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_faad_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_faad_la_OBJECTS = bits.lo cfft.lo common.lo \
++ decoder.lo drc.lo error.lo filtbank.lo hcr.lo huffman.lo \
++ ic_predict.lo is.lo lt_predict.lo mdct.lo mp4.lo ms.lo \
++ output.lo pns.lo pulse.lo rvlc.lo sbr_dct.lo sbr_dec.lo \
++ sbr_e_nf.lo sbr_fbt.lo sbr_hfadj.lo sbr_hfgen.lo sbr_huff.lo \
++ sbr_qmf.lo sbr_syntax.lo sbr_tf_grid.lo specrec.lo ssr.lo \
++ ssr_fb.lo ssr_ipqf.lo syntax.lo tns.lo xine_decoder.lo
++xineplug_decode_faad_la_OBJECTS = $(am_xineplug_decode_faad_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bits.Plo ./$(DEPDIR)/cfft.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/common.Plo ./$(DEPDIR)/decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/drc.Plo ./$(DEPDIR)/error.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/filtbank.Plo ./$(DEPDIR)/hcr.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/huffman.Plo ./$(DEPDIR)/ic_predict.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/is.Plo ./$(DEPDIR)/lt_predict.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mdct.Plo ./$(DEPDIR)/mp4.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ms.Plo ./$(DEPDIR)/output.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pns.Plo ./$(DEPDIR)/pulse.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rvlc.Plo ./$(DEPDIR)/sbr_dct.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sbr_dec.Plo ./$(DEPDIR)/sbr_e_nf.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sbr_fbt.Plo ./$(DEPDIR)/sbr_hfadj.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sbr_hfgen.Plo ./$(DEPDIR)/sbr_huff.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sbr_qmf.Plo ./$(DEPDIR)/sbr_syntax.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sbr_tf_grid.Plo ./$(DEPDIR)/specrec.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ssr.Plo ./$(DEPDIR)/ssr_fb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ssr_ipqf.Plo ./$(DEPDIR)/syntax.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/tns.Plo ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_faad_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_decode_faad_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libfaad/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libfaad/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_faad.la: $(xineplug_decode_faad_la_OBJECTS) $(xineplug_decode_faad_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_faad_la_rpath) $(xineplug_decode_faad_la_LDFLAGS) $(xineplug_decode_faad_la_OBJECTS) $(xineplug_decode_faad_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_faad_la_LDFLAGS) $(xineplug_decode_faad_la_OBJECTS) $(xineplug_decode_faad_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -718,26 +520,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tns.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -803,10 +606,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -816,23 +620,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -841,24 +636,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -867,22 +646,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -897,17 +673,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -917,9 +691,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -931,31 +704,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -973,8 +743,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -982,35 +751,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in
+--- xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libfaad/codebook/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libfaad/codebook
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = hcb.h \
+ hcb_1.h \
+ hcb_2.h \
+@@ -490,38 +292,20 @@
+ hcb_11.h \
+ hcb_sf.h
+
++subdir = src/libfaad/codebook
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libfaad/codebook/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libfaad/codebook/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -535,24 +319,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -570,7 +348,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -582,28 +362,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -621,34 +399,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,125 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_dvaudio_la_SOURCES) $(xineplug_decode_ff_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_dvaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_dvaudio_la_OBJECTS = dvaudio_decoder.lo
+-xineplug_decode_dvaudio_la_OBJECTS = \
+- $(am_xineplug_decode_dvaudio_la_OBJECTS)
+-am__DEPENDENCIES_2 =
+-@HAVE_FFMPEG_FALSE@am__DEPENDENCIES_3 = $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
+-@HAVE_FFMPEG_FALSE@ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+-@HAVE_FFMPEG_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
+-xineplug_decode_ff_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_3)
+-am__xineplug_decode_ff_la_SOURCES_DIST = xine_decoder.c \
+- audio_decoder.c video_decoder.c mpeg_parser.c xine_encoder.c
+-@HAVE_DXR3_FALSE@am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo \
+-@HAVE_DXR3_FALSE@ audio_decoder.lo video_decoder.lo \
+-@HAVE_DXR3_FALSE@ mpeg_parser.lo
+-@HAVE_DXR3_TRUE@am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo \
+-@HAVE_DXR3_TRUE@ audio_decoder.lo video_decoder.lo \
+-@HAVE_DXR3_TRUE@ xine_encoder.lo mpeg_parser.lo
+-xineplug_decode_ff_la_OBJECTS = $(am_xineplug_decode_ff_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_dvaudio_la_SOURCES) \
+- $(xineplug_decode_ff_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_dvaudio_la_SOURCES) \
+- $(am__xineplug_decode_ff_la_SOURCES_DIST)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = libavcodec
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -139,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -159,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -185,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -214,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -343,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -358,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -372,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -386,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -410,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -447,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -462,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -479,149 +272,144 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ @HAVE_FFMPEG_TRUE@FF_CPPFLAGS = $(FFMPEG_CPPFLAGS)
++@HAVE_FFMPEG_TRUE@link_ffmpeg = $(FFMPEG_LIBS)
+ @HAVE_FFMPEG_FALSE@link_ffmpeg = \
+ @HAVE_FFMPEG_FALSE@ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
+ @HAVE_FFMPEG_FALSE@ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+
+-@HAVE_FFMPEG_TRUE@link_ffmpeg = $(FFMPEG_LIBS)
+ @HAVE_FFMPEG_FALSE@SUBDIRS = libavcodec
+
+ # this must always be included, even if the current machine has no DXR3...
+ EXTRA_DIST = xine_encoder.c diff_to_ffmpeg_cvs.txt
++
+ INTERNAL_DOCS = diff_to_ffmpeg_cvs.txt
++
+ lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
+-@HAVE_DXR3_FALSE@AM_CPPFLAGS = $(FF_CPPFLAGS)
+-@HAVE_DXR3_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS)
+-@HAVE_DXR3_FALSE@xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
+-@HAVE_DXR3_FALSE@ mpeg_parser.c
+
++@HAVE_DXR3_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS)
++@HAVE_DXR3_FALSE@AM_CPPFLAGS = $(FF_CPPFLAGS)
+ @HAVE_DXR3_TRUE@xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
+ @HAVE_DXR3_TRUE@ xine_encoder.c mpeg_parser.c
+
+-@HAVE_DXR3_FALSE@xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++@HAVE_DXR3_FALSE@xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
++@HAVE_DXR3_FALSE@ mpeg_parser.c
++
+ # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
+ # dlsym()ing the necessary function. Therefore we must allow more exported
+ # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@
+ @HAVE_DXR3_TRUE@xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
++@HAVE_DXR3_FALSE@xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
+ $(link_ffmpeg)
+
++
+ xineplug_decode_dvaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_decode_dvaudio_la_SOURCES = dvaudio_decoder.c
+ xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB)
++
+ noinst_HEADERS = xine_decoder.h mpeg_parser.h
++subdir = src/libffmpeg
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_dvaudio_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_dvaudio_la_OBJECTS = dvaudio_decoder.lo
++xineplug_decode_dvaudio_la_OBJECTS = \
++ $(am_xineplug_decode_dvaudio_la_OBJECTS)
++@HAVE_FFMPEG_TRUE@xineplug_decode_ff_la_DEPENDENCIES = \
++@HAVE_FFMPEG_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_FFMPEG_FALSE@xineplug_decode_ff_la_DEPENDENCIES = \
++@HAVE_FFMPEG_FALSE@ $(top_builddir)/src/xine-engine/libxine.la \
++@HAVE_FFMPEG_FALSE@ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
++@HAVE_FFMPEG_FALSE@ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
++@HAVE_DXR3_TRUE@am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo \
++@HAVE_DXR3_TRUE@ audio_decoder.lo video_decoder.lo \
++@HAVE_DXR3_TRUE@ xine_encoder.lo mpeg_parser.lo
++@HAVE_DXR3_FALSE@am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo \
++@HAVE_DXR3_FALSE@ audio_decoder.lo video_decoder.lo \
++@HAVE_DXR3_FALSE@ mpeg_parser.lo
++xineplug_decode_ff_la_OBJECTS = $(am_xineplug_decode_ff_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dvaudio_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpeg_parser.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_encoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_dvaudio_la_SOURCES) \
++ $(xineplug_decode_ff_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = libavcodec
++SOURCES = $(xineplug_decode_dvaudio_la_SOURCES) $(xineplug_decode_ff_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -631,7 +419,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_ff_la_LDFLAGS) $(xineplug_decode_ff_la_OBJECTS) $(xineplug_decode_ff_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -643,26 +431,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_encoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -728,10 +517,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -741,23 +531,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -766,24 +547,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -792,22 +557,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -824,15 +586,13 @@
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -842,9 +602,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -856,31 +615,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -898,8 +654,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -907,35 +662,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,108 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libavcodec_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_la_LIBADD =
+-am_libavcodec_la_OBJECTS = 4xm.lo 8bps.lo adpcm.lo asv1.lo cabac.lo \
+- cinepak.lo common.lo cyuv.lo dpcm.lo dsputil.lo dv.lo \
+- error_resilience.lo eval.lo faandct.lo flac.lo flicvideo.lo \
+- fft.lo golomb.lo h263.lo h263dec.lo h264.lo huffyuv.lo \
+- idcinvideo.lo imgconvert.lo indeo3.lo integer.lo \
+- interplayvideo.lo jfdctfst.lo jfdctint.lo jrevdct.lo lcl.lo \
+- mdct.lo mace.lo mem.lo mjpeg.lo motion_est.lo mpeg12.lo \
+- mpegaudiodec.lo mpegvideo.lo msmpeg4.lo msrle.lo msvideo1.lo \
+- opts.lo parser.lo pcm.lo qtrle.lo ra144.lo ra288.lo \
+- ratecontrol.lo rational.lo roqvideo.lo rpza.lo rv10.lo \
+- simple_idct.lo smc.lo svq1.lo truemotion1.lo utils.lo vcr1.lo \
+- vmdav.lo vp3.lo vp3dsp.lo vqavideo.lo wmadec.lo xan.lo
+-libavcodec_la_OBJECTS = $(am_libavcodec_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_la_SOURCES)
+-DIST_SOURCES = $(libavcodec_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -122,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -142,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -168,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -197,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -326,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -341,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -355,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -369,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -393,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -430,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -445,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -462,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = armv4l i386 mlib alpha ppc sparc libpostproc
+
+ # some of ffmpeg's decoders are not used by xine yet
+@@ -527,7 +289,9 @@
+ # otherwise we get unresolved symbols, because some unsatisfied function calls
+ # are not optimized away with debug optimization
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
++
+ noinst_LTLIBRARIES = libavcodec.la
++
+ libavcodec_la_SOURCES = \
+ 4xm.c \
+ 8bps.c \
+@@ -595,6 +359,7 @@
+ wmadec.c \
+ xan.c
+
++
+ libavcodec_la_LDFLAGS = \
+ $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \
+ $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \
+@@ -603,6 +368,7 @@
+ $(top_builddir)/src/libffmpeg/libavcodec/sparc/libavcodec_sparc.la \
+ -avoid-version -module
+
++
+ noinst_HEADERS = \
+ avcodec.h \
+ bswap.h \
+@@ -636,45 +402,104 @@
+ vp3data.h \
+ wmadata.h
+
++subdir = src/libffmpeg/libavcodec
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_la_LIBADD =
++am_libavcodec_la_OBJECTS = 4xm.lo 8bps.lo adpcm.lo asv1.lo cabac.lo \
++ cinepak.lo common.lo cyuv.lo dpcm.lo dsputil.lo dv.lo \
++ error_resilience.lo eval.lo faandct.lo flac.lo flicvideo.lo \
++ fft.lo golomb.lo h263.lo h263dec.lo h264.lo huffyuv.lo \
++ idcinvideo.lo imgconvert.lo indeo3.lo integer.lo \
++ interplayvideo.lo jfdctfst.lo jfdctint.lo jrevdct.lo lcl.lo \
++ mdct.lo mace.lo mem.lo mjpeg.lo motion_est.lo mpeg12.lo \
++ mpegaudiodec.lo mpegvideo.lo msmpeg4.lo msrle.lo msvideo1.lo \
++ opts.lo parser.lo pcm.lo qtrle.lo ra144.lo ra288.lo \
++ ratecontrol.lo rational.lo roqvideo.lo rpza.lo rv10.lo \
++ simple_idct.lo smc.lo svq1.lo truemotion1.lo utils.lo vcr1.lo \
++ vmdav.lo vp3.lo vp3dsp.lo vqavideo.lo wmadec.lo xan.lo
++libavcodec_la_OBJECTS = $(am_libavcodec_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/4xm.Plo ./$(DEPDIR)/8bps.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/adpcm.Plo ./$(DEPDIR)/asv1.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cabac.Plo ./$(DEPDIR)/cinepak.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/common.Plo ./$(DEPDIR)/cyuv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dpcm.Plo ./$(DEPDIR)/dsputil.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dv.Plo ./$(DEPDIR)/error_resilience.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/eval.Plo ./$(DEPDIR)/faandct.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/fft.Plo ./$(DEPDIR)/flac.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/flicvideo.Plo ./$(DEPDIR)/golomb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/h263.Plo ./$(DEPDIR)/h263dec.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/h264.Plo ./$(DEPDIR)/huffyuv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/idcinvideo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/imgconvert.Plo ./$(DEPDIR)/indeo3.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/integer.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/interplayvideo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/jfdctfst.Plo ./$(DEPDIR)/jfdctint.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/jrevdct.Plo ./$(DEPDIR)/lcl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mace.Plo ./$(DEPDIR)/mdct.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mem.Plo ./$(DEPDIR)/mjpeg.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_est.Plo ./$(DEPDIR)/mpeg12.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpegaudiodec.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo.Plo ./$(DEPDIR)/msmpeg4.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/msrle.Plo ./$(DEPDIR)/msvideo1.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/opts.Plo ./$(DEPDIR)/parser.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pcm.Plo ./$(DEPDIR)/qtrle.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ra144.Plo ./$(DEPDIR)/ra288.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ratecontrol.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rational.Plo ./$(DEPDIR)/roqvideo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rpza.Plo ./$(DEPDIR)/rv10.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct.Plo ./$(DEPDIR)/smc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/svq1.Plo ./$(DEPDIR)/truemotion1.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/utils.Plo ./$(DEPDIR)/vcr1.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vmdav.Plo ./$(DEPDIR)/vp3.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vp3dsp.Plo ./$(DEPDIR)/vqavideo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/wmadec.Plo ./$(DEPDIR)/xan.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libavcodec_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libavcodec_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -682,7 +507,7 @@
+ $(LINK) $(libavcodec_la_LDFLAGS) $(libavcodec_la_OBJECTS) $(libavcodec_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -753,26 +578,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmadec.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xan.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -838,10 +664,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -851,23 +678,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -876,24 +694,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -902,22 +704,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -932,17 +731,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -952,6 +749,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -963,31 +761,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -1005,8 +800,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -1014,34 +808,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/alpha/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/alpha
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,61 +271,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
++
+ EXTRA_DIST = asm.h \
+ dsputil_alpha.c \
+ mpegvideo_alpha.c \
+@@ -486,38 +289,20 @@
+ dsputil_alpha_asm.S \
+ simple_idct_alpha.c
+
++subdir = src/libffmpeg/libavcodec/alpha
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/alpha/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/alpha/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -531,24 +316,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -566,7 +345,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -578,28 +359,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -617,34 +396,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/armv4l/Makefile.in 2005-02-13 01:07:56.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,90 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(libavcodec_armv4l_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/armv4l
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_armv4l_la_LIBADD =
+-am__objects_1 =
+-am__objects_2 = libavcodec_armv4l_dummy.lo
+-am_libavcodec_armv4l_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+-libavcodec_armv4l_la_OBJECTS = $(am_libavcodec_armv4l_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_armv4l_la_SOURCES)
+-DIST_SOURCES = $(libavcodec_armv4l_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -104,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -124,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -150,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -179,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -308,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -323,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -337,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -351,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -375,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -412,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -427,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -444,62 +271,17 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
++
+ noinst_LTLIBRARIES = libavcodec_armv4l.la
++
+ libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S mpegvideo_arm.c simple_idct_arm.S
+ libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c
+ EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy)
+@@ -508,46 +290,56 @@
+ #armv4l_modules = $(libavcodec_armv4l_src)
+ #endif
+ armv4l_modules =
++
+ libavcodec_armv4l_la_SOURCES = $(armv4l_modules) $(libavcodec_armv4l_dummy)
++subdir = src/libffmpeg/libavcodec/armv4l
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_armv4l_la_LDFLAGS =
++libavcodec_armv4l_la_LIBADD =
++am__objects_1 =
++am__objects_2 = libavcodec_armv4l_dummy.lo
++am_libavcodec_armv4l_la_OBJECTS = $(am__objects_1) $(am__objects_2)
++libavcodec_armv4l_la_OBJECTS = $(am_libavcodec_armv4l_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libavcodec_armv4l_dummy.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libavcodec_armv4l_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(libavcodec_armv4l_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/armv4l/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/armv4l/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -555,33 +347,34 @@
+ $(LINK) $(libavcodec_armv4l_la_LDFLAGS) $(libavcodec_armv4l_la_OBJECTS) $(libavcodec_armv4l_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec_armv4l_dummy.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -593,6 +386,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -601,7 +399,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -613,24 +410,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -639,22 +420,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -672,7 +450,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -684,31 +464,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -726,8 +503,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -735,29 +511,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/i386/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,116 +13,75 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libavcodec_mmx_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/i386
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_mmx_la_LIBADD =
+-am__libavcodec_mmx_la_SOURCES_DIST = cputest.c dsputil_mmx.c \
+- fdct_mmx.c fft_sse.c idct_mmx.c motion_est_mmx.c \
+- mpegvideo_mmx.c simple_idct_mmx.c vp3dsp_mmx.c vp3dsp_sse2.c \
+- libavcodec_mmx_dummy.c
+-am__objects_1 = cputest.lo dsputil_mmx.lo fdct_mmx.lo fft_sse.lo \
+- idct_mmx.lo motion_est_mmx.lo mpegvideo_mmx.lo \
+- simple_idct_mmx.lo vp3dsp_mmx.lo vp3dsp_sse2.lo
+-@HAVE_FFMMX_TRUE@am__objects_2 = $(am__objects_1)
+-am__objects_3 = libavcodec_mmx_dummy.lo
+-am_libavcodec_mmx_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+-libavcodec_mmx_la_OBJECTS = $(am_libavcodec_mmx_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_mmx_la_SOURCES)
+-DIST_SOURCES = $(am__libavcodec_mmx_la_SOURCES_DIST)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+ ARTS_CONFIG = @ARTS_CONFIG@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
++
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -133,20 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-# CFLAGS is here to filter out -funroll-loops because it causes bad
+-# behavior of libavcodec
+-CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,62 +272,20 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
++# CFLAGS is here to filter out -funroll-loops because it causes bad
++# behavior of libavcodec
++CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
++
+ noinst_LTLIBRARIES = libavcodec_mmx.la
++
+ libavcodec_mmx_src = \
+ cputest.c \
+ dsputil_mmx.c \
+@@ -523,54 +298,81 @@
+ vp3dsp_mmx.c \
+ vp3dsp_sse2.c
+
++
+ libavcodec_mmx_dummy = libavcodec_mmx_dummy.c
++
+ EXTRA_DIST = \
+ $(libavcodec_mmx_dummy) \
+ $(libavcodec_mmx_src) \
+ mpegvideo_mmx_template.c
+
++
+ @HAVE_FFMMX_TRUE@mmx_modules = $(libavcodec_mmx_src)
++
+ libavcodec_mmx_la_SOURCES = $(mmx_modules) $(libavcodec_mmx_dummy)
++
+ noinst_HEADERS = dsputil_mmx_avg.h dsputil_mmx_rnd.h mmx.h
++subdir = src/libffmpeg/libavcodec/i386
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_mmx_la_LDFLAGS =
++libavcodec_mmx_la_LIBADD =
++am__objects_1 = cputest.lo dsputil_mmx.lo fdct_mmx.lo fft_sse.lo \
++ idct_mmx.lo motion_est_mmx.lo mpegvideo_mmx.lo \
++ simple_idct_mmx.lo vp3dsp_mmx.lo vp3dsp_sse2.lo
++@HAVE_FFMMX_TRUE@am__objects_2 = $(am__objects_1)
++am__objects_3 = libavcodec_mmx_dummy.lo
++am_libavcodec_mmx_la_OBJECTS = $(am__objects_2) $(am__objects_3)
++libavcodec_mmx_la_OBJECTS = $(am_libavcodec_mmx_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cputest.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dsputil_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/fdct_mmx.Plo ./$(DEPDIR)/fft_sse.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/idct_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/libavcodec_mmx_dummy.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_est_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpegvideo_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/simple_idct_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vp3dsp_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vp3dsp_sse2.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libavcodec_mmx_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libavcodec_mmx_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/i386/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/i386/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -578,7 +380,7 @@
+ $(LINK) $(libavcodec_mmx_la_LDFLAGS) $(libavcodec_mmx_la_OBJECTS) $(libavcodec_mmx_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -595,26 +397,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vp3dsp_mmx.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vp3dsp_sse2.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -626,6 +429,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -634,7 +442,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -646,24 +453,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -672,22 +463,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -705,7 +493,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -717,31 +507,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -759,8 +546,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -768,29 +554,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/libpostproc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,90 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libpostprocess_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/libpostproc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libpostprocess_la_LIBADD =
+-am_libpostprocess_la_OBJECTS = postprocess.lo
+-libpostprocess_la_OBJECTS = $(am_libpostprocess_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libpostprocess_la_SOURCES)
+-DIST_SOURCES = $(libpostprocess_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -104,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -124,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -150,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -179,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -308,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -323,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -337,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -351,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -375,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -412,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -427,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -444,104 +271,70 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec
++
+ noinst_LTLIBRARIES = libpostprocess.la
++
+ EXTRA_DIST = postprocess_template.c postprocess_altivec_template.c
++
+ libpostprocess_la_SOURCES = postprocess.c
++
+ noinst_HEADERS = mangle.h postprocess.h postprocess_internal.h
++subdir = src/libffmpeg/libavcodec/libpostproc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libpostprocess_la_LDFLAGS =
++libpostprocess_la_LIBADD =
++am_libpostprocess_la_OBJECTS = postprocess.lo
++libpostprocess_la_OBJECTS = $(am_libpostprocess_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/postprocess.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libpostprocess_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libpostprocess_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/libpostproc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/libpostproc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -549,33 +342,34 @@
+ $(LINK) $(libpostprocess_la_LDFLAGS) $(libpostprocess_la_OBJECTS) $(libpostprocess_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/postprocess.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -587,6 +381,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -595,7 +394,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -607,24 +405,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -633,22 +415,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -666,7 +445,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -678,31 +459,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -720,8 +498,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -729,29 +506,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/mlib/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,93 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(libavcodec_mlib_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/mlib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_mlib_la_LIBADD =
+-am__libavcodec_mlib_la_SOURCES_DIST = dsputil_mlib.c \
+- libavcodec_mlib_dummy.c
+-am__objects_1 = dsputil_mlib.lo
+-@HAVE_MLIB_TRUE@am__objects_2 = $(am__objects_1)
+-am__objects_3 = libavcodec_mlib_dummy.lo
+-am_libavcodec_mlib_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+-libavcodec_mlib_la_OBJECTS = $(am_libavcodec_mlib_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_mlib_la_SOURCES)
+-DIST_SOURCES = $(am__libavcodec_mlib_la_SOURCES_DIST)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -107,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -127,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -153,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -182,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -311,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -326,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -340,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -354,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -378,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -415,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -430,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -447,106 +271,75 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
++
+ noinst_LTLIBRARIES = libavcodec_mlib.la
++
+ libavcodec_mlib_src = dsputil_mlib.c
+ libavcodec_mlib_dummy = libavcodec_mlib_dummy.c
++
+ EXTRA_DIST = $(libavcodec_mlib_src) $(libavcodec_mlib_dummy)
++
+ @HAVE_MLIB_TRUE@mlib_modules = $(libavcodec_mlib_src)
++
+ libavcodec_mlib_la_SOURCES = $(mlib_modules) $(libavcodec_mlib_dummy)
++subdir = src/libffmpeg/libavcodec/mlib
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_mlib_la_LDFLAGS =
++libavcodec_mlib_la_LIBADD =
++am__objects_1 = dsputil_mlib.lo
++@HAVE_MLIB_TRUE@am__objects_2 = $(am__objects_1)
++am__objects_3 = libavcodec_mlib_dummy.lo
++am_libavcodec_mlib_la_OBJECTS = $(am__objects_2) $(am__objects_3)
++libavcodec_mlib_la_OBJECTS = $(am_libavcodec_mlib_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dsputil_mlib.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/libavcodec_mlib_dummy.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libavcodec_mlib_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(libavcodec_mlib_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/mlib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/mlib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -554,7 +347,7 @@
+ $(LINK) $(libavcodec_mlib_la_LDFLAGS) $(libavcodec_mlib_la_OBJECTS) $(libavcodec_mlib_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -562,26 +355,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_mlib.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec_mlib_dummy.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -593,6 +387,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -601,7 +400,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -613,24 +411,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -639,22 +421,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -672,7 +451,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -684,31 +465,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -726,8 +504,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -735,29 +512,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/ppc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,108 +13,75 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libavcodec_ppc_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/ppc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_ppc_la_LIBADD =
+-am__objects_1 = libavcodec_ppc_dummy.lo
+-am_libavcodec_ppc_la_OBJECTS = $(am__objects_1)
+-libavcodec_ppc_la_OBJECTS = $(am_libavcodec_ppc_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_ppc_la_SOURCES)
+-DIST_SOURCES = $(libavcodec_ppc_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+ ARTS_CONFIG = @ARTS_CONFIG@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
++
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -125,20 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-# CFLAGS is here to filter out -funroll-loops because it causes bad
+-# behavior of libavcodec
+-CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -153,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -182,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -311,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -326,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -340,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -354,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -378,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -415,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -430,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -447,62 +272,20 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
++# CFLAGS is here to filter out -funroll-loops because it causes bad
++# behavior of libavcodec
++CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
++
+ noinst_LTLIBRARIES = libavcodec_ppc.la
++
+ libavcodec_ppc_src = dsputil_altivec.c \
+ dsputil_ppc.c \
+ fdct_altivec.c \
+@@ -513,52 +296,64 @@
+ mpegvideo_ppc.c
+
+ libavcodec_ppc_dummy = libavcodec_ppc_dummy.c
++
+ EXTRA_DIST = $(libavcodec_ppc_src) $(libavcodec_ppc_dummy)
+
++
+ #if PPC_ARCH
+ #ppc_modules = $(libavcodec_ppc_src)
+ #endif
+ libavcodec_ppc_la_SOURCES = $(ppc_modules) $(libavcodec_ppc_dummy)
++
+ noinst_HEADERS = dsputil_altivec.h dsputil_ppc.h gcc_fixes.h
++subdir = src/libffmpeg/libavcodec/ppc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_ppc_la_LDFLAGS =
++libavcodec_ppc_la_LIBADD =
++am__objects_2 = libavcodec_ppc_dummy.lo
++am_libavcodec_ppc_la_OBJECTS = $(am__objects_1) $(am__objects_2)
++libavcodec_ppc_la_OBJECTS = $(am_libavcodec_ppc_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libavcodec_ppc_dummy.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libavcodec_ppc_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libavcodec_ppc_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/ppc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/ppc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -566,33 +361,34 @@
+ $(LINK) $(libavcodec_ppc_la_LDFLAGS) $(libavcodec_ppc_la_OBJECTS) $(libavcodec_ppc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec_ppc_dummy.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -604,6 +400,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -612,7 +413,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -624,24 +424,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -650,22 +434,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -683,7 +464,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -695,31 +478,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -737,8 +517,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -746,29 +525,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in
+--- xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libffmpeg/libavcodec/sparc/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,91 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(libavcodec_sparc_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libffmpeg/libavcodec/sparc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libavcodec_sparc_la_LIBADD =
+-am__objects_1 = dsputil_vis.lo
+-am__objects_2 = $(am__objects_1)
+-am__objects_3 = libavcodec_sparc_dummy.lo
+-am_libavcodec_sparc_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+-libavcodec_sparc_la_OBJECTS = $(am_libavcodec_sparc_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libavcodec_sparc_la_SOURCES)
+-DIST_SOURCES = $(libavcodec_sparc_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -105,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS =
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -125,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -151,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -180,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -309,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -324,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -338,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -352,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -376,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -413,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -428,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -445,106 +271,75 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFFMPEG_CFLAGS)
++
+ noinst_LTLIBRARIES = libavcodec_sparc.la
++
+ libavcodec_sparc_src = dsputil_vis.c
+ libavcodec_sparc_dummy = libavcodec_sparc_dummy.c
++
+ EXTRA_DIST = $(libavcodec_sparc_src) $(libavcodec_sparc_dummy) vis.h
++
+ sparc_modules = $(libavcodec_sparc_src)
++
+ libavcodec_sparc_la_SOURCES = $(sparc_modules) $(libavcodec_sparc_dummy)
++subdir = src/libffmpeg/libavcodec/sparc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libavcodec_sparc_la_LDFLAGS =
++libavcodec_sparc_la_LIBADD =
++am__objects_1 = dsputil_vis.lo
++am__objects_2 = $(am__objects_1)
++am__objects_3 = libavcodec_sparc_dummy.lo
++am_libavcodec_sparc_la_OBJECTS = $(am__objects_2) $(am__objects_3)
++libavcodec_sparc_la_OBJECTS = $(am_libavcodec_sparc_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dsputil_vis.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/libavcodec_sparc_dummy.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libavcodec_sparc_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(libavcodec_sparc_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/sparc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libffmpeg/libavcodec/sparc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -552,7 +347,7 @@
+ $(LINK) $(libavcodec_sparc_la_LDFLAGS) $(libavcodec_sparc_la_OBJECTS) $(libavcodec_sparc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -560,26 +355,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsputil_vis.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec_sparc_dummy.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -591,6 +387,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -599,7 +400,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -611,24 +411,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -637,22 +421,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -670,7 +451,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -682,31 +465,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -724,8 +504,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -733,29 +512,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libflac/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libflac/Makefile.in
+--- xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libflac/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,100 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_flac_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libflac
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-xineplug_flac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_flac_la_OBJECTS = demux_flac.lo decoder_flac.lo
+-xineplug_flac_la_OBJECTS = $(am_xineplug_flac_la_OBJECTS)
+-@HAVE_FLAC_TRUE@am_xineplug_flac_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_flac_la_SOURCES)
+-DIST_SOURCES = $(xineplug_flac_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -114,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -134,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -160,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -189,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -318,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -333,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -347,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -361,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -385,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -422,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -437,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -454,132 +272,99 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBFLAC_CFLAGS)
++
+ @HAVE_FLAC_TRUE@flac_module = xineplug_flac.la
++
+ lib_LTLIBRARIES = $(flac_module)
++
+ xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
+ xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS)
+ xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = demux_flac.h
++subdir = src/libflac
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_flac_la_DEPENDENCIES =
++am_xineplug_flac_la_OBJECTS = demux_flac.lo decoder_flac.lo
++xineplug_flac_la_OBJECTS = $(am_xineplug_flac_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/decoder_flac.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/demux_flac.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_flac_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_flac_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libflac/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libflac/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_flac.la: $(xineplug_flac_la_OBJECTS) $(xineplug_flac_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_flac_la_rpath) $(xineplug_flac_la_LDFLAGS) $(xineplug_flac_la_OBJECTS) $(xineplug_flac_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_flac_la_LDFLAGS) $(xineplug_flac_la_OBJECTS) $(xineplug_flac_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -587,26 +372,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoder_flac.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_flac.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -618,6 +404,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -626,7 +417,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -638,24 +428,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -664,22 +438,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -697,10 +468,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -712,31 +483,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -754,8 +522,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -763,30 +530,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/liblpcm/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liblpcm/Makefile.in
+--- xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/liblpcm/Makefile.in 2005-02-13 01:07:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,98 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_lpcm_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/liblpcm
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_lpcm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_lpcm_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_lpcm_la_OBJECTS = \
+- $(am_xineplug_decode_lpcm_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_lpcm_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_lpcm_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -112,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -132,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -158,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -187,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -316,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -331,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -345,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -359,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -383,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -420,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -435,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -452,121 +272,83 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_lpcm.la
++
+ xineplug_decode_lpcm_la_SOURCES = xine_decoder.c
+ xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_lpcm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/liblpcm
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_lpcm_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_lpcm_la_OBJECTS = xine_decoder.lo
++xineplug_decode_lpcm_la_OBJECTS = $(am_xineplug_decode_lpcm_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_lpcm_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_lpcm_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/liblpcm/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/liblpcm/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -574,33 +356,34 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_lpcm_la_LDFLAGS) $(xineplug_decode_lpcm_la_OBJECTS) $(xineplug_decode_lpcm_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -612,6 +395,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -620,7 +408,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -632,24 +419,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -658,22 +429,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -691,10 +459,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -706,31 +474,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -748,8 +513,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -757,30 +521,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libmad/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmad/Makefile.in
+--- xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmad/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_mad_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libmad
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_mad_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_mad_la_OBJECTS = bit.lo fixed.lo frame.lo \
+- huffman.lo layer12.lo layer3.lo stream.lo synth.lo timer.lo \
+- version.lo xine_decoder.lo
+-xineplug_decode_mad_la_OBJECTS = $(am_xineplug_decode_mad_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_mad_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_mad_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,63 +272,19 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -DOPT_SPEED
++
+ EXTRA_DIST = imdct_l_arm.S
++
+ lib_LTLIBRARIES = xineplug_decode_mad.la
++
+ xineplug_decode_mad_la_SOURCES = \
+ bit.c \
+ fixed.c \
+@@ -525,8 +298,10 @@
+ version.c \
+ xine_decoder.c
+
++
+ xineplug_decode_mad_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = \
+ D.dat \
+ imdct_s.dat \
+@@ -545,63 +320,80 @@
+ timer.h \
+ version.h
+
++subdir = src/libmad
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_mad_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_mad_la_OBJECTS = bit.lo fixed.lo frame.lo huffman.lo \
++ layer12.lo layer3.lo stream.lo synth.lo timer.lo version.lo \
++ xine_decoder.lo
++xineplug_decode_mad_la_OBJECTS = $(am_xineplug_decode_mad_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/fixed.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/frame.Plo ./$(DEPDIR)/huffman.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/layer12.Plo ./$(DEPDIR)/layer3.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/stream.Plo ./$(DEPDIR)/synth.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/timer.Plo ./$(DEPDIR)/version.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_mad_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_mad_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libmad/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libmad/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -609,7 +401,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_mad_la_LDFLAGS) $(xineplug_decode_mad_la_OBJECTS) $(xineplug_decode_mad_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -626,26 +418,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -657,6 +450,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -665,7 +463,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -677,24 +474,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -703,22 +484,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -736,10 +514,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -751,31 +529,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -793,8 +568,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -802,30 +576,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libmpeg2/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in
+--- xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmpeg2/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,106 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_mpeg2_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libmpeg2
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_mpeg2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_decode_mpeg2_la_OBJECTS = cpu_state.lo decode.lo header.lo \
+- idct.lo idct_altivec.lo idct_mlib.lo idct_mmx.lo \
+- motion_comp.lo motion_comp_altivec.lo motion_comp_mmx.lo \
+- motion_comp_mlib.lo motion_comp_vis.lo slice.lo slice_xvmc.lo \
+- slice_xvmc_vld.lo stats.lo xine_decoder.lo
+-xineplug_decode_mpeg2_la_OBJECTS = \
+- $(am_xineplug_decode_mpeg2_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_mpeg2_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_mpeg2_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -120,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -140,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -166,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -195,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -324,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -339,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -353,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -367,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -391,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -428,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -443,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -460,62 +272,17 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(LIBMPEG2_CFLAGS)
++
+ lib_LTLIBRARIES = xineplug_decode_mpeg2.la
++
+ xineplug_decode_mpeg2_la_SOURCES = \
+ cpu_state.c \
+ decode.c \
+@@ -535,66 +302,94 @@
+ stats.c \
+ xine_decoder.c
+
++
+ xineplug_decode_mpeg2_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB)
+ xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h
++subdir = src/libmpeg2
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_mpeg2_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_mpeg2_la_OBJECTS = cpu_state.lo decode.lo header.lo \
++ idct.lo idct_altivec.lo idct_mlib.lo idct_mmx.lo motion_comp.lo \
++ motion_comp_altivec.lo motion_comp_mmx.lo motion_comp_mlib.lo \
++ motion_comp_vis.lo slice.lo slice_xvmc.lo slice_xvmc_vld.lo \
++ stats.lo xine_decoder.lo
++xineplug_decode_mpeg2_la_OBJECTS = \
++ $(am_xineplug_decode_mpeg2_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_state.Plo ./$(DEPDIR)/decode.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/header.Plo ./$(DEPDIR)/idct.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/idct_altivec.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/idct_mlib.Plo ./$(DEPDIR)/idct_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_comp.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_comp_altivec.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_comp_mlib.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_comp_mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/motion_comp_vis.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/slice.Plo ./$(DEPDIR)/slice_xvmc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/slice_xvmc_vld.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/stats.Plo ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_mpeg2_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_mpeg2_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libmpeg2/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libmpeg2/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -602,7 +397,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_mpeg2_la_LDFLAGS) $(xineplug_decode_mpeg2_la_OBJECTS) $(xineplug_decode_mpeg2_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -625,26 +420,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -656,6 +452,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -664,7 +465,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -676,24 +476,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -702,22 +486,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -735,10 +516,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -750,31 +531,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -792,8 +570,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -801,30 +578,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libmusepack/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/Makefile.in
+--- xine-lib-vdr-1.0/src/libmusepack/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -0,0 +1,708 @@
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
++# @configure_input@
++
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = @program_transform_name@
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
++AAINFO = @AAINFO@
++AALIB_CFLAGS = @AALIB_CFLAGS@
++AALIB_CONFIG = @AALIB_CONFIG@
++AALIB_LIBS = @AALIB_LIBS@
++ACLOCAL_DIR = @ACLOCAL_DIR@
++ALSA_CFLAGS = @ALSA_CFLAGS@
++ALSA_LIBS = @ALSA_LIBS@
++ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTS_CFLAGS = @ARTS_CFLAGS@
++ARTS_CONFIG = @ARTS_CONFIG@
++ARTS_LIBS = @ARTS_LIBS@
++AS = @AS@
++ASFLAGS = @ASFLAGS@
++AWK = @AWK@
++BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
++CACA_CFLAGS = @CACA_CFLAGS@
++CACA_CONFIG = @CACA_CONFIG@
++CACA_LIBS = @CACA_LIBS@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCAS = @CCAS@
++CCASCOMPILE = @CCASCOMPILE@
++CCASFLAGS = @CCASFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++DATADIRNAME = @DATADIRNAME@
++DEBUG_CFLAGS = @DEBUG_CFLAGS@
++DEPCOMP = @DEPCOMP@
++DEPDIR = @DEPDIR@
++DEPMOD = @DEPMOD@
++DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
++DIRECTFB_LIBS = @DIRECTFB_LIBS@
++DIRECTX_AUDIO_LIBS = @DIRECTX_AUDIO_LIBS@
++DIRECTX_CPPFLAGS = @DIRECTX_CPPFLAGS@
++DIRECTX_VIDEO_LIBS = @DIRECTX_VIDEO_LIBS@
++DLLTOOL = @DLLTOOL@
++DVDNAV_CFLAGS = @DVDNAV_CFLAGS@
++DVDNAV_CONFIG = @DVDNAV_CONFIG@
++DVDNAV_LIBS = @DVDNAV_LIBS@
++DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
++ECHO = @ECHO@
++EGREP = @EGREP@
++ESD_CFLAGS = @ESD_CFLAGS@
++ESD_CONFIG = @ESD_CONFIG@
++ESD_LIBS = @ESD_LIBS@
++EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
++EXTRA_X_LIBS = @EXTRA_X_LIBS@
++F77 = @F77@
++FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
++FFMPEG_LIBS = @FFMPEG_LIBS@
++FIG2DEV = @FIG2DEV@
++FREETYPE_CONFIG = @FREETYPE_CONFIG@
++FT2_CFLAGS = @FT2_CFLAGS@
++FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
++GENCAT = @GENCAT@
++GLIBC21 = @GLIBC21@
++GLUT_LIBS = @GLUT_LIBS@
++GLU_LIBS = @GLU_LIBS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
++GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
++GOOM_LIBS = @GOOM_LIBS@
++HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
++HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
++HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
++HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
++HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
++HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
++INCLUDES = @INCLUDES@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLBISON = @INTLBISON@
++INTLDIR = @INTLDIR@
++INTLLIBS = @INTLLIBS@
++INTLOBJS = @INTLOBJS@
++INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
++IRIXAL_CFLAGS = @IRIXAL_CFLAGS@
++IRIXAL_LIBS = @IRIXAL_LIBS@
++IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
++KSTAT_LIBS = @KSTAT_LIBS@
++LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
++LIBCDIO_LIBS = @LIBCDIO_LIBS@
++LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
++LIBFAME_CONFIG = @LIBFAME_CONFIG@
++LIBFAME_LIBS = @LIBFAME_LIBS@
++LIBFFMPEG_CFLAGS = @LIBFFMPEG_CFLAGS@
++LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@
++LIBFLAC_LIBS = @LIBFLAC_LIBS@
++LIBICONV = @LIBICONV@
++LIBISO9660_LIBS = @LIBISO9660_LIBS@
++LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
++LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
++LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
++LIBNAME = @LIBNAME@
++LIBPNG_CONFIG = @LIBPNG_CONFIG@
++LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
++LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
++LIBSTK_LIBS = @LIBSTK_LIBS@
++LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
++LIBVCD_CFLAGS = @LIBVCD_CFLAGS@
++LIBVCD_LIBS = @LIBVCD_LIBS@
++LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
++LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
++LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
++LN_S = @LN_S@
++MAINT = @MAINT@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MKNOD = @MKNOD@
++MLIB_CFLAGS = @MLIB_CFLAGS@
++MLIB_LIBS = @MLIB_LIBS@
++MNG_LIBS = @MNG_LIBS@
++MSGFMT = @MSGFMT@
++NET_LIBS = @NET_LIBS@
++OBJC = @OBJC@
++OBJCFLAGS = @OBJCFLAGS@
++OBJDUMP = @OBJDUMP@
++OGG_CFLAGS = @OGG_CFLAGS@
++OGG_LIBS = @OGG_LIBS@
++OPENGL_CFLAGS = @OPENGL_CFLAGS@
++OPENGL_LIBS = @OPENGL_LIBS@
++PACKAGE = @PACKAGE@
++PASS1_CFLAGS = @PASS1_CFLAGS@
++PASS2_CFLAGS = @PASS2_CFLAGS@
++PKG_CONFIG = @PKG_CONFIG@
++PNG_CFLAGS = @PNG_CFLAGS@
++PNG_LIBS = @PNG_LIBS@
++POFILES = @POFILES@
++POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
++POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
++POSUB = @POSUB@
++RANLIB = @RANLIB@
++RC = @RC@
++RT_LIBS = @RT_LIBS@
++SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CONFIG = @SDL_CONFIG@
++SDL_LIBS = @SDL_LIBS@
++SGMLTOOLS = @SGMLTOOLS@
++SPEC_VERSION = @SPEC_VERSION@
++SPEEX_CFLAGS = @SPEEX_CFLAGS@
++SPEEX_LIBS = @SPEEX_LIBS@
++STATIC = @STATIC@
++STRIP = @STRIP@
++SUNDGA_CFLAGS = @SUNDGA_CFLAGS@
++SUNDGA_LIBS = @SUNDGA_LIBS@
++TAR_NAME = @TAR_NAME@
++THEORAENC_LIBS = @THEORAENC_LIBS@
++THEORAFILE_LIBS = @THEORAFILE_LIBS@
++THEORA_CFLAGS = @THEORA_CFLAGS@
++THEORA_LIBS = @THEORA_LIBS@
++THREAD_CFLAGS = @THREAD_CFLAGS@
++THREAD_CFLAGS_CONFIG = @THREAD_CFLAGS_CONFIG@
++THREAD_INCLUDES = @THREAD_INCLUDES@
++THREAD_LIBS = @THREAD_LIBS@
++THREAD_LIBS_CONFIG = @THREAD_LIBS_CONFIG@
++USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++VORBISENC_LIBS = @VORBISENC_LIBS@
++VORBISFILE_LIBS = @VORBISFILE_LIBS@
++VORBIS_CFLAGS = @VORBIS_CFLAGS@
++VORBIS_LIBS = @VORBIS_LIBS@
++W32DLL_DEP = @W32DLL_DEP@
++W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
++WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
++XINE_ACFLAGS = @XINE_ACFLAGS@
++XINE_BIN_AGE = @XINE_BIN_AGE@
++XINE_BUILD_CC = @XINE_BUILD_CC@
++XINE_BUILD_DATE = @XINE_BUILD_DATE@
++XINE_BUILD_OS = @XINE_BUILD_OS@
++XINE_CONFIG_PREFIX = @XINE_CONFIG_PREFIX@
++XINE_DATADIR = @XINE_DATADIR@
++XINE_FONTDIR = @XINE_FONTDIR@
++XINE_FONTPATH = @XINE_FONTPATH@
++XINE_IFACE_AGE = @XINE_IFACE_AGE@
++XINE_LOCALEDIR = @XINE_LOCALEDIR@
++XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
++XINE_MAJOR = @XINE_MAJOR@
++XINE_MINOR = @XINE_MINOR@
++XINE_PLUGINDIR = @XINE_PLUGINDIR@
++XINE_PLUGINPATH = @XINE_PLUGINPATH@
++XINE_PLUGIN_MIN_SYMS = @XINE_PLUGIN_MIN_SYMS@
++XINE_SCRIPTPATH = @XINE_SCRIPTPATH@
++XINE_SUB = @XINE_SUB@
++XVMC_LIB = @XVMC_LIB@
++XV_LIB = @XV_LIB@
++XXMC_LIB = @XXMC_LIB@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++ZLIB_INCLUDES = @ZLIB_INCLUDES@
++ZLIB_LIBS = @ZLIB_LIBS@
++ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
++am__include = @am__include@
++am__quote = @am__quote@
++install_sh = @install_sh@
++mkdir_p = @mkdir_p@
++w32_path = @w32_path@
++XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
++SUBDIRS = musepack
++
++EXTRA_DIST = diff_against_svn.patch
++
++lib_LTLIBRARIES = xineplug_decode_mpc.la
++
++xineplug_decode_mpc_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c \
++ mpc_reader.c requant.c streaminfo.c synth_filter.c xine_decoder.c
++
++xineplug_decode_mpc_la_LIBADD = $(XINE_LIB)
++xineplug_decode_mpc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libmusepack
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_mpc_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_mpc_la_OBJECTS = huffsv46.lo huffsv7.lo idtag.lo \
++ mpc_decoder.lo mpc_reader.lo requant.lo streaminfo.lo \
++ synth_filter.lo xine_decoder.lo
++xineplug_decode_mpc_la_OBJECTS = $(am_xineplug_decode_mpc_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/huffsv46.Plo ./$(DEPDIR)/huffsv7.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/idtag.Plo ./$(DEPDIR)/mpc_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mpc_reader.Plo ./$(DEPDIR)/requant.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/streaminfo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/synth_filter.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_mpc_la_SOURCES)
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_decode_mpc_la_SOURCES)
++
++all: all-recursive
++
++.SUFFIXES:
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/libmusepack/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
++ else :; fi; \
++ done
++
++uninstall-libLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++ done
++
++clean-libLTLIBRARIES:
++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ test -z "$dir" && dir=.; \
++ echo "rm -f \"$${dir}/so_locations\""; \
++ rm -f "$${dir}/so_locations"; \
++ done
++xineplug_decode_mpc.la: $(xineplug_decode_mpc_la_OBJECTS) $(xineplug_decode_mpc_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_mpc_la_LDFLAGS) $(xineplug_decode_mpc_la_OBJECTS) $(xineplug_decode_mpc_la_LIBADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT) core *.core
++
++distclean-compile:
++ -rm -f *.tab.c
++
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffsv46.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffsv7.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idtag.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpc_decoder.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpc_reader.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/requant.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/streaminfo.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_filter.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
++
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
++.c.o:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++
++.c.obj:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
++
++.c.lo:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++# (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
++ @set fnord $$MAKEFLAGS; amf=$$2; \
++ dot_seen=no; \
++ target=`echo $@ | sed s/-recursive//`; \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ echo "Making $$target in $$subdir"; \
++ if test "$$subdir" = "."; then \
++ dot_seen=yes; \
++ local_target="$$target-am"; \
++ else \
++ local_target="$$target"; \
++ fi; \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ done; \
++ if test "$$dot_seen" = "no"; then \
++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++ fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++ @set fnord $$MAKEFLAGS; amf=$$2; \
++ dot_seen=no; \
++ case "$@" in \
++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++ *) list='$(SUBDIRS)' ;; \
++ esac; \
++ rev=''; for subdir in $$list; do \
++ if test "$$subdir" = "."; then :; else \
++ rev="$$subdir $$rev"; \
++ fi; \
++ done; \
++ rev="$$rev ."; \
++ target=`echo $@ | sed s/-recursive//`; \
++ for subdir in $$rev; do \
++ echo "Making $$target in $$subdir"; \
++ if test "$$subdir" = "."; then \
++ local_target="$$target-am"; \
++ else \
++ local_target="$$target"; \
++ fi; \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ done && test -z "$$fail"
++tags-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++
++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++ fi; \
++ done; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
++
++distdir: $(DISTFILES)
++ @list='$(DISTFILES)'; for file in $$list; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
++ || exit 1; \
++ (cd $$subdir && \
++ $(MAKE) $(AM_MAKEFLAGS) \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
++ distdir) \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-recursive
++all-am: Makefile $(LTLIBRARIES)
++installdirs: installdirs-recursive
++installdirs-am:
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
++install: install-recursive
++install-exec: install-exec-recursive
++install-data: install-data-recursive
++uninstall: uninstall-recursive
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-recursive
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++
++clean-generic:
++
++distclean-generic:
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
++clean: clean-recursive
++
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++ mostlyclean-am
++
++distclean: distclean-recursive
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
++
++dvi: dvi-recursive
++
++dvi-am:
++
++info: info-recursive
++
++info-am:
++
++install-data-am:
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-exec-am: install-libLTLIBRARIES
++
++install-info: install-info-recursive
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-recursive
++
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
++
++
++$(XINE_LIB):
++ @cd $(top_srcdir)/src/xine-engine && $(MAKE)
++
++install-data-hook:
++ @if test $$MAKELEVEL -le 4 ; then \
++ if test -x "$(top_srcdir)/post-install.sh" ; then \
++ $(top_srcdir)/post-install.sh ; \
++ fi \
++ fi
++
++pass1:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS1_CFLAGS)"
++
++pass2:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)"
++
++debug:
++ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
++
++install-debug: debug
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @list='$(SUBDIRS)'; for subdir in $$list; do \
++ (cd $$subdir && $(MAKE) $@) || exit; \
++ done;
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-includeHEADERS: $(include_HEADERS)
++ @$(NORMAL_INSTALL)
++ $(install_sh) -d $(DESTDIR)$(includedir)/xine
++ @list='$(include_HEADERS)'; for p in $$list; do \
++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \
++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-includeHEADERS:
++ @$(NORMAL_UNINSTALL)
++ list='$(include_HEADERS)'; for p in $$list; do \
++ rm -f $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-hook:
++ @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \
++ list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
++ rm -f $(DESTDIR)$(libdir)/$$p; \
++ done; \
++ fi
++
++mostlyclean-generic:
++ -rm -f *~ \#* .*~ .\#*
++
++maintainer-clean-generic:
++ -@echo "This command is intended for maintainers to use;"
++ -@echo "it deletes files that may require special tools to rebuild."
++ -rm -f Makefile.in
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -urNad xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in
+--- xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libmusepack/musepack/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -0,0 +1,508 @@
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
++# @configure_input@
++
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = @program_transform_name@
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++AAINFO = @AAINFO@
++AALIB_CFLAGS = @AALIB_CFLAGS@
++AALIB_CONFIG = @AALIB_CONFIG@
++AALIB_LIBS = @AALIB_LIBS@
++ACLOCAL_DIR = @ACLOCAL_DIR@
++ALSA_CFLAGS = @ALSA_CFLAGS@
++ALSA_LIBS = @ALSA_LIBS@
++ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTS_CFLAGS = @ARTS_CFLAGS@
++ARTS_CONFIG = @ARTS_CONFIG@
++ARTS_LIBS = @ARTS_LIBS@
++AS = @AS@
++ASFLAGS = @ASFLAGS@
++AWK = @AWK@
++BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
++CACA_CFLAGS = @CACA_CFLAGS@
++CACA_CONFIG = @CACA_CONFIG@
++CACA_LIBS = @CACA_LIBS@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCAS = @CCAS@
++CCASCOMPILE = @CCASCOMPILE@
++CCASFLAGS = @CCASFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++DATADIRNAME = @DATADIRNAME@
++DEBUG_CFLAGS = @DEBUG_CFLAGS@
++DEPCOMP = @DEPCOMP@
++DEPDIR = @DEPDIR@
++DEPMOD = @DEPMOD@
++DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
++DIRECTFB_LIBS = @DIRECTFB_LIBS@
++DIRECTX_AUDIO_LIBS = @DIRECTX_AUDIO_LIBS@
++DIRECTX_CPPFLAGS = @DIRECTX_CPPFLAGS@
++DIRECTX_VIDEO_LIBS = @DIRECTX_VIDEO_LIBS@
++DLLTOOL = @DLLTOOL@
++DVDNAV_CFLAGS = @DVDNAV_CFLAGS@
++DVDNAV_CONFIG = @DVDNAV_CONFIG@
++DVDNAV_LIBS = @DVDNAV_LIBS@
++DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
++ECHO = @ECHO@
++EGREP = @EGREP@
++ESD_CFLAGS = @ESD_CFLAGS@
++ESD_CONFIG = @ESD_CONFIG@
++ESD_LIBS = @ESD_LIBS@
++EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
++EXTRA_X_LIBS = @EXTRA_X_LIBS@
++F77 = @F77@
++FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
++FFMPEG_LIBS = @FFMPEG_LIBS@
++FIG2DEV = @FIG2DEV@
++FREETYPE_CONFIG = @FREETYPE_CONFIG@
++FT2_CFLAGS = @FT2_CFLAGS@
++FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
++GENCAT = @GENCAT@
++GLIBC21 = @GLIBC21@
++GLUT_LIBS = @GLUT_LIBS@
++GLU_LIBS = @GLU_LIBS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
++GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
++GOOM_LIBS = @GOOM_LIBS@
++HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
++HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
++HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
++HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
++HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
++HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
++INCLUDES = @INCLUDES@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLBISON = @INTLBISON@
++INTLDIR = @INTLDIR@
++INTLLIBS = @INTLLIBS@
++INTLOBJS = @INTLOBJS@
++INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
++IRIXAL_CFLAGS = @IRIXAL_CFLAGS@
++IRIXAL_LIBS = @IRIXAL_LIBS@
++IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
++KSTAT_LIBS = @KSTAT_LIBS@
++LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
++LIBCDIO_LIBS = @LIBCDIO_LIBS@
++LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
++LIBFAME_CONFIG = @LIBFAME_CONFIG@
++LIBFAME_LIBS = @LIBFAME_LIBS@
++LIBFFMPEG_CFLAGS = @LIBFFMPEG_CFLAGS@
++LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@
++LIBFLAC_LIBS = @LIBFLAC_LIBS@
++LIBICONV = @LIBICONV@
++LIBISO9660_LIBS = @LIBISO9660_LIBS@
++LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
++LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
++LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
++LIBNAME = @LIBNAME@
++LIBPNG_CONFIG = @LIBPNG_CONFIG@
++LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
++LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
++LIBSTK_LIBS = @LIBSTK_LIBS@
++LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
++LIBVCD_CFLAGS = @LIBVCD_CFLAGS@
++LIBVCD_LIBS = @LIBVCD_LIBS@
++LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
++LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
++LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
++LN_S = @LN_S@
++MAINT = @MAINT@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MKNOD = @MKNOD@
++MLIB_CFLAGS = @MLIB_CFLAGS@
++MLIB_LIBS = @MLIB_LIBS@
++MNG_LIBS = @MNG_LIBS@
++MSGFMT = @MSGFMT@
++NET_LIBS = @NET_LIBS@
++OBJC = @OBJC@
++OBJCFLAGS = @OBJCFLAGS@
++OBJDUMP = @OBJDUMP@
++OGG_CFLAGS = @OGG_CFLAGS@
++OGG_LIBS = @OGG_LIBS@
++OPENGL_CFLAGS = @OPENGL_CFLAGS@
++OPENGL_LIBS = @OPENGL_LIBS@
++PACKAGE = @PACKAGE@
++PASS1_CFLAGS = @PASS1_CFLAGS@
++PASS2_CFLAGS = @PASS2_CFLAGS@
++PKG_CONFIG = @PKG_CONFIG@
++PNG_CFLAGS = @PNG_CFLAGS@
++PNG_LIBS = @PNG_LIBS@
++POFILES = @POFILES@
++POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
++POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
++POSUB = @POSUB@
++RANLIB = @RANLIB@
++RC = @RC@
++RT_LIBS = @RT_LIBS@
++SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CONFIG = @SDL_CONFIG@
++SDL_LIBS = @SDL_LIBS@
++SGMLTOOLS = @SGMLTOOLS@
++SPEC_VERSION = @SPEC_VERSION@
++SPEEX_CFLAGS = @SPEEX_CFLAGS@
++SPEEX_LIBS = @SPEEX_LIBS@
++STATIC = @STATIC@
++STRIP = @STRIP@
++SUNDGA_CFLAGS = @SUNDGA_CFLAGS@
++SUNDGA_LIBS = @SUNDGA_LIBS@
++TAR_NAME = @TAR_NAME@
++THEORAENC_LIBS = @THEORAENC_LIBS@
++THEORAFILE_LIBS = @THEORAFILE_LIBS@
++THEORA_CFLAGS = @THEORA_CFLAGS@
++THEORA_LIBS = @THEORA_LIBS@
++THREAD_CFLAGS = @THREAD_CFLAGS@
++THREAD_CFLAGS_CONFIG = @THREAD_CFLAGS_CONFIG@
++THREAD_INCLUDES = @THREAD_INCLUDES@
++THREAD_LIBS = @THREAD_LIBS@
++THREAD_LIBS_CONFIG = @THREAD_LIBS_CONFIG@
++USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++VORBISENC_LIBS = @VORBISENC_LIBS@
++VORBISFILE_LIBS = @VORBISFILE_LIBS@
++VORBIS_CFLAGS = @VORBIS_CFLAGS@
++VORBIS_LIBS = @VORBIS_LIBS@
++W32DLL_DEP = @W32DLL_DEP@
++W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
++WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
++XINE_ACFLAGS = @XINE_ACFLAGS@
++XINE_BIN_AGE = @XINE_BIN_AGE@
++XINE_BUILD_CC = @XINE_BUILD_CC@
++XINE_BUILD_DATE = @XINE_BUILD_DATE@
++XINE_BUILD_OS = @XINE_BUILD_OS@
++XINE_CONFIG_PREFIX = @XINE_CONFIG_PREFIX@
++XINE_DATADIR = @XINE_DATADIR@
++XINE_FONTDIR = @XINE_FONTDIR@
++XINE_FONTPATH = @XINE_FONTPATH@
++XINE_IFACE_AGE = @XINE_IFACE_AGE@
++XINE_LOCALEDIR = @XINE_LOCALEDIR@
++XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
++XINE_MAJOR = @XINE_MAJOR@
++XINE_MINOR = @XINE_MINOR@
++XINE_PLUGINDIR = @XINE_PLUGINDIR@
++XINE_PLUGINPATH = @XINE_PLUGINPATH@
++XINE_PLUGIN_MIN_SYMS = @XINE_PLUGIN_MIN_SYMS@
++XINE_SCRIPTPATH = @XINE_SCRIPTPATH@
++XINE_SUB = @XINE_SUB@
++XVMC_LIB = @XVMC_LIB@
++XV_LIB = @XV_LIB@
++XXMC_LIB = @XXMC_LIB@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++ZLIB_INCLUDES = @ZLIB_INCLUDES@
++ZLIB_LIBS = @ZLIB_LIBS@
++ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
++am__include = @am__include@
++am__quote = @am__quote@
++install_sh = @install_sh@
++mkdir_p = @mkdir_p@
++w32_path = @w32_path@
++XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
++noinst_HEADERS = config_types.h decoder.h huffman.h internal.h math.h \
++ musepack.h reader.h requant.h streaminfo.h
++
++subdir = src/libmusepack/musepack
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/libmusepack/musepack/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
++
++distdir: $(DISTFILES)
++ @list='$(DISTFILES)'; for file in $$list; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(HEADERS)
++
++installdirs:
++
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++
++clean-generic:
++
++distclean-generic:
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
++clean: clean-am
++
++clean-am: clean-generic clean-libtool mostlyclean-am
++
++distclean: distclean-am
++
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++info: info-am
++
++info-am:
++
++install-data-am:
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++uninstall-am: uninstall-info-am
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
++
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
++
++
++$(XINE_LIB):
++ @cd $(top_srcdir)/src/xine-engine && $(MAKE)
++
++install-data-hook:
++ @if test $$MAKELEVEL -le 4 ; then \
++ if test -x "$(top_srcdir)/post-install.sh" ; then \
++ $(top_srcdir)/post-install.sh ; \
++ fi \
++ fi
++
++pass1:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS1_CFLAGS)"
++
++pass2:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)"
++
++debug:
++ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
++
++install-debug: debug
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @list='$(SUBDIRS)'; for subdir in $$list; do \
++ (cd $$subdir && $(MAKE) $@) || exit; \
++ done;
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-includeHEADERS: $(include_HEADERS)
++ @$(NORMAL_INSTALL)
++ $(install_sh) -d $(DESTDIR)$(includedir)/xine
++ @list='$(include_HEADERS)'; for p in $$list; do \
++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \
++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-includeHEADERS:
++ @$(NORMAL_UNINSTALL)
++ list='$(include_HEADERS)'; for p in $$list; do \
++ rm -f $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-hook:
++ @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \
++ list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
++ rm -f $(DESTDIR)$(libdir)/$$p; \
++ done; \
++ fi
++
++mostlyclean-generic:
++ -rm -f *~ \#* .*~ .\#*
++
++maintainer-clean-generic:
++ -@echo "This command is intended for maintainers to use;"
++ -@echo "it deletes files that may require special tools to rebuild."
++ -rm -f Makefile.in
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -urNad xine-lib-vdr-1.0/src/libreal/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libreal/Makefile.in
+--- xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libreal/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,107 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_real_la_SOURCES) $(xineplug_decode_real_audio_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libreal
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 =
+-xineplug_decode_real_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_decode_real_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_real_la_OBJECTS = \
+- $(am_xineplug_decode_real_la_OBJECTS)
+-xineplug_decode_real_audio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_decode_real_audio_la_OBJECTS = audio_decoder.lo
+-xineplug_decode_real_audio_la_OBJECTS = \
+- $(am_xineplug_decode_real_audio_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_real_la_SOURCES) \
+- $(xineplug_decode_real_audio_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_real_la_SOURCES) \
+- $(xineplug_decode_real_audio_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -121,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -141,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -167,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -196,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -325,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -340,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -354,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -368,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -392,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -429,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -444,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -461,124 +272,94 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_real.la xineplug_decode_real_audio.la
++
+ xineplug_decode_real_la_SOURCES = xine_decoder.c
+ xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
+ xineplug_decode_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_real_audio_la_SOURCES = audio_decoder.c
+ xineplug_decode_real_audio_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
+ xineplug_decode_real_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libreal
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_real_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_real_la_OBJECTS = xine_decoder.lo
++xineplug_decode_real_la_OBJECTS = $(am_xineplug_decode_real_la_OBJECTS)
++xineplug_decode_real_audio_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_real_audio_la_OBJECTS = audio_decoder.lo
++xineplug_decode_real_audio_la_OBJECTS = \
++ $(am_xineplug_decode_real_audio_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_real_la_SOURCES) \
++ $(xineplug_decode_real_audio_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_real_la_SOURCES) $(xineplug_decode_real_audio_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libreal/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libreal/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -588,7 +369,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_real_audio_la_LDFLAGS) $(xineplug_decode_real_audio_la_OBJECTS) $(xineplug_decode_real_audio_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -596,26 +377,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_decoder.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -627,6 +409,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -635,7 +422,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -647,24 +433,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -673,22 +443,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -706,10 +473,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -721,31 +488,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -763,8 +527,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -772,30 +535,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libspeex/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspeex/Makefile.in
+--- xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspeex/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_speex_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libspeex
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_speex_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_decode_speex_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_speex_la_OBJECTS = \
+- $(am_xineplug_decode_speex_la_OBJECTS)
+-@HAVE_SPEEX_TRUE@am_xineplug_decode_speex_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_speex_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_speex_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,157 +272,123 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(SPEEX_CFLAGS)
++
+ @HAVE_SPEEX_TRUE@speex_module = xineplug_decode_speex.la
++
+ lib_LTLIBRARIES = $(speex_module)
++
+ xineplug_decode_speex_la_SOURCES = xine_decoder.c
+ xineplug_decode_speex_la_LIBADD = $(SPEEX_LIBS) $(XINE_LIB)
+ xineplug_decode_speex_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libspeex
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_speex_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_speex_la_OBJECTS = xine_decoder.lo
++xineplug_decode_speex_la_OBJECTS = \
++ $(am_xineplug_decode_speex_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_speex_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_speex_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libspeex/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libspeex/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_speex.la: $(xineplug_decode_speex_la_OBJECTS) $(xineplug_decode_speex_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_speex_la_rpath) $(xineplug_decode_speex_la_LDFLAGS) $(xineplug_decode_speex_la_OBJECTS) $(xineplug_decode_speex_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_speex_la_LDFLAGS) $(xineplug_decode_speex_la_OBJECTS) $(xineplug_decode_speex_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -617,6 +400,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -625,7 +413,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -637,24 +424,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -663,22 +434,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -696,10 +464,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -711,31 +479,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -753,8 +518,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -762,30 +526,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libspucc/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucc/Makefile.in
+--- xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucc/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,100 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_spucc_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libspucc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_spucc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_spucc_la_OBJECTS = cc_decoder.lo xine_decoder.lo
+-xineplug_decode_spucc_la_OBJECTS = \
+- $(am_xineplug_decode_spucc_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_spucc_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_spucc_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -114,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -134,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -160,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -189,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -318,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -333,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -347,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -361,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -385,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -422,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -437,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -454,122 +272,89 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_spucc.la
++
+ xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c
+ xineplug_decode_spucc_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = cc_decoder.h
++subdir = src/libspucc
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_spucc_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_spucc_la_OBJECTS = cc_decoder.lo xine_decoder.lo
++xineplug_decode_spucc_la_OBJECTS = \
++ $(am_xineplug_decode_spucc_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cc_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_spucc_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_spucc_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libspucc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libspucc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -577,7 +362,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_spucc_la_LDFLAGS) $(xineplug_decode_spucc_la_OBJECTS) $(xineplug_decode_spucc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -585,26 +370,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc_decoder.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -616,6 +402,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -624,7 +415,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -636,24 +426,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -662,22 +436,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -695,10 +466,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -710,31 +481,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -752,8 +520,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -761,30 +528,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libspucmml/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucmml/Makefile.in
+--- xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspucmml/Makefile.in 2005-02-13 01:07:58.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,98 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_spucmml_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libspucmml
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_spucmml_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_spucmml_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_spucmml_la_OBJECTS = \
+- $(am_xineplug_decode_spucmml_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_spucmml_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_spucmml_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -112,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -132,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -158,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -187,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -316,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -331,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -345,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -359,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -383,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -420,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -435,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -452,121 +272,84 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_spucmml.la
++
+ xineplug_decode_spucmml_la_SOURCES = xine_decoder.c
+ xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_spucmml_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libspucmml
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_spucmml_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_spucmml_la_OBJECTS = xine_decoder.lo
++xineplug_decode_spucmml_la_OBJECTS = \
++ $(am_xineplug_decode_spucmml_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_spucmml_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_spucmml_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libspucmml/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libspucmml/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -574,33 +357,34 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_spucmml_la_LDFLAGS) $(xineplug_decode_spucmml_la_OBJECTS) $(xineplug_decode_spucmml_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -612,6 +396,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -620,7 +409,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -632,24 +420,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -658,22 +430,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -691,10 +460,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -706,31 +475,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -748,8 +514,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -757,30 +522,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libspudec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudec/Makefile.in
+--- xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudec/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,108 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_spu_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libspudec
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 =
+-@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_DEPENDENCIES = \
+-@HAVE_DVDNAV_FALSE@ $(am__DEPENDENCIES_1)
+-@HAVE_DVDNAV_TRUE@xineplug_decode_spu_la_DEPENDENCIES = \
+-@HAVE_DVDNAV_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+-am__xineplug_decode_spu_la_SOURCES_DIST = nav_read.c spu.c \
+- xine_decoder.c
+-@HAVE_DVDNAV_FALSE@am_xineplug_decode_spu_la_OBJECTS = nav_read.lo \
+-@HAVE_DVDNAV_FALSE@ spu.lo xine_decoder.lo
+-@HAVE_DVDNAV_TRUE@am_xineplug_decode_spu_la_OBJECTS = spu.lo \
+-@HAVE_DVDNAV_TRUE@ xine_decoder.lo
+-xineplug_decode_spu_la_OBJECTS = $(am_xineplug_decode_spu_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_spu_la_SOURCES)
+-DIST_SOURCES = $(am__xineplug_decode_spu_la_SOURCES_DIST)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -122,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -142,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -168,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -197,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -326,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -341,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -355,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -369,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -393,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -430,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -445,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -462,133 +272,105 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_spu.la
+-@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_SOURCES = \
+-@HAVE_DVDNAV_FALSE@ nav_read.c \
+-@HAVE_DVDNAV_FALSE@ spu.c \
+-@HAVE_DVDNAV_FALSE@ xine_decoder.c
+
+ @HAVE_DVDNAV_TRUE@xineplug_decode_spu_la_SOURCES = \
+ @HAVE_DVDNAV_TRUE@ spu.c \
+ @HAVE_DVDNAV_TRUE@ xine_decoder.c
+
+-@HAVE_DVDNAV_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
++@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_SOURCES = \
++@HAVE_DVDNAV_FALSE@ nav_read.c \
++@HAVE_DVDNAV_FALSE@ spu.c \
++@HAVE_DVDNAV_FALSE@ xine_decoder.c
++
+ @HAVE_DVDNAV_TRUE@AM_CPPFLAGS = $(DVDNAV_CFLAGS)
+-@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
++@HAVE_DVDNAV_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
+ @HAVE_DVDNAV_TRUE@xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
++@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
++
+ xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = spu.h
++subdir = src/libspudec
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++@HAVE_DVDNAV_TRUE@xineplug_decode_spu_la_DEPENDENCIES = \
++@HAVE_DVDNAV_TRUE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_DVDNAV_FALSE@xineplug_decode_spu_la_DEPENDENCIES = \
++@HAVE_DVDNAV_FALSE@ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_DVDNAV_TRUE@am_xineplug_decode_spu_la_OBJECTS = spu.lo \
++@HAVE_DVDNAV_TRUE@ xine_decoder.lo
++@HAVE_DVDNAV_FALSE@am_xineplug_decode_spu_la_OBJECTS = nav_read.lo \
++@HAVE_DVDNAV_FALSE@ spu.lo xine_decoder.lo
++xineplug_decode_spu_la_OBJECTS = $(am_xineplug_decode_spu_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/nav_read.Plo ./$(DEPDIR)/spu.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_spu_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_spu_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libspudec/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libspudec/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -596,7 +378,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_spu_la_LDFLAGS) $(xineplug_decode_spu_la_OBJECTS) $(xineplug_decode_spu_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -605,26 +387,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -636,6 +419,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -644,7 +432,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -656,24 +443,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -682,22 +453,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -715,10 +483,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -730,31 +498,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -772,8 +537,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -781,30 +545,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libspudvb/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudvb/Makefile.in
+--- xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libspudvb/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,98 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_spudvb_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libspudvb
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_spudvb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_spudvb_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_spudvb_la_OBJECTS = \
+- $(am_xineplug_decode_spudvb_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_spudvb_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_spudvb_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -112,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -132,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -158,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -187,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -316,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -331,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -345,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -359,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -383,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -420,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -435,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -452,121 +272,84 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_decode_spudvb.la
++
+ xineplug_decode_spudvb_la_SOURCES = xine_decoder.c
+ xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_spudvb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libspudvb
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_spudvb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_spudvb_la_OBJECTS = xine_decoder.lo
++xineplug_decode_spudvb_la_OBJECTS = \
++ $(am_xineplug_decode_spudvb_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_spudvb_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_spudvb_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libspudvb/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libspudvb/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -574,33 +357,34 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_spudvb_la_LDFLAGS) $(xineplug_decode_spudvb_la_OBJECTS) $(xineplug_decode_spudvb_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -612,6 +396,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -620,7 +409,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -632,24 +420,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -658,22 +430,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -691,10 +460,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -706,31 +475,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -748,8 +514,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -757,30 +522,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libsputext/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libsputext/Makefile.in
+--- xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libsputext/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,104 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_sputext_la_SOURCES) $(xineplug_dmx_sputext_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libsputext
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_sputext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_sputext_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_sputext_la_OBJECTS = \
+- $(am_xineplug_decode_sputext_la_OBJECTS)
+-xineplug_dmx_sputext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_dmx_sputext_la_OBJECTS = demux_sputext.lo
+-xineplug_dmx_sputext_la_OBJECTS = \
+- $(am_xineplug_dmx_sputext_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_sputext_la_SOURCES) \
+- $(xineplug_dmx_sputext_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_sputext_la_SOURCES) \
+- $(xineplug_dmx_sputext_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -118,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -138,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -164,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -193,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -322,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -337,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -351,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -365,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -389,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -426,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -441,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -458,125 +272,96 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ sputext_decoder = xineplug_decode_sputext.la xineplug_dmx_sputext.la
++
+ lib_LTLIBRARIES = $(sputext_decoder)
++
+ xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
+ xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
+ xineplug_dmx_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_sputext_la_SOURCES = xine_decoder.c
+ xineplug_decode_sputext_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libsputext
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_sputext_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_sputext_la_OBJECTS = xine_decoder.lo
++xineplug_decode_sputext_la_OBJECTS = \
++ $(am_xineplug_decode_sputext_la_OBJECTS)
++xineplug_dmx_sputext_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_dmx_sputext_la_OBJECTS = demux_sputext.lo
++xineplug_dmx_sputext_la_OBJECTS = $(am_xineplug_dmx_sputext_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/demux_sputext.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_sputext_la_SOURCES) \
++ $(xineplug_dmx_sputext_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_sputext_la_SOURCES) $(xineplug_dmx_sputext_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libsputext/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libsputext/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -586,7 +371,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_dmx_sputext_la_LDFLAGS) $(xineplug_dmx_sputext_la_OBJECTS) $(xineplug_dmx_sputext_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -594,26 +379,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demux_sputext.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -625,6 +411,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -633,7 +424,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -645,24 +435,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -671,22 +445,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -704,10 +475,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -719,31 +490,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -761,8 +529,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -770,30 +537,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libtheora/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libtheora/Makefile.in
+--- xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libtheora/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_theora_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libtheora
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-xineplug_decode_theora_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_decode_theora_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_theora_la_OBJECTS = \
+- $(am_xineplug_decode_theora_la_OBJECTS)
+-@HAVE_THEORA_TRUE@am_xineplug_decode_theora_la_rpath = -rpath \
+-@HAVE_THEORA_TRUE@ $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_theora_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_theora_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,157 +272,122 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(THEORA_CFLAGS)
++
+ @HAVE_THEORA_TRUE@theora_module = xineplug_decode_theora.la
++
+ lib_LTLIBRARIES = $(theora_module)
++
+ xineplug_decode_theora_la_SOURCES = xine_decoder.c
+ xineplug_decode_theora_la_LIBADD = $(OGG_LIBS) $(THEORA_LIBS)
+ xineplug_decode_theora_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libtheora
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_theora_la_DEPENDENCIES =
++am_xineplug_decode_theora_la_OBJECTS = xine_decoder.lo
++xineplug_decode_theora_la_OBJECTS = \
++ $(am_xineplug_decode_theora_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_theora_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_theora_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libtheora/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libtheora/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_theora.la: $(xineplug_decode_theora_la_OBJECTS) $(xineplug_decode_theora_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_theora_la_rpath) $(xineplug_decode_theora_la_LDFLAGS) $(xineplug_decode_theora_la_OBJECTS) $(xineplug_decode_theora_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_theora_la_LDFLAGS) $(xineplug_decode_theora_la_OBJECTS) $(xineplug_decode_theora_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -617,6 +399,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -625,7 +412,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -637,24 +423,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -663,22 +433,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -696,10 +463,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -711,31 +478,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -753,8 +517,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -762,30 +525,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libvorbis/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libvorbis/Makefile.in
+--- xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libvorbis/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_vorbis_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libvorbis
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-xineplug_decode_vorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_decode_vorbis_la_OBJECTS = xine_decoder.lo
+-xineplug_decode_vorbis_la_OBJECTS = \
+- $(am_xineplug_decode_vorbis_la_OBJECTS)
+-@HAVE_VORBIS_TRUE@am_xineplug_decode_vorbis_la_rpath = -rpath \
+-@HAVE_VORBIS_TRUE@ $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_vorbis_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_vorbis_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,157 +272,122 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(VORBIS_CFLAGS)
++
+ @HAVE_VORBIS_TRUE@vorbis_module = xineplug_decode_vorbis.la
++
+ lib_LTLIBRARIES = $(vorbis_module)
++
+ xineplug_decode_vorbis_la_SOURCES = xine_decoder.c
+ xineplug_decode_vorbis_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libvorbis
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_vorbis_la_DEPENDENCIES =
++am_xineplug_decode_vorbis_la_OBJECTS = xine_decoder.lo
++xineplug_decode_vorbis_la_OBJECTS = \
++ $(am_xineplug_decode_vorbis_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xine_decoder.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_vorbis_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_vorbis_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libvorbis/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libvorbis/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_vorbis.la: $(xineplug_decode_vorbis_la_OBJECTS) $(xineplug_decode_vorbis_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_vorbis_la_rpath) $(xineplug_decode_vorbis_la_LDFLAGS) $(xineplug_decode_vorbis_la_OBJECTS) $(xineplug_decode_vorbis_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_vorbis_la_LDFLAGS) $(xineplug_decode_vorbis_la_OBJECTS) $(xineplug_decode_vorbis_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -617,6 +399,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -625,7 +412,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -637,24 +423,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -663,22 +433,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -696,10 +463,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -711,31 +478,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -753,8 +517,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -762,30 +525,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/DirectShow/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,93 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libds_filter_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll/DirectShow
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libds_filter_la_LIBADD =
+-am_libds_filter_la_OBJECTS = allocator.lo cmediasample.lo guids.lo \
+- inputpin.lo outputpin.lo DS_Filter.lo DS_AudioDecoder.lo \
+- DS_VideoDecoder.lo
+-libds_filter_la_OBJECTS = $(am_libds_filter_la_OBJECTS)
+-@HAVE_W32DLL_TRUE@am_libds_filter_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libds_filter_la_SOURCES)
+-DIST_SOURCES = $(libds_filter_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -107,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -127,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -153,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -182,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -311,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -326,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -340,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -354,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -378,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -415,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -430,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -447,67 +271,23 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
+ -Wmissing-prototypes -Wimplicit-function-declaration \
+ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
+ -I$(srcdir)/.. -I$(srcdir)/../wine
+
++
+ @HAVE_W32DLL_TRUE@ds_filter_lib = libds_filter.la
++
+ noinst_LTLIBRARIES = $(ds_filter_lib)
++
+ libds_filter_la_SOURCES = \
+ allocator.c \
+ cmediasample.c \
+@@ -518,6 +298,7 @@
+ DS_AudioDecoder.c \
+ DS_VideoDecoder.c
+
++
+ noinst_HEADERS = \
+ allocator.h \
+ cmediasample.h \
+@@ -530,53 +311,69 @@
+ DS_Filter.h \
+ DS_VideoDecoder.h
+
++subdir = src/libw32dll/DirectShow
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libds_filter_la_LDFLAGS =
++libds_filter_la_LIBADD =
++am_libds_filter_la_OBJECTS = allocator.lo cmediasample.lo guids.lo \
++ inputpin.lo outputpin.lo DS_Filter.lo DS_AudioDecoder.lo \
++ DS_VideoDecoder.lo
++libds_filter_la_OBJECTS = $(am_libds_filter_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/DS_AudioDecoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/DS_Filter.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/DS_VideoDecoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/allocator.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cmediasample.Plo ./$(DEPDIR)/guids.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/inputpin.Plo ./$(DEPDIR)/outputpin.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libds_filter_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libds_filter_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/DirectShow/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/DirectShow/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libds_filter.la: $(libds_filter_la_OBJECTS) $(libds_filter_la_DEPENDENCIES)
+- $(LINK) $(am_libds_filter_la_rpath) $(libds_filter_la_LDFLAGS) $(libds_filter_la_OBJECTS) $(libds_filter_la_LIBADD) $(LIBS)
++ $(LINK) $(libds_filter_la_LDFLAGS) $(libds_filter_la_OBJECTS) $(libds_filter_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -590,26 +387,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inputpin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outputpin.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -621,6 +419,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -629,7 +432,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -641,24 +443,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -667,22 +453,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -700,7 +483,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -712,31 +497,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -754,8 +536,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -763,29 +544,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/Makefile.in 2005-02-13 01:07:59.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,121 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_decode_qt_la_SOURCES) $(xineplug_decode_w32dll_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_qt_la_DEPENDENCIES = \
+- $(top_builddir)/src/libw32dll/wine/libwine.la \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_decode_qt_la_OBJECTS = qt_decoder.lo
+-xineplug_decode_qt_la_OBJECTS = $(am_xineplug_decode_qt_la_OBJECTS)
+-@HAVE_W32DLL_TRUE@am_xineplug_decode_qt_la_rpath = -rpath $(libdir)
+-xineplug_decode_w32dll_la_DEPENDENCIES = \
+- $(top_builddir)/src/libw32dll/wine/libwine.la \
+- $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
+- $(top_builddir)/src/libw32dll/dmo/libdmo_filter.la
+-am_xineplug_decode_w32dll_la_OBJECTS = w32codec.lo
+-xineplug_decode_w32dll_la_OBJECTS = \
+- $(am_xineplug_decode_w32dll_la_OBJECTS)
+-@HAVE_W32DLL_TRUE@am_xineplug_decode_w32dll_la_rpath = -rpath \
+-@HAVE_W32DLL_TRUE@ $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_qt_la_SOURCES) \
+- $(xineplug_decode_w32dll_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_qt_la_SOURCES) \
+- $(xineplug_decode_w32dll_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -135,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -155,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -181,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -210,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -339,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -354,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -368,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -382,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -406,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -443,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -458,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -475,65 +272,22 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\"
++
+ SUBDIRS = wine DirectShow dmo qtx
++
+ @HAVE_W32DLL_TRUE@w32dll_codec = xineplug_decode_w32dll.la
+ @HAVE_W32DLL_TRUE@qt_codec = xineplug_decode_qt.la
++
+ lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
++
+ xineplug_decode_w32dll_la_SOURCES = w32codec.c
+ xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_decode_w32dll_la_LIBADD = \
+@@ -543,6 +297,7 @@
+ $(top_builddir)/src/libw32dll/dmo/libdmo_filter.la \
+ @KSTAT_LIBS@
+
++
+ xineplug_decode_qt_la_SOURCES = qt_decoder.c
+ xineplug_decode_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_decode_qt_la_LIBADD = \
+@@ -550,74 +305,102 @@
+ $(XINE_LIB) \
+ @KSTAT_LIBS@
+
++
+ noinst_HEADERS = libwin32.h w32codec.h
++subdir = src/libw32dll
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_qt_la_DEPENDENCIES = \
++ $(top_builddir)/src/libw32dll/wine/libwine.la \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_qt_la_OBJECTS = qt_decoder.lo
++xineplug_decode_qt_la_OBJECTS = $(am_xineplug_decode_qt_la_OBJECTS)
++xineplug_decode_w32dll_la_DEPENDENCIES = \
++ $(top_builddir)/src/libw32dll/wine/libwine.la \
++ $(top_builddir)/src/xine-engine/libxine.la \
++ $(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
++ $(top_builddir)/src/libw32dll/dmo/libdmo_filter.la
++am_xineplug_decode_w32dll_la_OBJECTS = w32codec.lo
++xineplug_decode_w32dll_la_OBJECTS = \
++ $(am_xineplug_decode_w32dll_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/qt_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/w32codec.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_qt_la_SOURCES) \
++ $(xineplug_decode_w32dll_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_decode_qt_la_SOURCES) $(xineplug_decode_w32dll_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_qt.la: $(xineplug_decode_qt_la_OBJECTS) $(xineplug_decode_qt_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_qt_la_rpath) $(xineplug_decode_qt_la_LDFLAGS) $(xineplug_decode_qt_la_OBJECTS) $(xineplug_decode_qt_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_qt_la_LDFLAGS) $(xineplug_decode_qt_la_OBJECTS) $(xineplug_decode_qt_la_LIBADD) $(LIBS)
+ xineplug_decode_w32dll.la: $(xineplug_decode_w32dll_la_OBJECTS) $(xineplug_decode_w32dll_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_w32dll_la_rpath) $(xineplug_decode_w32dll_la_LDFLAGS) $(xineplug_decode_w32dll_la_OBJECTS) $(xineplug_decode_w32dll_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_w32dll_la_LDFLAGS) $(xineplug_decode_w32dll_la_OBJECTS) $(xineplug_decode_w32dll_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -625,26 +408,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_decoder.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32codec.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -710,10 +494,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -723,23 +508,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -748,24 +524,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -774,22 +534,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -804,17 +561,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -824,9 +579,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -838,31 +592,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -880,8 +631,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -889,35 +639,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/dmo/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,92 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libdmo_filter_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll/dmo
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libdmo_filter_la_LIBADD =
+-am_libdmo_filter_la_OBJECTS = buffer.lo DMO_AudioDecoder.lo dmo.lo \
+- dmo_guids.lo DMO_VideoDecoder.lo
+-libdmo_filter_la_OBJECTS = $(am_libdmo_filter_la_OBJECTS)
+-@HAVE_W32DLL_TRUE@am_libdmo_filter_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdmo_filter_la_SOURCES)
+-DIST_SOURCES = $(libdmo_filter_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -106,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -126,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -152,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -181,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -310,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -325,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -339,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -353,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -377,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -414,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -429,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -446,67 +271,23 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
+ -Wmissing-prototypes -Wimplicit-function-declaration \
+ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
+ -I$(srcdir)/.. -I$(srcdir)/../wine
+
++
+ @HAVE_W32DLL_TRUE@dmo_filter_lib = libdmo_filter.la
++
+ noinst_LTLIBRARIES = $(dmo_filter_lib)
++
+ libdmo_filter_la_SOURCES = \
+ buffer.c \
+ DMO_AudioDecoder.c \
+@@ -514,6 +295,7 @@
+ dmo_guids.c \
+ DMO_VideoDecoder.c
+
++
+ noinst_HEADERS = \
+ DMO_AudioDecoder.h \
+ dmo_guids.h \
+@@ -522,53 +304,66 @@
+ dmo.h \
+ DMO_VideoDecoder.h
+
++subdir = src/libw32dll/dmo
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libdmo_filter_la_LDFLAGS =
++libdmo_filter_la_LIBADD =
++am_libdmo_filter_la_OBJECTS = buffer.lo DMO_AudioDecoder.lo dmo.lo \
++ dmo_guids.lo DMO_VideoDecoder.lo
++libdmo_filter_la_OBJECTS = $(am_libdmo_filter_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/DMO_AudioDecoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/DMO_VideoDecoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/buffer.Plo ./$(DEPDIR)/dmo.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dmo_guids.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libdmo_filter_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libdmo_filter_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/dmo/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/dmo/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libdmo_filter.la: $(libdmo_filter_la_OBJECTS) $(libdmo_filter_la_DEPENDENCIES)
+- $(LINK) $(am_libdmo_filter_la_rpath) $(libdmo_filter_la_LDFLAGS) $(libdmo_filter_la_OBJECTS) $(libdmo_filter_la_LIBADD) $(LIBS)
++ $(LINK) $(libdmo_filter_la_LDFLAGS) $(libdmo_filter_la_OBJECTS) $(libdmo_filter_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -579,26 +374,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmo.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmo_guids.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -610,6 +406,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -618,7 +419,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -630,24 +430,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -656,22 +440,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -689,7 +470,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -701,31 +484,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -743,8 +523,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -752,29 +531,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,77 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll/qtx
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -91,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -111,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -137,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -166,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -295,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -310,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -324,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -338,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -362,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -399,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -414,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -431,93 +271,34 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = qtxsdk
++subdir = src/libw32dll/qtx
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/qtx/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/qtx/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -583,10 +364,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -596,23 +378,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -621,24 +394,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -647,22 +404,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -677,17 +431,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -697,6 +449,7 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -708,20 +461,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -729,8 +482,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -748,40 +499,33 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/qtx/qtxsdk/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll/qtx/qtxsdk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,93 +271,30 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ noinst_HEADERS = components.h select.h
++subdir = src/libw32dll/qtx/qtxsdk
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/qtx/qtxsdk/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/qtx/qtxsdk/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -524,6 +306,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -532,7 +319,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -544,24 +330,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -570,22 +340,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -603,7 +370,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -615,20 +384,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -636,8 +405,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -655,35 +422,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in
+--- xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libw32dll/wine/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,95 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libwine_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libw32dll/wine
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libwine_la_LIBADD =
+-am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
+- ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \
+- registry.lo vfl.lo win32.lo stubs.lo wrapper.lo
+-libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
+-@HAVE_W32DLL_TRUE@am_libwine_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+- $(CCASFLAGS)
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libwine_la_SOURCES)
+-DIST_SOURCES = $(libwine_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -109,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -129,22 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-
+-# CFLAGS is here to filter out -fomit-frame-pointer,
+-# -finline-functions and -frename-registers because they cause bad
+-# behavior of wine
+-CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'`
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -159,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -188,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -317,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -332,12 +165,11 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
++
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
+@@ -346,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -360,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -384,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -421,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -436,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -453,68 +272,30 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = stubs.s wrapper.S
++
+ noinst_LTLIBRARIES = $(wine_lib)
++
+ AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
+ -Wmissing-prototypes -Wimplicit-function-declaration \
+ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
+ -Ddbg_printf=__vprintf -DTRACE=__vprintf
+
++
++# CFLAGS is here to filter out -fomit-frame-pointer,
++# -finline-functions and -frename-registers because they cause bad
++# behavior of wine
++CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'`
++
+ @HAVE_W32DLL_TRUE@wine_lib = libwine.la
++
+ libwine_la_SOURCES = \
+ afl.c \
+ driver.c \
+@@ -531,6 +312,7 @@
+ stubs.s \
+ wrapper.S
+
++
+ noinst_HEADERS = \
+ avifmt.h \
+ basetsd.h \
+@@ -569,53 +351,71 @@
+ winuser.h \
+ wrapper.h
+
++subdir = src/libw32dll/wine
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libwine_la_LDFLAGS =
++libwine_la_LIBADD =
++am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \
++ module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \
++ vfl.lo win32.lo stubs.lo wrapper.lo
++libwine_la_OBJECTS = $(am_libwine_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/afl.Plo ./$(DEPDIR)/driver.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/elfdll.Plo ./$(DEPDIR)/ext.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ldt_keeper.Plo ./$(DEPDIR)/module.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pe_image.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pe_resource.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/registry.Plo ./$(DEPDIR)/resource.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vfl.Plo ./$(DEPDIR)/win32.Plo
++LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
++ $(CCASFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libwine_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libwine_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .obj .s
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libw32dll/wine/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libw32dll/wine/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libwine.la: $(libwine_la_OBJECTS) $(libwine_la_DEPENDENCIES)
+- $(LINK) $(am_libwine_la_rpath) $(libwine_la_LDFLAGS) $(libwine_la_OBJECTS) $(libwine_la_LIBADD) $(LIBS)
++ $(LINK) $(libwine_la_LDFLAGS) $(libwine_la_OBJECTS) $(libwine_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -633,44 +433,45 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfl.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .S.o:
+- $(CCASCOMPILE) -c $<
++ $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .S.obj:
+- $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
++ $(CCASCOMPILE) -c `cygpath -w $<`
+
+ .S.lo:
+- $(LTCCASCOMPILE) -c -o $@ $<
++ $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ .s.o:
+- $(CCASCOMPILE) -c $<
++ $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .s.obj:
+- $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
++ $(CCASCOMPILE) -c `cygpath -w $<`
+
+ .s.lo:
+- $(LTCCASCOMPILE) -c -o $@ $<
++ $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -682,6 +483,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -690,7 +496,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -702,24 +507,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -728,22 +517,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -761,7 +547,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -773,31 +561,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -815,8 +600,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -824,29 +608,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,112 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_gsm610_la_SOURCES) $(xineplug_decode_nsf_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libxineadec
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_gsm610_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/libxineadec/gsm610/libgsm610.la
+-am_xineplug_decode_gsm610_la_OBJECTS = gsm610.lo
+-xineplug_decode_gsm610_la_OBJECTS = \
+- $(am_xineplug_decode_gsm610_la_OBJECTS)
+-xineplug_decode_nsf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/libxineadec/nosefart/libnosefart.la
+-am_xineplug_decode_nsf_la_OBJECTS = nsf.lo
+-xineplug_decode_nsf_la_OBJECTS = $(am_xineplug_decode_nsf_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_gsm610_la_SOURCES) \
+- $(xineplug_decode_nsf_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_gsm610_la_SOURCES) \
+- $(xineplug_decode_nsf_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -126,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -146,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -172,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -201,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -330,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -345,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -359,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -373,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -397,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -434,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -449,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -466,73 +272,31 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = fooaudio.c
++
+ AM_CFLAGS = -DNSF_PLAYER
++
+ SUBDIRS = gsm610 nosefart
++
+ lib_LTLIBRARIES = \
+ xineplug_decode_gsm610.la \
+ xineplug_decode_nsf.la
+
++
+ xineplug_decode_gsm610_la_SOURCES = gsm610.c
+ xineplug_decode_gsm610_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ xineplug_decode_gsm610_la_LIBADD = \
+ $(XINE_LIB) \
+ $(top_builddir)/src/libxineadec/gsm610/libgsm610.la
+
++
+ xineplug_decode_nsf_la_SOURCES = nsf.c
+ #xineplug_decode_nsf_la_CFLAGS = -DNSF_PLAYER
+ xineplug_decode_nsf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+@@ -540,63 +304,85 @@
+ $(XINE_LIB) \
+ $(top_builddir)/src/libxineadec/nosefart/libnosefart.la
+
++subdir = src/libxineadec
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_gsm610_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la \
++ $(top_builddir)/src/libxineadec/gsm610/libgsm610.la
++am_xineplug_decode_gsm610_la_OBJECTS = gsm610.lo
++xineplug_decode_gsm610_la_OBJECTS = \
++ $(am_xineplug_decode_gsm610_la_OBJECTS)
++xineplug_decode_nsf_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la \
++ $(top_builddir)/src/libxineadec/nosefart/libnosefart.la
++am_xineplug_decode_nsf_la_OBJECTS = nsf.lo
++xineplug_decode_nsf_la_OBJECTS = $(am_xineplug_decode_nsf_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gsm610.Plo ./$(DEPDIR)/nsf.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_gsm610_la_SOURCES) \
++ $(xineplug_decode_nsf_la_SOURCES)
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_decode_gsm610_la_SOURCES) $(xineplug_decode_nsf_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libxineadec/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libxineadec/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -606,7 +392,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_decode_nsf_la_LDFLAGS) $(xineplug_decode_nsf_la_OBJECTS) $(xineplug_decode_nsf_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -614,26 +400,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm610.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nsf.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -699,10 +486,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -712,23 +500,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -737,24 +516,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -763,22 +526,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -793,17 +553,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -813,9 +571,8 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -827,31 +584,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -869,8 +623,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -878,35 +631,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/gsm610/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,92 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libgsm610_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libxineadec/gsm610
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libgsm610_la_LIBADD =
+-am_libgsm610_la_OBJECTS = add.lo decode.lo gsm_create.lo gsm_decode.lo \
+- gsm_destroy.lo long_term.lo lpc.lo rpe.lo short_term.lo \
+- table.lo
+-libgsm610_la_OBJECTS = $(am_libgsm610_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libgsm610_la_SOURCES)
+-DIST_SOURCES = $(libgsm610_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -106,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -126,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -152,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -181,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -310,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -325,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -339,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -353,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -377,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -414,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -429,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -446,61 +271,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ noinst_LTLIBRARIES = libgsm610.la
++
+ libgsm610_la_SOURCES = \
+ add.c \
+ decode.c \
+@@ -513,7 +292,9 @@
+ short_term.c \
+ table.c
+
++
+ libgsm610_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ gsm_config.h \
+ gsm.h \
+@@ -521,45 +302,61 @@
+ proto.h \
+ unproto.h
+
++subdir = src/libxineadec/gsm610
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libgsm610_la_LIBADD =
++am_libgsm610_la_OBJECTS = add.lo decode.lo gsm_create.lo gsm_decode.lo \
++ gsm_destroy.lo long_term.lo lpc.lo rpe.lo short_term.lo \
++ table.lo
++libgsm610_la_OBJECTS = $(am_libgsm610_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/add.Plo ./$(DEPDIR)/decode.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/gsm_create.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/gsm_decode.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/gsm_destroy.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/long_term.Plo ./$(DEPDIR)/lpc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rpe.Plo ./$(DEPDIR)/short_term.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/table.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libgsm610_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libgsm610_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libxineadec/gsm610/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libxineadec/gsm610/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -567,7 +364,7 @@
+ $(LINK) $(libgsm610_la_LDFLAGS) $(libgsm610_la_OBJECTS) $(libgsm610_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -583,26 +380,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/short_term.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -614,6 +412,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -622,7 +425,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -634,24 +436,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -660,22 +446,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -693,7 +476,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -705,31 +490,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -747,8 +529,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -756,29 +537,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in
+--- xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxineadec/nosefart/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,92 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libnosefart_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/libxineadec/nosefart
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libnosefart_la_LIBADD =
+-am_libnosefart_la_OBJECTS = fds_snd.lo log.lo mmc5_snd.lo nes_apu.lo \
+- vrc7_snd.lo dis6502.lo fmopl.lo memguard.lo nes6502.lo nsf.lo \
+- vrcvisnd.lo
+-libnosefart_la_OBJECTS = $(am_libnosefart_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libnosefart_la_SOURCES)
+-DIST_SOURCES = $(libnosefart_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -106,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -126,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -152,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -181,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -310,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -325,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -339,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -353,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -377,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -414,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -429,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -446,62 +271,17 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -DNSF_PLAYER
++
+ noinst_LTLIBRARIES = libnosefart.la
++
+ libnosefart_la_SOURCES = \
+ fds_snd.c \
+ log.c \
+@@ -515,7 +295,9 @@
+ nsf.c \
+ vrcvisnd.c
+
++
+ libnosefart_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = \
+ dis6502.h \
+ fmopl.h \
+@@ -532,45 +314,60 @@
+ version.h \
+ vrcvisnd.h
+
++subdir = src/libxineadec/nosefart
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libnosefart_la_LIBADD =
++am_libnosefart_la_OBJECTS = fds_snd.lo log.lo mmc5_snd.lo nes_apu.lo \
++ vrc7_snd.lo dis6502.lo fmopl.lo memguard.lo nes6502.lo nsf.lo \
++ vrcvisnd.lo
++libnosefart_la_OBJECTS = $(am_libnosefart_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dis6502.Plo ./$(DEPDIR)/fds_snd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/fmopl.Plo ./$(DEPDIR)/log.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/memguard.Plo ./$(DEPDIR)/mmc5_snd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/nes6502.Plo ./$(DEPDIR)/nes_apu.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/nsf.Plo ./$(DEPDIR)/vrc7_snd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vrcvisnd.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libnosefart_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libnosefart_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libxineadec/nosefart/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libxineadec/nosefart/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -578,7 +375,7 @@
+ $(LINK) $(libnosefart_la_LDFLAGS) $(libnosefart_la_OBJECTS) $(libnosefart_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -595,26 +392,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vrc7_snd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vrcvisnd.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -626,6 +424,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -634,7 +437,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -646,24 +448,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -672,22 +458,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -705,7 +488,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -717,31 +502,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -759,8 +541,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -768,29 +549,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/libxinevdec/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in
+--- xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/libxinevdec/Makefile.in 2005-02-13 01:08:00.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,118 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_decode_bitplane_la_SOURCES) $(xineplug_decode_image_la_SOURCES) $(xineplug_decode_rgb_la_SOURCES) $(xineplug_decode_yuv_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/libxinevdec
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_decode_bitplane_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_bitplane_la_OBJECTS = bitplane.lo
+-xineplug_decode_bitplane_la_OBJECTS = \
+- $(am_xineplug_decode_bitplane_la_OBJECTS)
+-am__DEPENDENCIES_2 =
+-xineplug_decode_image_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
+-am_xineplug_decode_image_la_OBJECTS = \
+- xineplug_decode_image_la-image.lo
+-xineplug_decode_image_la_OBJECTS = \
+- $(am_xineplug_decode_image_la_OBJECTS)
+-@HAVE_LIBPNG_TRUE@am_xineplug_decode_image_la_rpath = -rpath $(libdir)
+-xineplug_decode_rgb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_rgb_la_OBJECTS = rgb.lo
+-xineplug_decode_rgb_la_OBJECTS = $(am_xineplug_decode_rgb_la_OBJECTS)
+-xineplug_decode_yuv_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_yuv_la_OBJECTS = yuv.lo
+-xineplug_decode_yuv_la_OBJECTS = $(am_xineplug_decode_yuv_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_decode_bitplane_la_SOURCES) \
+- $(xineplug_decode_image_la_SOURCES) \
+- $(xineplug_decode_rgb_la_SOURCES) \
+- $(xineplug_decode_yuv_la_SOURCES)
+-DIST_SOURCES = $(xineplug_decode_bitplane_la_SOURCES) \
+- $(xineplug_decode_image_la_SOURCES) \
+- $(xineplug_decode_rgb_la_SOURCES) \
+- $(xineplug_decode_yuv_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -132,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -152,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -178,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -207,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -336,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -351,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -365,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -379,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -403,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -440,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -455,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -472,151 +272,138 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = foovideo.c
++
+ @HAVE_LIBPNG_TRUE@image_module = xineplug_decode_image.la
++
+ lib_LTLIBRARIES = $(image_module) \
+ xineplug_decode_bitplane.la \
+ xineplug_decode_rgb.la \
+ xineplug_decode_yuv.la
+
++
+ xineplug_decode_bitplane_la_SOURCES = bitplane.c
+ xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_bitplane_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_rgb_la_SOURCES = rgb.c
+ xineplug_decode_rgb_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_rgb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_yuv_la_SOURCES = yuv.c
+ xineplug_decode_yuv_la_LIBADD = $(XINE_LIB)
+ xineplug_decode_yuv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_decode_image_la_SOURCES = image.c
+ xineplug_decode_image_la_CFLAGS = $(PNG_CFLAGS)
+ xineplug_decode_image_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(PNG_LIBS)
+ xineplug_decode_image_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/libxinevdec
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_decode_bitplane_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_bitplane_la_OBJECTS = bitplane.lo
++xineplug_decode_bitplane_la_OBJECTS = \
++ $(am_xineplug_decode_bitplane_la_OBJECTS)
++xineplug_decode_image_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_image_la_OBJECTS = xineplug_decode_image_la-image.lo
++xineplug_decode_image_la_OBJECTS = \
++ $(am_xineplug_decode_image_la_OBJECTS)
++xineplug_decode_rgb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_rgb_la_OBJECTS = rgb.lo
++xineplug_decode_rgb_la_OBJECTS = $(am_xineplug_decode_rgb_la_OBJECTS)
++xineplug_decode_yuv_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_decode_yuv_la_OBJECTS = yuv.lo
++xineplug_decode_yuv_la_OBJECTS = $(am_xineplug_decode_yuv_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bitplane.Plo ./$(DEPDIR)/rgb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xineplug_decode_image_la-image.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/yuv.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_decode_bitplane_la_SOURCES) \
++ $(xineplug_decode_image_la_SOURCES) \
++ $(xineplug_decode_rgb_la_SOURCES) \
++ $(xineplug_decode_yuv_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_decode_bitplane_la_SOURCES) $(xineplug_decode_image_la_SOURCES) $(xineplug_decode_rgb_la_SOURCES) $(xineplug_decode_yuv_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libxinevdec/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libxinevdec/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_decode_bitplane.la: $(xineplug_decode_bitplane_la_OBJECTS) $(xineplug_decode_bitplane_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_decode_bitplane_la_LDFLAGS) $(xineplug_decode_bitplane_la_OBJECTS) $(xineplug_decode_bitplane_la_LIBADD) $(LIBS)
++xineplug_decode_image_la-image.lo: image.c
+ xineplug_decode_image.la: $(xineplug_decode_image_la_OBJECTS) $(xineplug_decode_image_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_decode_image_la_rpath) $(xineplug_decode_image_la_LDFLAGS) $(xineplug_decode_image_la_OBJECTS) $(xineplug_decode_image_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_decode_image_la_LDFLAGS) $(xineplug_decode_image_la_OBJECTS) $(xineplug_decode_image_la_LIBADD) $(LIBS)
+ xineplug_decode_rgb.la: $(xineplug_decode_rgb_la_OBJECTS) $(xineplug_decode_rgb_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_decode_rgb_la_LDFLAGS) $(xineplug_decode_rgb_la_OBJECTS) $(xineplug_decode_rgb_la_LIBADD) $(LIBS)
+ xineplug_decode_yuv.la: $(xineplug_decode_yuv_la_OBJECTS) $(xineplug_decode_yuv_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_decode_yuv_la_LDFLAGS) $(xineplug_decode_yuv_la_OBJECTS) $(xineplug_decode_yuv_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -626,33 +413,45 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_decode_image_la-image.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
++xineplug_decode_image_la-image.o: image.c
++@AMDEP_TRUE@ source='image.c' object='xineplug_decode_image_la-image.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_decode_image_la-image.Po' tmpdepfile='$(DEPDIR)/xineplug_decode_image_la-image.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_image_la_CFLAGS) $(CFLAGS) -c -o xineplug_decode_image_la-image.o `test -f 'image.c' || echo '$(srcdir)/'`image.c
++
++xineplug_decode_image_la-image.obj: image.c
++@AMDEP_TRUE@ source='image.c' object='xineplug_decode_image_la-image.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_decode_image_la-image.Po' tmpdepfile='$(DEPDIR)/xineplug_decode_image_la-image.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_image_la_CFLAGS) $(CFLAGS) -c -o xineplug_decode_image_la-image.obj `cygpath -w image.c`
+
+ xineplug_decode_image_la-image.lo: image.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_image_la_CFLAGS) $(CFLAGS) -MT xineplug_decode_image_la-image.lo -MD -MP -MF "$(DEPDIR)/xineplug_decode_image_la-image.Tpo" -c -o xineplug_decode_image_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_decode_image_la-image.Tpo" "$(DEPDIR)/xineplug_decode_image_la-image.Plo"; else rm -f "$(DEPDIR)/xineplug_decode_image_la-image.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='image.c' object='xineplug_decode_image_la-image.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_image_la_CFLAGS) $(CFLAGS) -c -o xineplug_decode_image_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
++@AMDEP_TRUE@ source='image.c' object='xineplug_decode_image_la-image.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/xineplug_decode_image_la-image.Plo' tmpdepfile='$(DEPDIR)/xineplug_decode_image_la-image.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_image_la_CFLAGS) $(CFLAGS) -c -o xineplug_decode_image_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -664,6 +463,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -672,7 +476,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -684,24 +487,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -710,22 +497,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -743,10 +527,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -758,31 +542,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -800,8 +581,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -809,30 +589,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/Makefile.in
+--- xine-lib-vdr-1.0/src/post/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,77 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/post
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -91,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -111,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -137,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -166,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -295,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -310,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -324,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -338,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -362,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -399,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -414,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -431,95 +271,36 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = \
+ planar goom visualizations mosaico deinterlace audio
+
++subdir = src/post
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -585,10 +366,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -598,23 +380,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -623,24 +396,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -649,22 +406,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -679,17 +433,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -699,6 +451,7 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -710,20 +463,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -731,8 +484,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -750,40 +501,33 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/audio/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/audio/Makefile.in
+--- xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/audio/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_post_audio_filters_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/audio
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_post_audio_filters_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_post_audio_filters_la_OBJECTS = upmix.lo filter.lo \
+- window.lo stretch.lo audio_filters.lo
+-xineplug_post_audio_filters_la_OBJECTS = \
+- $(am_xineplug_post_audio_filters_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_audio_filters_la_SOURCES)
+-DIST_SOURCES = $(xineplug_post_audio_filters_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,124 +272,93 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ noinst_HEADERS = dsp.h filter.h window.h audio_filters.h
++
+ lib_LTLIBRARIES = xineplug_post_audio_filters.la
++
+ xineplug_post_audio_filters_la_SOURCES = \
+ upmix.c filter.c window.c stretch.c audio_filters.c
+
+ xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB)
+ xineplug_post_audio_filters_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
++subdir = src/post/audio
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_post_audio_filters_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_post_audio_filters_la_OBJECTS = upmix.lo filter.lo window.lo \
++ stretch.lo audio_filters.lo
++xineplug_post_audio_filters_la_OBJECTS = \
++ $(am_xineplug_post_audio_filters_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_filters.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/stretch.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/upmix.Plo ./$(DEPDIR)/window.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_post_audio_filters_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_post_audio_filters_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/audio/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/audio/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -580,7 +366,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_audio_filters_la_LDFLAGS) $(xineplug_post_audio_filters_la_OBJECTS) $(xineplug_post_audio_filters_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -591,26 +377,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmix.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -622,6 +409,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -630,7 +422,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -642,24 +433,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -668,22 +443,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -701,10 +473,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -716,31 +488,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -758,8 +527,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -767,30 +535,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in
+--- xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,109 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_post_tvtime_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/deinterlace
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_post_tvtime_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
+-am_xineplug_post_tvtime_la_OBJECTS = xine_plugin.lo deinterlace.lo \
+- pulldown.lo speedy.lo tvtime.lo
+-xineplug_post_tvtime_la_OBJECTS = \
+- $(am_xineplug_post_tvtime_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_tvtime_la_SOURCES)
+-DIST_SOURCES = $(xineplug_post_tvtime_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -123,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -143,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -169,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -198,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -327,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -342,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -356,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -370,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -394,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -431,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -446,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -463,128 +272,106 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = plugins
++
+ EXTRA_DIST =
++
+ lib_LTLIBRARIES = xineplug_post_tvtime.la
++
+ xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
+ deinterlace.c pulldown.c speedy.c tvtime.c
+
+ xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) \
+ $(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
+
++
+ xineplug_post_tvtime_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = deinterlace.h pulldown.h speedtools.h speedy.h tvtime.h
++subdir = src/post/deinterlace
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_post_tvtime_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la \
++ $(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la
++am_xineplug_post_tvtime_la_OBJECTS = xine_plugin.lo deinterlace.lo \
++ pulldown.lo speedy.lo tvtime.lo
++xineplug_post_tvtime_la_OBJECTS = $(am_xineplug_post_tvtime_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/deinterlace.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pulldown.Plo ./$(DEPDIR)/speedy.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/tvtime.Plo ./$(DEPDIR)/xine_plugin.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_post_tvtime_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_post_tvtime_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/deinterlace/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/deinterlace/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -592,7 +379,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_tvtime_la_LDFLAGS) $(xineplug_post_tvtime_la_OBJECTS) $(xineplug_post_tvtime_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -603,26 +390,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvtime.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_plugin.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -688,10 +476,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -701,23 +490,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -726,24 +506,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -752,22 +516,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -782,17 +543,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -802,9 +561,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -816,31 +574,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -858,8 +613,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -867,35 +621,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in
+--- xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/deinterlace/plugins/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,93 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libdeinterlaceplugins_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/deinterlace/plugins
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-libdeinterlaceplugins_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_libdeinterlaceplugins_la_OBJECTS = double.lo greedy.lo linear.lo \
+- linearblend.lo vfir.lo weave.lo greedy2frame.lo scalerbob.lo
+-libdeinterlaceplugins_la_OBJECTS = \
+- $(am_libdeinterlaceplugins_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdeinterlaceplugins_la_SOURCES)
+-DIST_SOURCES = $(libdeinterlaceplugins_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -107,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -127,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -153,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -182,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -311,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -326,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -340,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -354,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -378,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -415,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -430,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -447,63 +272,19 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CPPFLAGS = -I$(top_srcdir)/src/post/deinterlace
++
+ EXTRA_DIST = greedy2frame_template.c
++
+ noinst_LTLIBRARIES = libdeinterlaceplugins.la
++
+ libdeinterlaceplugins_la_SOURCES = \
+ double.c \
+ greedy.c \
+@@ -516,46 +297,62 @@
+
+ libdeinterlaceplugins_la_LIBADD = $(XINE_LIB)
+ libdeinterlaceplugins_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ noinst_HEADERS = plugins.h
++subdir = src/post/deinterlace/plugins
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libdeinterlaceplugins_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_libdeinterlaceplugins_la_OBJECTS = double.lo greedy.lo linear.lo \
++ linearblend.lo vfir.lo weave.lo greedy2frame.lo scalerbob.lo
++libdeinterlaceplugins_la_OBJECTS = \
++ $(am_libdeinterlaceplugins_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/double.Plo ./$(DEPDIR)/greedy.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/greedy2frame.Plo ./$(DEPDIR)/linear.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/linearblend.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/scalerbob.Plo ./$(DEPDIR)/vfir.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/weave.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libdeinterlaceplugins_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libdeinterlaceplugins_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/deinterlace/plugins/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/deinterlace/plugins/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -563,7 +360,7 @@
+ $(LINK) $(libdeinterlaceplugins_la_LDFLAGS) $(libdeinterlaceplugins_la_OBJECTS) $(libdeinterlaceplugins_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -577,26 +374,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfir.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -608,6 +406,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -616,7 +419,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -628,24 +430,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -654,22 +440,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -687,7 +470,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -699,31 +484,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -741,8 +523,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -750,29 +531,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/goom/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/goom/Makefile.in
+--- xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/goom/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,114 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_post_goom_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/goom
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 =
+-xineplug_post_goom_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am__xineplug_post_goom_la_SOURCES_DIST = mmx.c xmmx.c xine_goom.c \
+- config_param.c convolve_fx.c cpu_info.c drawmethods.c \
+- filters.c flying_stars_fx.c gfontlib.c gfontrle.c goom_core.c \
+- goom_tools.c goomsl.c goomsl_hash.c goomsl_lex.c goomsl_yacc.c \
+- graphic.c ifs.c lines.c mathtools.c plugin_info.c \
+- sound_tester.c surf3d.c tentacle3d.c v3d.c
+-@HAVE_FFMMX_TRUE@am__objects_1 = mmx.lo xmmx.lo
+-am_xineplug_post_goom_la_OBJECTS = $(am__objects_1) xine_goom.lo \
+- config_param.lo convolve_fx.lo cpu_info.lo drawmethods.lo \
+- filters.lo flying_stars_fx.lo gfontlib.lo gfontrle.lo \
+- goom_core.lo goom_tools.lo goomsl.lo goomsl_hash.lo \
+- goomsl_lex.lo goomsl_yacc.lo graphic.lo ifs.lo lines.lo \
+- mathtools.lo plugin_info.lo sound_tester.lo surf3d.lo \
+- tentacle3d.lo v3d.lo
+-xineplug_post_goom_la_OBJECTS = $(am_xineplug_post_goom_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_goom_la_SOURCES)
+-DIST_SOURCES = $(am__xineplug_post_goom_la_SOURCES_DIST)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -128,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -148,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os//g'`
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -174,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -203,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -332,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -347,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -361,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -375,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -399,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -436,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -451,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -468,69 +272,27 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch
++
++CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os//g'`
++
+ lib_LTLIBRARIES = xineplug_post_goom.la
+
++
+ #if PPC_ARCH
+ #extra_files = ppc_drawings.s ppc_zoom_ultimate.s
+ #AM_CPPFLAGS = -DCPU_POWERPC
+ #endif
+ @HAVE_FFMMX_TRUE@extra_files = mmx.c xmmx.c
+ @HAVE_FFMMX_TRUE@AM_CPPFLAGS = -DHAVE_MMX
++
+ xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \
+ config_param.c convolve_fx.c cpu_info.c drawmethods.c filters.c flying_stars_fx.c \
+ gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c \
+@@ -539,69 +301,102 @@
+
+ xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS)
+ xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
++
+ noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \
+ goom_config.h goom_config_param.h goom_filters.h goom_fx.h goom_graphic.h \
+ goom_plugin_info.h goom_tools.h goom_typedefs.h goom_visual_fx.h goomsl.h goomsl_hash.h \
+ goomsl_private.h goomsl_yacc.h ifs.h lines.h mathtools.h mmx.h \
+ ppc_drawings.h ppc_zoom_ultimate.h sound_tester.h surf3d.h tentacle3d.h v3d.h
+
++subdir = src/post/goom
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_post_goom_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_FFMMX_TRUE@am__objects_1 = mmx.lo xmmx.lo
++am_xineplug_post_goom_la_OBJECTS = $(am__objects_1) xine_goom.lo \
++ config_param.lo convolve_fx.lo cpu_info.lo drawmethods.lo \
++ filters.lo flying_stars_fx.lo gfontlib.lo gfontrle.lo \
++ goom_core.lo goom_tools.lo goomsl.lo goomsl_hash.lo \
++ goomsl_lex.lo goomsl_yacc.lo graphic.lo ifs.lo lines.lo \
++ mathtools.lo plugin_info.lo sound_tester.lo surf3d.lo \
++ tentacle3d.lo v3d.lo
++xineplug_post_goom_la_OBJECTS = $(am_xineplug_post_goom_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/config_param.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/convolve_fx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpu_info.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/drawmethods.Plo ./$(DEPDIR)/filters.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/flying_stars_fx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/gfontlib.Plo ./$(DEPDIR)/gfontrle.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/goom_core.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/goom_tools.Plo ./$(DEPDIR)/goomsl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/goomsl_hash.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/goomsl_lex.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/goomsl_yacc.Plo ./$(DEPDIR)/graphic.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/ifs.Plo ./$(DEPDIR)/lines.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mathtools.Plo ./$(DEPDIR)/mmx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/plugin_info.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sound_tester.Plo ./$(DEPDIR)/surf3d.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/tentacle3d.Plo ./$(DEPDIR)/v3d.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_goom.Plo ./$(DEPDIR)/xmmx.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(xineplug_post_goom_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_post_goom_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/goom/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/goom/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -609,7 +404,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_goom_la_LDFLAGS) $(xineplug_post_goom_la_OBJECTS) $(xineplug_post_goom_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -641,26 +436,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_goom.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmmx.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -672,6 +468,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -680,7 +481,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -692,24 +492,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -718,22 +502,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -751,10 +532,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -766,31 +547,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -808,8 +586,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -817,30 +594,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/mosaico/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in
+--- xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/mosaico/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,104 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_post_mosaico_la_SOURCES) $(xineplug_post_switch_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/mosaico
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_post_mosaico_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_post_mosaico_la_OBJECTS = mosaico.lo
+-xineplug_post_mosaico_la_OBJECTS = \
+- $(am_xineplug_post_mosaico_la_OBJECTS)
+-xineplug_post_switch_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_post_switch_la_OBJECTS = switch.lo
+-xineplug_post_switch_la_OBJECTS = \
+- $(am_xineplug_post_switch_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_mosaico_la_SOURCES) \
+- $(xineplug_post_switch_la_SOURCES)
+-DIST_SOURCES = $(xineplug_post_mosaico_la_SOURCES) \
+- $(xineplug_post_switch_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -118,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -138,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -164,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -193,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -322,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -337,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -351,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -365,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -389,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -426,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -441,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -458,124 +272,93 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
++
+ xineplug_post_mosaico_la_SOURCES = mosaico.c
+ xineplug_post_mosaico_la_LIBADD = $(XINE_LIB)
+ xineplug_post_mosaico_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_post_switch_la_SOURCES = switch.c
+ xineplug_post_switch_la_LIBADD = $(XINE_LIB)
+ xineplug_post_switch_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/post/mosaico
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_post_mosaico_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_post_mosaico_la_OBJECTS = mosaico.lo
++xineplug_post_mosaico_la_OBJECTS = \
++ $(am_xineplug_post_mosaico_la_OBJECTS)
++xineplug_post_switch_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_post_switch_la_OBJECTS = switch.lo
++xineplug_post_switch_la_OBJECTS = $(am_xineplug_post_switch_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mosaico.Plo ./$(DEPDIR)/switch.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_post_mosaico_la_SOURCES) \
++ $(xineplug_post_switch_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_post_mosaico_la_SOURCES) $(xineplug_post_switch_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/mosaico/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/mosaico/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -585,7 +368,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_switch_la_LDFLAGS) $(xineplug_post_switch_la_OBJECTS) $(xineplug_post_switch_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -593,26 +376,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mosaico.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/switch.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -624,6 +408,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -632,7 +421,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -644,24 +432,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -670,22 +442,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -703,10 +472,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -718,31 +487,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -760,8 +526,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -769,30 +534,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/planar/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/planar/Makefile.in
+--- xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/planar/Makefile.in 2005-02-13 01:08:01.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,99 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(xineplug_post_planar_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/planar
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-am__DEPENDENCIES_2 = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+-am_xineplug_post_planar_la_OBJECTS = planar.lo invert.lo expand.lo \
+- boxblur.lo denoise3d.lo eq.lo eq2.lo unsharp.lo pp.lo
+-xineplug_post_planar_la_OBJECTS = \
+- $(am_xineplug_post_planar_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_planar_la_SOURCES)
+-DIST_SOURCES = $(xineplug_post_planar_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -113,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -133,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -159,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -188,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -317,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -332,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -346,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -360,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -384,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -421,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -436,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -453,126 +272,92 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
+ POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
++
+ lib_LTLIBRARIES = xineplug_post_planar.la
++
+ xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c boxblur.c \
+ denoise3d.c eq.c eq2.c unsharp.c pp.c
+
+ xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_LIB)
+ xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm
+ xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++subdir = src/post/planar
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++am_xineplug_post_planar_la_OBJECTS = planar.lo invert.lo expand.lo \
++ boxblur.lo denoise3d.lo eq.lo eq2.lo unsharp.lo pp.lo
++xineplug_post_planar_la_OBJECTS = $(am_xineplug_post_planar_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/boxblur.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/denoise3d.Plo ./$(DEPDIR)/eq.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/eq2.Plo ./$(DEPDIR)/expand.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/invert.Plo ./$(DEPDIR)/planar.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pp.Plo ./$(DEPDIR)/unsharp.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_post_planar_la_SOURCES)
++DIST_COMMON = Makefile.am Makefile.in
++SOURCES = $(xineplug_post_planar_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/planar/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/planar/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -580,7 +365,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_planar_la_LDFLAGS) $(xineplug_post_planar_la_OBJECTS) $(xineplug_post_planar_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -595,26 +380,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsharp.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -626,6 +412,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -634,7 +425,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -646,24 +436,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -672,22 +446,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -705,10 +476,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -720,31 +491,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -762,8 +530,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -771,30 +538,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/post/visualizations/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in
+--- xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/post/visualizations/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,101 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_post_visualizations_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/post/visualizations
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_post_visualizations_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_post_visualizations_la_OBJECTS = visualizations.lo fft.lo \
+- fftscope.lo oscope.lo fftgraph.lo
+-xineplug_post_visualizations_la_OBJECTS = \
+- $(am_xineplug_post_visualizations_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_post_visualizations_la_SOURCES)
+-DIST_SOURCES = $(xineplug_post_visualizations_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/post
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -115,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -135,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -161,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -190,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -319,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -334,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -348,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -362,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -386,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -423,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -438,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -455,125 +272,95 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/post
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = fooviz.c
++
+ lib_LTLIBRARIES = xineplug_post_visualizations.la
++
+ xineplug_post_visualizations_la_SOURCES = \
+ visualizations.c fft.c fftscope.c oscope.c fftgraph.c
+
+ xineplug_post_visualizations_la_LIBADD = $(XINE_LIB)
+ xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
++
+ noinst_HEADERS = fft.h visualizations.h
++subdir = src/post/visualizations
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_post_visualizations_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_post_visualizations_la_OBJECTS = visualizations.lo fft.lo \
++ fftscope.lo oscope.lo fftgraph.lo
++xineplug_post_visualizations_la_OBJECTS = \
++ $(am_xineplug_post_visualizations_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fft.Plo ./$(DEPDIR)/fftgraph.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/fftscope.Plo ./$(DEPDIR)/oscope.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/visualizations.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_post_visualizations_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(xineplug_post_visualizations_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/post/visualizations/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/post/visualizations/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -581,7 +368,7 @@
+ $(LINK) -rpath $(libdir) $(xineplug_post_visualizations_la_LDFLAGS) $(xineplug_post_visualizations_la_OBJECTS) $(xineplug_post_visualizations_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -592,26 +379,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oscope.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visualizations.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -623,6 +411,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -631,7 +424,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -643,24 +435,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -669,22 +445,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -702,10 +475,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -717,31 +490,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -759,8 +529,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -768,30 +537,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/vdr/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/vdr/Makefile.in
+--- xine-lib-vdr-1.0/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/vdr/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -0,0 +1,662 @@
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
++# @configure_input@
++
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = @program_transform_name@
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
++AAINFO = @AAINFO@
++AALIB_CFLAGS = @AALIB_CFLAGS@
++AALIB_CONFIG = @AALIB_CONFIG@
++AALIB_LIBS = @AALIB_LIBS@
++ACLOCAL_DIR = @ACLOCAL_DIR@
++ALSA_CFLAGS = @ALSA_CFLAGS@
++ALSA_LIBS = @ALSA_LIBS@
++ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTS_CFLAGS = @ARTS_CFLAGS@
++ARTS_CONFIG = @ARTS_CONFIG@
++ARTS_LIBS = @ARTS_LIBS@
++AS = @AS@
++ASFLAGS = @ASFLAGS@
++AWK = @AWK@
++BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
++CACA_CFLAGS = @CACA_CFLAGS@
++CACA_CONFIG = @CACA_CONFIG@
++CACA_LIBS = @CACA_LIBS@
++CATALOGS = @CATALOGS@
++CATOBJEXT = @CATOBJEXT@
++CC = @CC@
++CCAS = @CCAS@
++CCASCOMPILE = @CCASCOMPILE@
++CCASFLAGS = @CCASFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++DATADIRNAME = @DATADIRNAME@
++DEBUG_CFLAGS = @DEBUG_CFLAGS@
++DEPCOMP = @DEPCOMP@
++DEPDIR = @DEPDIR@
++DEPMOD = @DEPMOD@
++DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
++DIRECTFB_LIBS = @DIRECTFB_LIBS@
++DIRECTX_AUDIO_LIBS = @DIRECTX_AUDIO_LIBS@
++DIRECTX_CPPFLAGS = @DIRECTX_CPPFLAGS@
++DIRECTX_VIDEO_LIBS = @DIRECTX_VIDEO_LIBS@
++DLLTOOL = @DLLTOOL@
++DVDNAV_CFLAGS = @DVDNAV_CFLAGS@
++DVDNAV_CONFIG = @DVDNAV_CONFIG@
++DVDNAV_LIBS = @DVDNAV_LIBS@
++DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
++ECHO = @ECHO@
++EGREP = @EGREP@
++ESD_CFLAGS = @ESD_CFLAGS@
++ESD_CONFIG = @ESD_CONFIG@
++ESD_LIBS = @ESD_LIBS@
++EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
++EXTRA_X_LIBS = @EXTRA_X_LIBS@
++F77 = @F77@
++FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
++FFMPEG_LIBS = @FFMPEG_LIBS@
++FIG2DEV = @FIG2DEV@
++FREETYPE_CONFIG = @FREETYPE_CONFIG@
++FT2_CFLAGS = @FT2_CFLAGS@
++FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
++GENCAT = @GENCAT@
++GLIBC21 = @GLIBC21@
++GLUT_LIBS = @GLUT_LIBS@
++GLU_LIBS = @GLU_LIBS@
++GMOFILES = @GMOFILES@
++GMSGFMT = @GMSGFMT@
++GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
++GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
++GOOM_LIBS = @GOOM_LIBS@
++HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
++HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
++HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
++HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
++HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
++HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
++INCLUDES = @INCLUDES@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INSTOBJEXT = @INSTOBJEXT@
++INTLBISON = @INTLBISON@
++INTLDIR = @INTLDIR@
++INTLLIBS = @INTLLIBS@
++INTLOBJS = @INTLOBJS@
++INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
++IRIXAL_CFLAGS = @IRIXAL_CFLAGS@
++IRIXAL_LIBS = @IRIXAL_LIBS@
++IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
++KSTAT_LIBS = @KSTAT_LIBS@
++LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
++LIBCDIO_LIBS = @LIBCDIO_LIBS@
++LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
++LIBFAME_CONFIG = @LIBFAME_CONFIG@
++LIBFAME_LIBS = @LIBFAME_LIBS@
++LIBFFMPEG_CFLAGS = @LIBFFMPEG_CFLAGS@
++LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@
++LIBFLAC_LIBS = @LIBFLAC_LIBS@
++LIBICONV = @LIBICONV@
++LIBISO9660_LIBS = @LIBISO9660_LIBS@
++LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
++LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
++LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
++LIBNAME = @LIBNAME@
++LIBPNG_CONFIG = @LIBPNG_CONFIG@
++LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
++LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
++LIBSTK_LIBS = @LIBSTK_LIBS@
++LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
++LIBVCD_CFLAGS = @LIBVCD_CFLAGS@
++LIBVCD_LIBS = @LIBVCD_LIBS@
++LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
++LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
++LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
++LN_S = @LN_S@
++MAINT = @MAINT@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MKNOD = @MKNOD@
++MLIB_CFLAGS = @MLIB_CFLAGS@
++MLIB_LIBS = @MLIB_LIBS@
++MNG_LIBS = @MNG_LIBS@
++MSGFMT = @MSGFMT@
++NET_LIBS = @NET_LIBS@
++OBJC = @OBJC@
++OBJCFLAGS = @OBJCFLAGS@
++OBJDUMP = @OBJDUMP@
++OGG_CFLAGS = @OGG_CFLAGS@
++OGG_LIBS = @OGG_LIBS@
++OPENGL_CFLAGS = @OPENGL_CFLAGS@
++OPENGL_LIBS = @OPENGL_LIBS@
++PACKAGE = @PACKAGE@
++PASS1_CFLAGS = @PASS1_CFLAGS@
++PASS2_CFLAGS = @PASS2_CFLAGS@
++PKG_CONFIG = @PKG_CONFIG@
++PNG_CFLAGS = @PNG_CFLAGS@
++PNG_LIBS = @PNG_LIBS@
++POFILES = @POFILES@
++POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
++POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
++POSUB = @POSUB@
++RANLIB = @RANLIB@
++RC = @RC@
++RT_LIBS = @RT_LIBS@
++SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CONFIG = @SDL_CONFIG@
++SDL_LIBS = @SDL_LIBS@
++SGMLTOOLS = @SGMLTOOLS@
++SPEC_VERSION = @SPEC_VERSION@
++SPEEX_CFLAGS = @SPEEX_CFLAGS@
++SPEEX_LIBS = @SPEEX_LIBS@
++STATIC = @STATIC@
++STRIP = @STRIP@
++SUNDGA_CFLAGS = @SUNDGA_CFLAGS@
++SUNDGA_LIBS = @SUNDGA_LIBS@
++TAR_NAME = @TAR_NAME@
++THEORAENC_LIBS = @THEORAENC_LIBS@
++THEORAFILE_LIBS = @THEORAFILE_LIBS@
++THEORA_CFLAGS = @THEORA_CFLAGS@
++THEORA_LIBS = @THEORA_LIBS@
++THREAD_CFLAGS = @THREAD_CFLAGS@
++THREAD_CFLAGS_CONFIG = @THREAD_CFLAGS_CONFIG@
++THREAD_INCLUDES = @THREAD_INCLUDES@
++THREAD_LIBS = @THREAD_LIBS@
++THREAD_LIBS_CONFIG = @THREAD_LIBS_CONFIG@
++USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++VORBISENC_LIBS = @VORBISENC_LIBS@
++VORBISFILE_LIBS = @VORBISFILE_LIBS@
++VORBIS_CFLAGS = @VORBIS_CFLAGS@
++VORBIS_LIBS = @VORBIS_LIBS@
++W32DLL_DEP = @W32DLL_DEP@
++W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
++WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
++XINE_ACFLAGS = @XINE_ACFLAGS@
++XINE_BIN_AGE = @XINE_BIN_AGE@
++XINE_BUILD_CC = @XINE_BUILD_CC@
++XINE_BUILD_DATE = @XINE_BUILD_DATE@
++XINE_BUILD_OS = @XINE_BUILD_OS@
++XINE_CONFIG_PREFIX = @XINE_CONFIG_PREFIX@
++XINE_DATADIR = @XINE_DATADIR@
++XINE_FONTDIR = @XINE_FONTDIR@
++XINE_FONTPATH = @XINE_FONTPATH@
++XINE_IFACE_AGE = @XINE_IFACE_AGE@
++XINE_LOCALEDIR = @XINE_LOCALEDIR@
++XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
++XINE_MAJOR = @XINE_MAJOR@
++XINE_MINOR = @XINE_MINOR@
++XINE_PLUGINDIR = @XINE_PLUGINDIR@
++XINE_PLUGINPATH = @XINE_PLUGINPATH@
++XINE_PLUGIN_MIN_SYMS = @XINE_PLUGIN_MIN_SYMS@
++XINE_SCRIPTPATH = @XINE_SCRIPTPATH@
++XINE_SUB = @XINE_SUB@
++XVMC_LIB = @XVMC_LIB@
++XV_LIB = @XV_LIB@
++XXMC_LIB = @XXMC_LIB@
++X_CFLAGS = @X_CFLAGS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_LIBS = @X_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++ZLIB_INCLUDES = @ZLIB_INCLUDES@
++ZLIB_LIBS = @ZLIB_LIBS@
++ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
++am__include = @am__include@
++am__quote = @am__quote@
++install_sh = @install_sh@
++mkdir_p = @mkdir_p@
++w32_path = @w32_path@
++XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
++AM_CFLAGS = -D_LARGEFILE64_SOURCE
++
++lib_LTLIBRARIES = \
++ xineplug_inp_vdr.la
++
++
++xineplug_inp_vdr_la_SOURCES = input_vdr.c
++xineplug_inp_vdr_la_LIBADD = $(XINE_LIB)
++xineplug_inp_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++include_HEADERS = input_vdr.h
++
++postlibdir = $(XINE_PLUGINDIR)/post
++
++postlib_LTLIBRARIES = \
++ xineplug_post_vdr.la
++
++
++xineplug_post_vdr_la_SOURCES = post_vdr.c
++xineplug_post_vdr_la_LIBADD = $(XINE_LIB)
++xineplug_post_vdr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
++noinst_HEADERS = post_vdr.h
++subdir = src/vdr
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES) $(postlib_LTLIBRARIES)
++
++xineplug_inp_vdr_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_inp_vdr_la_OBJECTS = input_vdr.lo
++xineplug_inp_vdr_la_OBJECTS = $(am_xineplug_inp_vdr_la_OBJECTS)
++xineplug_post_vdr_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_post_vdr_la_OBJECTS = post_vdr.lo
++xineplug_post_vdr_la_OBJECTS = $(am_xineplug_post_vdr_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/input_vdr.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/post_vdr.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(xineplug_inp_vdr_la_SOURCES) \
++ $(xineplug_post_vdr_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in
++SOURCES = $(xineplug_inp_vdr_la_SOURCES) $(xineplug_post_vdr_la_SOURCES)
++
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu src/vdr/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
++ else :; fi; \
++ done
++
++uninstall-libLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++ done
++
++clean-libLTLIBRARIES:
++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ test -z "$dir" && dir=.; \
++ echo "rm -f \"$${dir}/so_locations\""; \
++ rm -f "$${dir}/so_locations"; \
++ done
++postlibLTLIBRARIES_INSTALL = $(INSTALL)
++install-postlibLTLIBRARIES: $(postlib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(postlibdir)
++ @list='$(postlib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(postlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(postlibdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(postlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(postlibdir)/$$f; \
++ else :; fi; \
++ done
++
++uninstall-postlibLTLIBRARIES:
++ @$(NORMAL_UNINSTALL)
++ @list='$(postlib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(postlibdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(postlibdir)/$$p; \
++ done
++
++clean-postlibLTLIBRARIES:
++ -test -z "$(postlib_LTLIBRARIES)" || rm -f $(postlib_LTLIBRARIES)
++ @list='$(postlib_LTLIBRARIES)'; for p in $$list; do \
++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ test -z "$dir" && dir=.; \
++ echo "rm -f \"$${dir}/so_locations\""; \
++ rm -f "$${dir}/so_locations"; \
++ done
++xineplug_inp_vdr.la: $(xineplug_inp_vdr_la_OBJECTS) $(xineplug_inp_vdr_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(xineplug_inp_vdr_la_LDFLAGS) $(xineplug_inp_vdr_la_OBJECTS) $(xineplug_inp_vdr_la_LIBADD) $(LIBS)
++xineplug_post_vdr.la: $(xineplug_post_vdr_la_OBJECTS) $(xineplug_post_vdr_la_DEPENDENCIES)
++ $(LINK) -rpath $(postlibdir) $(xineplug_post_vdr_la_LDFLAGS) $(xineplug_post_vdr_la_OBJECTS) $(xineplug_post_vdr_la_LIBADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT) core *.core
++
++distclean-compile:
++ -rm -f *.tab.c
++
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input_vdr.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/post_vdr.Plo@am__quote@
++
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
++.c.o:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++
++.c.obj:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
++
++.c.lo:
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
++
++distdir: $(DISTFILES)
++ @list='$(DISTFILES)'; for file in $$list; do \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
++installdirs:
++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(postlibdir) $(DESTDIR)$(includedir)
++
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++
++clean-generic:
++
++distclean-generic:
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
++clean: clean-am
++
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-postlibLTLIBRARIES mostlyclean-am
++
++distclean: distclean-am
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++info: info-am
++
++info-am:
++
++install-data-am: install-includeHEADERS install-postlibLTLIBRARIES
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-exec-am: install-libLTLIBRARIES
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++uninstall-am: uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES uninstall-postlibLTLIBRARIES
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
++
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool clean-postlibLTLIBRARIES \
++ distclean distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-includeHEADERS \
++ install-info install-info-am install-libLTLIBRARIES install-man \
++ install-postlibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES uninstall-postlibLTLIBRARIES
++
++
++$(XINE_LIB):
++ @cd $(top_srcdir)/src/xine-engine && $(MAKE)
++
++install-data-hook:
++ @if test $$MAKELEVEL -le 4 ; then \
++ if test -x "$(top_srcdir)/post-install.sh" ; then \
++ $(top_srcdir)/post-install.sh ; \
++ fi \
++ fi
++
++pass1:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS1_CFLAGS)"
++
++pass2:
++ @$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)"
++
++debug:
++ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
++
++install-debug: debug
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @list='$(SUBDIRS)'; for subdir in $$list; do \
++ (cd $$subdir && $(MAKE) $@) || exit; \
++ done;
++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++
++install-includeHEADERS: $(include_HEADERS)
++ @$(NORMAL_INSTALL)
++ $(install_sh) -d $(DESTDIR)$(includedir)/xine
++ @list='$(include_HEADERS)'; for p in $$list; do \
++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \
++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-includeHEADERS:
++ @$(NORMAL_UNINSTALL)
++ list='$(include_HEADERS)'; for p in $$list; do \
++ rm -f $(DESTDIR)$(includedir)/xine/$$p; \
++ done
++
++uninstall-hook:
++ @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \
++ list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
++ rm -f $(DESTDIR)$(libdir)/$$p; \
++ done; \
++ fi
++
++mostlyclean-generic:
++ -rm -f *~ \#* .*~ .\#*
++
++maintainer-clean-generic:
++ -@echo "This command is intended for maintainers to use;"
++ -@echo "it deletes files that may require special tools to rebuild."
++ -rm -f Makefile.in
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -urNad xine-lib-vdr-1.0/src/video_out/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,291 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(xineplug_vo_out_aa_la_SOURCES) $(xineplug_vo_out_caca_la_SOURCES) $(xineplug_vo_out_directfb_la_SOURCES) $(xineplug_vo_out_directx_la_SOURCES) $(xineplug_vo_out_fb_la_SOURCES) $(xineplug_vo_out_macosx_la_SOURCES) $(xineplug_vo_out_none_la_SOURCES) $(xineplug_vo_out_opengl_la_SOURCES) $(xineplug_vo_out_pgx32_la_SOURCES) $(xineplug_vo_out_pgx64_la_SOURCES) $(xineplug_vo_out_sdl_la_SOURCES) $(xineplug_vo_out_stk_la_SOURCES) $(xineplug_vo_out_syncfb_la_SOURCES) $(xineplug_vo_out_vidix_la_SOURCES) $(xineplug_vo_out_xshm_la_SOURCES) $(xineplug_vo_out_xv_la_SOURCES) $(xineplug_vo_out_xvmc_la_SOURCES) $(xineplug_vo_out_xxmc_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-xineplug_vo_out_aa_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_aa_la_OBJECTS = video_out_aa.lo
+-xineplug_vo_out_aa_la_OBJECTS = $(am_xineplug_vo_out_aa_la_OBJECTS)
+-@HAVE_AA_TRUE@am_xineplug_vo_out_aa_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_caca_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_caca_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
+- yuv2rgb_mlib.lo video_out_caca.lo
+-xineplug_vo_out_caca_la_OBJECTS = \
+- $(am_xineplug_vo_out_caca_la_OBJECTS)
+-@HAVE_CACA_TRUE@am_xineplug_vo_out_caca_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_directfb_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_directfb_la_OBJECTS = alphablend.lo \
+- video_out_directfb.lo
+-xineplug_vo_out_directfb_la_OBJECTS = \
+- $(am_xineplug_vo_out_directfb_la_OBJECTS)
+-@HAVE_DIRECTFB_TRUE@am_xineplug_vo_out_directfb_la_rpath = -rpath \
+-@HAVE_DIRECTFB_TRUE@ $(libdir)
+-am__DEPENDENCIES_2 = $(top_builddir)/src/xine-engine/libxine.la
+-xineplug_vo_out_directx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_directx_la_OBJECTS = \
+- xineplug_vo_out_directx_la-alphablend.lo \
+- xineplug_vo_out_directx_la-yuv2rgb.lo \
+- xineplug_vo_out_directx_la-yuv2rgb_mmx.lo \
+- xineplug_vo_out_directx_la-video_out_directx.lo
+-xineplug_vo_out_directx_la_OBJECTS = \
+- $(am_xineplug_vo_out_directx_la_OBJECTS)
+-@HAVE_DIRECTX_TRUE@am_xineplug_vo_out_directx_la_rpath = -rpath \
+-@HAVE_DIRECTX_TRUE@ $(libdir)
+-xineplug_vo_out_fb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_fb_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
+- yuv2rgb_mlib.lo alphablend.lo video_out_fb.lo
+-xineplug_vo_out_fb_la_OBJECTS = $(am_xineplug_vo_out_fb_la_OBJECTS)
+-@HAVE_FB_TRUE@am_xineplug_vo_out_fb_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_macosx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_macosx_la_OBJECTS = \
+- xineplug_vo_out_macosx_la-alphablend.lo \
+- xineplug_vo_out_macosx_la-video_out_macosx.lo
+-xineplug_vo_out_macosx_la_OBJECTS = \
+- $(am_xineplug_vo_out_macosx_la_OBJECTS)
+-@HAVE_MACOSX_VIDEO_TRUE@am_xineplug_vo_out_macosx_la_rpath = -rpath \
+-@HAVE_MACOSX_VIDEO_TRUE@ $(libdir)
+-xineplug_vo_out_none_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_none_la_OBJECTS = video_out_none.lo
+-xineplug_vo_out_none_la_OBJECTS = \
+- $(am_xineplug_vo_out_none_la_OBJECTS)
+-xineplug_vo_out_opengl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am__xineplug_vo_out_opengl_la_SOURCES_DIST = yuv2rgb.c yuv2rgb_mmx.c \
+- yuv2rgb_mlib.c alphablend.c video_out_opengl.c x11osd.c
+-@HAVE_X11_TRUE@am__objects_1 = x11osd.lo
+-am_xineplug_vo_out_opengl_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
+- yuv2rgb_mlib.lo alphablend.lo video_out_opengl.lo \
+- $(am__objects_1)
+-xineplug_vo_out_opengl_la_OBJECTS = \
+- $(am_xineplug_vo_out_opengl_la_OBJECTS)
+-@HAVE_OPENGL_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_opengl_la_rpath = \
+-@HAVE_OPENGL_TRUE@@HAVE_X11_TRUE@ -rpath $(libdir)
+-xineplug_vo_out_pgx32_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo
+-xineplug_vo_out_pgx32_la_OBJECTS = \
+- $(am_xineplug_vo_out_pgx32_la_OBJECTS)
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_pgx32_la_rpath = \
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@ -rpath \
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@ $(libdir)
+-xineplug_vo_out_pgx64_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_pgx64_la_OBJECTS = alphablend.lo video_out_pgx64.lo
+-xineplug_vo_out_pgx64_la_OBJECTS = \
+- $(am_xineplug_vo_out_pgx64_la_OBJECTS)
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_pgx64_la_rpath = \
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@ -rpath \
+-@HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@ $(libdir)
+-xineplug_vo_out_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_sdl_la_OBJECTS = alphablend.lo video_out_sdl.lo
+-xineplug_vo_out_sdl_la_OBJECTS = $(am_xineplug_vo_out_sdl_la_OBJECTS)
+-@HAVE_SDL_TRUE@am_xineplug_vo_out_sdl_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_stk_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_vo_out_stk_la_OBJECTS = alphablend.lo video_out_stk.lo
+-xineplug_vo_out_stk_la_OBJECTS = $(am_xineplug_vo_out_stk_la_OBJECTS)
+-@HAVE_STK_TRUE@am_xineplug_vo_out_stk_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_syncfb_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_syncfb_la_OBJECTS = alphablend.lo \
+- video_out_syncfb.lo
+-xineplug_vo_out_syncfb_la_OBJECTS = \
+- $(am_xineplug_vo_out_syncfb_la_OBJECTS)
+-@HAVE_SYNCFB_TRUE@@HAVE_X11_TRUE@am_xineplug_vo_out_syncfb_la_rpath = \
+-@HAVE_SYNCFB_TRUE@@HAVE_X11_TRUE@ -rpath $(libdir)
+-xineplug_vo_out_vidix_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/video_out/vidix/libvidix.la \
+- $(top_builddir)/src/video_out/libdha/libdha.la
+-am__xineplug_vo_out_vidix_la_SOURCES_DIST = alphablend.c \
+- video_out_vidix.c x11osd.c
+-am_xineplug_vo_out_vidix_la_OBJECTS = alphablend.lo video_out_vidix.lo \
+- $(am__objects_1)
+-xineplug_vo_out_vidix_la_OBJECTS = \
+- $(am_xineplug_vo_out_vidix_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_xineplug_vo_out_vidix_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_xshm_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+-am__xineplug_vo_out_xshm_la_SOURCES_DIST = yuv2rgb.c yuv2rgb_mmx.c \
+- yuv2rgb_mlib.c alphablend.c video_out_xshm.c x11osd.c
+-am_xineplug_vo_out_xshm_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
+- yuv2rgb_mlib.lo alphablend.lo video_out_xshm.lo \
+- $(am__objects_1)
+-xineplug_vo_out_xshm_la_OBJECTS = \
+- $(am_xineplug_vo_out_xshm_la_OBJECTS)
+-@HAVE_X11_TRUE@am_xineplug_vo_out_xshm_la_rpath = -rpath $(libdir)
+-xineplug_vo_out_xv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+-am__xineplug_vo_out_xv_la_SOURCES_DIST = x11osd.c deinterlace.c \
+- alphablend.c video_out_xv.c
+-am_xineplug_vo_out_xv_la_OBJECTS = $(am__objects_1) deinterlace.lo \
+- alphablend.lo video_out_xv.lo
+-xineplug_vo_out_xv_la_OBJECTS = $(am_xineplug_vo_out_xv_la_OBJECTS)
+-@HAVE_X11_TRUE@@HAVE_XV_TRUE@am_xineplug_vo_out_xv_la_rpath = -rpath \
+-@HAVE_X11_TRUE@@HAVE_XV_TRUE@ $(libdir)
+-xineplug_vo_out_xvmc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am_xineplug_vo_out_xvmc_la_OBJECTS = deinterlace.lo alphablend.lo \
+- video_out_xvmc.lo
+-xineplug_vo_out_xvmc_la_OBJECTS = \
+- $(am_xineplug_vo_out_xvmc_la_OBJECTS)
+-@HAVE_X11_TRUE@@HAVE_XVMC_TRUE@am_xineplug_vo_out_xvmc_la_rpath = \
+-@HAVE_X11_TRUE@@HAVE_XVMC_TRUE@ -rpath $(libdir)
+-xineplug_vo_out_xxmc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_2)
+-am__xineplug_vo_out_xxmc_la_SOURCES_DIST = x11osd.c deinterlace.c \
+- alphablend.c video_out_xxmc.c xvmc_mocomp.c xvmc_vld.c xxmc.h
+-am_xineplug_vo_out_xxmc_la_OBJECTS = $(am__objects_1) deinterlace.lo \
+- alphablend.lo video_out_xxmc.lo xvmc_mocomp.lo xvmc_vld.lo
+-xineplug_vo_out_xxmc_la_OBJECTS = \
+- $(am_xineplug_vo_out_xxmc_la_OBJECTS)
+-@HAVE_X11_TRUE@@HAVE_XXMC_TRUE@am_xineplug_vo_out_xxmc_la_rpath = \
+-@HAVE_X11_TRUE@@HAVE_XXMC_TRUE@ -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-OBJCLD = $(OBJC)
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
+- $(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(xineplug_vo_out_aa_la_SOURCES) \
+- $(xineplug_vo_out_caca_la_SOURCES) \
+- $(xineplug_vo_out_directfb_la_SOURCES) \
+- $(xineplug_vo_out_directx_la_SOURCES) \
+- $(xineplug_vo_out_fb_la_SOURCES) \
+- $(xineplug_vo_out_macosx_la_SOURCES) \
+- $(xineplug_vo_out_none_la_SOURCES) \
+- $(xineplug_vo_out_opengl_la_SOURCES) \
+- $(xineplug_vo_out_pgx32_la_SOURCES) \
+- $(xineplug_vo_out_pgx64_la_SOURCES) \
+- $(xineplug_vo_out_sdl_la_SOURCES) \
+- $(xineplug_vo_out_stk_la_SOURCES) \
+- $(xineplug_vo_out_syncfb_la_SOURCES) \
+- $(xineplug_vo_out_vidix_la_SOURCES) \
+- $(xineplug_vo_out_xshm_la_SOURCES) \
+- $(xineplug_vo_out_xv_la_SOURCES) \
+- $(xineplug_vo_out_xvmc_la_SOURCES) \
+- $(xineplug_vo_out_xxmc_la_SOURCES)
+-DIST_SOURCES = $(xineplug_vo_out_aa_la_SOURCES) \
+- $(xineplug_vo_out_caca_la_SOURCES) \
+- $(xineplug_vo_out_directfb_la_SOURCES) \
+- $(xineplug_vo_out_directx_la_SOURCES) \
+- $(xineplug_vo_out_fb_la_SOURCES) \
+- $(xineplug_vo_out_macosx_la_SOURCES) \
+- $(xineplug_vo_out_none_la_SOURCES) \
+- $(am__xineplug_vo_out_opengl_la_SOURCES_DIST) \
+- $(xineplug_vo_out_pgx32_la_SOURCES) \
+- $(xineplug_vo_out_pgx64_la_SOURCES) \
+- $(xineplug_vo_out_sdl_la_SOURCES) \
+- $(xineplug_vo_out_stk_la_SOURCES) \
+- $(xineplug_vo_out_syncfb_la_SOURCES) \
+- $(am__xineplug_vo_out_vidix_la_SOURCES_DIST) \
+- $(am__xineplug_vo_out_xshm_la_SOURCES_DIST) \
+- $(am__xineplug_vo_out_xv_la_SOURCES_DIST) \
+- $(xineplug_vo_out_xvmc_la_SOURCES) \
+- $(am__xineplug_vo_out_xxmc_la_SOURCES_DIST)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -305,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -325,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -351,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -380,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -509,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -524,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -538,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -552,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -576,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -613,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -628,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -645,70 +272,27 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = libdha vidix macosx
++
+ EXTRA_DIST = video_out_directfb.c video_out_opengl.c video_out_directx.c video_out_macosx.m
++
+ VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
+ -I$(top_srcdir)/src/video_out/vidix
+
++
+ AM_CFLAGS = $(X_CFLAGS) -DXINE_COMPILE \
+ $(SUNDGA_CFLAGS) $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
+ $(AALIB_CFLAGS) $(MLIB_CFLAGS) $(LIBSTK_CFLAGS) \
+ $(DIRECTFB_CFLAGS) $(CACA_CFLAGS)
+
++
+ @HAVE_X11_TRUE@X11OSD = x11osd.c
+ @HAVE_X11_TRUE@xshm_module = xineplug_vo_out_xshm.la
+ @HAVE_X11_TRUE@@HAVE_XV_TRUE@xv_module = xineplug_vo_out_xv.la
+@@ -719,15 +303,25 @@
+ @HAVE_SYNCFB_TRUE@@HAVE_X11_TRUE@syncfb_module = xineplug_vo_out_syncfb.la
+ @HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx64_module = xineplug_vo_out_pgx64.la
+ @HAVE_SUNDGA_TRUE@@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx32_module = xineplug_vo_out_pgx32.la
++
+ @HAVE_VIDIX_TRUE@vidix_module = xineplug_vo_out_vidix.la
++
+ @HAVE_AA_TRUE@aa_module = xineplug_vo_out_aa.la
++
+ @HAVE_CACA_TRUE@caca_module = xineplug_vo_out_caca.la
++
+ @HAVE_FB_TRUE@fb_module = xineplug_vo_out_fb.la
++
+ @HAVE_DIRECTFB_TRUE@directfb_module = xineplug_vo_out_directfb.la
++
+ @HAVE_SDL_TRUE@sdl_module = xineplug_vo_out_sdl.la
++
+ @HAVE_STK_TRUE@stk_module = xineplug_vo_out_stk.la
++
+ @HAVE_DIRECTX_TRUE@directx_module = xineplug_vo_out_directx.la
++
+ @HAVE_MACOSX_VIDEO_TRUE@macosx_module = xineplug_vo_out_macosx.la
++
+ lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
+ $(opengl_module) \
+ $(syncfb_module) \
+@@ -743,22 +337,27 @@
+ $(xxmc_module) \
+ xineplug_vo_out_none.la
+
++
+ xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ alphablend.c video_out_xshm.c $(X11OSD)
+
+ xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) -lXext $(XINE_LIB)
+ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c alphablend.c video_out_xv.c
+ xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
+ xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c alphablend.c video_out_xvmc.c
+ xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
+ xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c alphablend.c video_out_xxmc.c\
+ xvmc_mocomp.c xvmc_vld.c xxmc.h
+
+ xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(XINE_LIB)
+ xineplug_vo_out_xxmc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ alphablend.c video_out_opengl.c $(X11OSD)
+
+@@ -766,50 +365,63 @@
+ $(GLU_LIBS) $(X_LIBS) -lXext $(XINE_LIB)
+
+ xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c
+ xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB)
+ xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_pgx64_la_SOURCES = alphablend.c video_out_pgx64.c
+ xineplug_vo_out_pgx64_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
+ xineplug_vo_out_pgx64_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c
+ xineplug_vo_out_pgx32_la_LIBADD = $(X_LIBS) $(SUNDGA_LIBS)
+ xineplug_vo_out_pgx32_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c $(X11OSD)
+ xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) \
+ $(top_builddir)/src/video_out/vidix/libvidix.la \
+ $(top_builddir)/src/video_out/libdha/libdha.la
+
+ xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_aa_la_SOURCES = video_out_aa.c
+ xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS)
+ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_caca_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ video_out_caca.c
+
+ xineplug_vo_out_caca_la_LIBADD = $(CACA_LIBS)
+ xineplug_vo_out_caca_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
+ alphablend.c video_out_fb.c
+
+ xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB)
+ xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
+ xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
+ xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
+ xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(XINE_LIB)
+ xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_stk_la_SOURCES = alphablend.c video_out_stk.c
+ xineplug_vo_out_stk_la_LIBADD = $(LIBSTK_LIBS)
+ xineplug_vo_out_stk_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_directx_la_SOURCES = alphablend.c yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c
+ xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
+ xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB)
+ xineplug_vo_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_none_la_SOURCES = video_out_none.c
+ xineplug_vo_out_none_la_LIBADD = $(XINE_LIB)
+ xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
++
+ xineplug_vo_out_macosx_la_SOURCES = alphablend.c video_out_macosx.m
+ xineplug_vo_out_macosx_la_CPPFLAGS = $(X_CFLAGS) $(MLIB_CFLAGS)
+ xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \
+@@ -820,108 +432,257 @@
+ xineplug_vo_out_macosx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ \
+ -Wl,-framework -Wl,Cocoa -framework Cocoa -framework OpenGL
+
++
+ noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h \
+ yuv2rgb.h x11osd.h
+
++subdir = src/video_out
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++xineplug_vo_out_aa_la_DEPENDENCIES =
++am_xineplug_vo_out_aa_la_OBJECTS = video_out_aa.lo
++xineplug_vo_out_aa_la_OBJECTS = $(am_xineplug_vo_out_aa_la_OBJECTS)
++xineplug_vo_out_caca_la_DEPENDENCIES =
++am_xineplug_vo_out_caca_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
++ yuv2rgb_mlib.lo video_out_caca.lo
++xineplug_vo_out_caca_la_OBJECTS = $(am_xineplug_vo_out_caca_la_OBJECTS)
++xineplug_vo_out_directfb_la_DEPENDENCIES =
++am_xineplug_vo_out_directfb_la_OBJECTS = alphablend.lo \
++ video_out_directfb.lo
++xineplug_vo_out_directfb_la_OBJECTS = \
++ $(am_xineplug_vo_out_directfb_la_OBJECTS)
++xineplug_vo_out_directx_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_directx_la_OBJECTS = alphablend.lo yuv2rgb.lo \
++ yuv2rgb_mmx.lo video_out_directx.lo
++xineplug_vo_out_directx_la_OBJECTS = \
++ $(am_xineplug_vo_out_directx_la_OBJECTS)
++xineplug_vo_out_fb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_fb_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
++ yuv2rgb_mlib.lo alphablend.lo video_out_fb.lo
++xineplug_vo_out_fb_la_OBJECTS = $(am_xineplug_vo_out_fb_la_OBJECTS)
++xineplug_vo_out_macosx_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_macosx_la_OBJECTS = alphablend.lo video_out_macosx.lo
++xineplug_vo_out_macosx_la_OBJECTS = \
++ $(am_xineplug_vo_out_macosx_la_OBJECTS)
++xineplug_vo_out_none_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_none_la_OBJECTS = video_out_none.lo
++xineplug_vo_out_none_la_OBJECTS = $(am_xineplug_vo_out_none_la_OBJECTS)
++xineplug_vo_out_opengl_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++@HAVE_X11_TRUE@am__objects_1 = x11osd.lo
++am_xineplug_vo_out_opengl_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
++ yuv2rgb_mlib.lo alphablend.lo video_out_opengl.lo \
++ $(am__objects_1)
++xineplug_vo_out_opengl_la_OBJECTS = \
++ $(am_xineplug_vo_out_opengl_la_OBJECTS)
++xineplug_vo_out_pgx32_la_DEPENDENCIES =
++am_xineplug_vo_out_pgx32_la_OBJECTS = video_out_pgx32.lo
++xineplug_vo_out_pgx32_la_OBJECTS = \
++ $(am_xineplug_vo_out_pgx32_la_OBJECTS)
++xineplug_vo_out_pgx64_la_DEPENDENCIES =
++am_xineplug_vo_out_pgx64_la_OBJECTS = alphablend.lo video_out_pgx64.lo
++xineplug_vo_out_pgx64_la_OBJECTS = \
++ $(am_xineplug_vo_out_pgx64_la_OBJECTS)
++xineplug_vo_out_sdl_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_sdl_la_OBJECTS = alphablend.lo video_out_sdl.lo
++xineplug_vo_out_sdl_la_OBJECTS = $(am_xineplug_vo_out_sdl_la_OBJECTS)
++xineplug_vo_out_stk_la_DEPENDENCIES =
++am_xineplug_vo_out_stk_la_OBJECTS = alphablend.lo video_out_stk.lo
++xineplug_vo_out_stk_la_OBJECTS = $(am_xineplug_vo_out_stk_la_OBJECTS)
++xineplug_vo_out_syncfb_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_syncfb_la_OBJECTS = alphablend.lo video_out_syncfb.lo
++xineplug_vo_out_syncfb_la_OBJECTS = \
++ $(am_xineplug_vo_out_syncfb_la_OBJECTS)
++xineplug_vo_out_vidix_la_DEPENDENCIES = \
++ $(top_builddir)/src/video_out/vidix/libvidix.la \
++ $(top_builddir)/src/video_out/libdha/libdha.la
++am_xineplug_vo_out_vidix_la_OBJECTS = alphablend.lo video_out_vidix.lo \
++ $(am__objects_1)
++xineplug_vo_out_vidix_la_OBJECTS = \
++ $(am_xineplug_vo_out_vidix_la_OBJECTS)
++xineplug_vo_out_xshm_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_xshm_la_OBJECTS = yuv2rgb.lo yuv2rgb_mmx.lo \
++ yuv2rgb_mlib.lo alphablend.lo video_out_xshm.lo \
++ $(am__objects_1)
++xineplug_vo_out_xshm_la_OBJECTS = $(am_xineplug_vo_out_xshm_la_OBJECTS)
++xineplug_vo_out_xv_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_xv_la_OBJECTS = $(am__objects_1) deinterlace.lo \
++ alphablend.lo video_out_xv.lo
++xineplug_vo_out_xv_la_OBJECTS = $(am_xineplug_vo_out_xv_la_OBJECTS)
++xineplug_vo_out_xvmc_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_xvmc_la_OBJECTS = deinterlace.lo alphablend.lo \
++ video_out_xvmc.lo
++xineplug_vo_out_xvmc_la_OBJECTS = $(am_xineplug_vo_out_xvmc_la_OBJECTS)
++xineplug_vo_out_xxmc_la_DEPENDENCIES = \
++ $(top_builddir)/src/xine-engine/libxine.la
++am_xineplug_vo_out_xxmc_la_OBJECTS = $(am__objects_1) deinterlace.lo \
++ alphablend.lo video_out_xxmc.lo xvmc_mocomp.lo xvmc_vld.lo
++xineplug_vo_out_xxmc_la_OBJECTS = $(am_xineplug_vo_out_xxmc_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alphablend.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/deinterlace.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_aa.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_caca.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_directfb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_directx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_fb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_macosx.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_none.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_opengl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_pgx32.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_pgx64.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_sdl.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_stk.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_syncfb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_vidix.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_xshm.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_xv.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_xvmc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out_xxmc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/x11osd.Plo ./$(DEPDIR)/xvmc_mocomp.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xvmc_vld.Plo ./$(DEPDIR)/yuv2rgb.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mlib.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/yuv2rgb_mmx.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_OBJCFLAGS) $(OBJCFLAGS)
++OBJCLD = $(OBJC)
++OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(xineplug_vo_out_aa_la_SOURCES) \
++ $(xineplug_vo_out_caca_la_SOURCES) \
++ $(xineplug_vo_out_directfb_la_SOURCES) \
++ $(xineplug_vo_out_directx_la_SOURCES) \
++ $(xineplug_vo_out_fb_la_SOURCES) \
++ $(xineplug_vo_out_macosx_la_SOURCES) \
++ $(xineplug_vo_out_none_la_SOURCES) \
++ $(xineplug_vo_out_opengl_la_SOURCES) \
++ $(xineplug_vo_out_pgx32_la_SOURCES) \
++ $(xineplug_vo_out_pgx64_la_SOURCES) \
++ $(xineplug_vo_out_sdl_la_SOURCES) \
++ $(xineplug_vo_out_stk_la_SOURCES) \
++ $(xineplug_vo_out_syncfb_la_SOURCES) \
++ $(xineplug_vo_out_vidix_la_SOURCES) \
++ $(xineplug_vo_out_xshm_la_SOURCES) \
++ $(xineplug_vo_out_xv_la_SOURCES) \
++ $(xineplug_vo_out_xvmc_la_SOURCES) \
++ $(xineplug_vo_out_xxmc_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(xineplug_vo_out_aa_la_SOURCES) $(xineplug_vo_out_caca_la_SOURCES) $(xineplug_vo_out_directfb_la_SOURCES) $(xineplug_vo_out_directx_la_SOURCES) $(xineplug_vo_out_fb_la_SOURCES) $(xineplug_vo_out_macosx_la_SOURCES) $(xineplug_vo_out_none_la_SOURCES) $(xineplug_vo_out_opengl_la_SOURCES) $(xineplug_vo_out_pgx32_la_SOURCES) $(xineplug_vo_out_pgx64_la_SOURCES) $(xineplug_vo_out_sdl_la_SOURCES) $(xineplug_vo_out_stk_la_SOURCES) $(xineplug_vo_out_syncfb_la_SOURCES) $(xineplug_vo_out_vidix_la_SOURCES) $(xineplug_vo_out_xshm_la_SOURCES) $(xineplug_vo_out_xv_la_SOURCES) $(xineplug_vo_out_xvmc_la_SOURCES) $(xineplug_vo_out_xxmc_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .m .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ xineplug_vo_out_aa.la: $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_aa_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_aa_la_rpath) $(xineplug_vo_out_aa_la_LDFLAGS) $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_aa_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_aa_la_LDFLAGS) $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_aa_la_LIBADD) $(LIBS)
+ xineplug_vo_out_caca.la: $(xineplug_vo_out_caca_la_OBJECTS) $(xineplug_vo_out_caca_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_caca_la_rpath) $(xineplug_vo_out_caca_la_LDFLAGS) $(xineplug_vo_out_caca_la_OBJECTS) $(xineplug_vo_out_caca_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_caca_la_LDFLAGS) $(xineplug_vo_out_caca_la_OBJECTS) $(xineplug_vo_out_caca_la_LIBADD) $(LIBS)
+ xineplug_vo_out_directfb.la: $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_directfb_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_directfb_la_rpath) $(xineplug_vo_out_directfb_la_LDFLAGS) $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_directfb_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_directfb_la_LDFLAGS) $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_directfb_la_LIBADD) $(LIBS)
+ xineplug_vo_out_directx.la: $(xineplug_vo_out_directx_la_OBJECTS) $(xineplug_vo_out_directx_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_directx_la_rpath) $(xineplug_vo_out_directx_la_LDFLAGS) $(xineplug_vo_out_directx_la_OBJECTS) $(xineplug_vo_out_directx_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_directx_la_LDFLAGS) $(xineplug_vo_out_directx_la_OBJECTS) $(xineplug_vo_out_directx_la_LIBADD) $(LIBS)
+ xineplug_vo_out_fb.la: $(xineplug_vo_out_fb_la_OBJECTS) $(xineplug_vo_out_fb_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_fb_la_rpath) $(xineplug_vo_out_fb_la_LDFLAGS) $(xineplug_vo_out_fb_la_OBJECTS) $(xineplug_vo_out_fb_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_fb_la_LDFLAGS) $(xineplug_vo_out_fb_la_OBJECTS) $(xineplug_vo_out_fb_la_LIBADD) $(LIBS)
+ xineplug_vo_out_macosx.la: $(xineplug_vo_out_macosx_la_OBJECTS) $(xineplug_vo_out_macosx_la_DEPENDENCIES)
+- $(OBJCLINK) $(am_xineplug_vo_out_macosx_la_rpath) $(xineplug_vo_out_macosx_la_LDFLAGS) $(xineplug_vo_out_macosx_la_OBJECTS) $(xineplug_vo_out_macosx_la_LIBADD) $(LIBS)
++ $(OBJCLINK) -rpath $(libdir) $(xineplug_vo_out_macosx_la_LDFLAGS) $(xineplug_vo_out_macosx_la_OBJECTS) $(xineplug_vo_out_macosx_la_LIBADD) $(LIBS)
+ xineplug_vo_out_none.la: $(xineplug_vo_out_none_la_OBJECTS) $(xineplug_vo_out_none_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(xineplug_vo_out_none_la_LDFLAGS) $(xineplug_vo_out_none_la_OBJECTS) $(xineplug_vo_out_none_la_LIBADD) $(LIBS)
+ xineplug_vo_out_opengl.la: $(xineplug_vo_out_opengl_la_OBJECTS) $(xineplug_vo_out_opengl_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_opengl_la_rpath) $(xineplug_vo_out_opengl_la_LDFLAGS) $(xineplug_vo_out_opengl_la_OBJECTS) $(xineplug_vo_out_opengl_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_opengl_la_LDFLAGS) $(xineplug_vo_out_opengl_la_OBJECTS) $(xineplug_vo_out_opengl_la_LIBADD) $(LIBS)
+ xineplug_vo_out_pgx32.la: $(xineplug_vo_out_pgx32_la_OBJECTS) $(xineplug_vo_out_pgx32_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_pgx32_la_rpath) $(xineplug_vo_out_pgx32_la_LDFLAGS) $(xineplug_vo_out_pgx32_la_OBJECTS) $(xineplug_vo_out_pgx32_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_pgx32_la_LDFLAGS) $(xineplug_vo_out_pgx32_la_OBJECTS) $(xineplug_vo_out_pgx32_la_LIBADD) $(LIBS)
+ xineplug_vo_out_pgx64.la: $(xineplug_vo_out_pgx64_la_OBJECTS) $(xineplug_vo_out_pgx64_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_pgx64_la_rpath) $(xineplug_vo_out_pgx64_la_LDFLAGS) $(xineplug_vo_out_pgx64_la_OBJECTS) $(xineplug_vo_out_pgx64_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_pgx64_la_LDFLAGS) $(xineplug_vo_out_pgx64_la_OBJECTS) $(xineplug_vo_out_pgx64_la_LIBADD) $(LIBS)
+ xineplug_vo_out_sdl.la: $(xineplug_vo_out_sdl_la_OBJECTS) $(xineplug_vo_out_sdl_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_sdl_la_rpath) $(xineplug_vo_out_sdl_la_LDFLAGS) $(xineplug_vo_out_sdl_la_OBJECTS) $(xineplug_vo_out_sdl_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_sdl_la_LDFLAGS) $(xineplug_vo_out_sdl_la_OBJECTS) $(xineplug_vo_out_sdl_la_LIBADD) $(LIBS)
+ xineplug_vo_out_stk.la: $(xineplug_vo_out_stk_la_OBJECTS) $(xineplug_vo_out_stk_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_stk_la_rpath) $(xineplug_vo_out_stk_la_LDFLAGS) $(xineplug_vo_out_stk_la_OBJECTS) $(xineplug_vo_out_stk_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_stk_la_LDFLAGS) $(xineplug_vo_out_stk_la_OBJECTS) $(xineplug_vo_out_stk_la_LIBADD) $(LIBS)
+ xineplug_vo_out_syncfb.la: $(xineplug_vo_out_syncfb_la_OBJECTS) $(xineplug_vo_out_syncfb_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_syncfb_la_rpath) $(xineplug_vo_out_syncfb_la_LDFLAGS) $(xineplug_vo_out_syncfb_la_OBJECTS) $(xineplug_vo_out_syncfb_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_syncfb_la_LDFLAGS) $(xineplug_vo_out_syncfb_la_OBJECTS) $(xineplug_vo_out_syncfb_la_LIBADD) $(LIBS)
+ xineplug_vo_out_vidix.la: $(xineplug_vo_out_vidix_la_OBJECTS) $(xineplug_vo_out_vidix_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_vidix_la_rpath) $(xineplug_vo_out_vidix_la_LDFLAGS) $(xineplug_vo_out_vidix_la_OBJECTS) $(xineplug_vo_out_vidix_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_vidix_la_LDFLAGS) $(xineplug_vo_out_vidix_la_OBJECTS) $(xineplug_vo_out_vidix_la_LIBADD) $(LIBS)
+ xineplug_vo_out_xshm.la: $(xineplug_vo_out_xshm_la_OBJECTS) $(xineplug_vo_out_xshm_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_xshm_la_rpath) $(xineplug_vo_out_xshm_la_LDFLAGS) $(xineplug_vo_out_xshm_la_OBJECTS) $(xineplug_vo_out_xshm_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_xshm_la_LDFLAGS) $(xineplug_vo_out_xshm_la_OBJECTS) $(xineplug_vo_out_xshm_la_LIBADD) $(LIBS)
+ xineplug_vo_out_xv.la: $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_xv_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_xv_la_rpath) $(xineplug_vo_out_xv_la_LDFLAGS) $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_xv_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_xv_la_LDFLAGS) $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_xv_la_LIBADD) $(LIBS)
+ xineplug_vo_out_xvmc.la: $(xineplug_vo_out_xvmc_la_OBJECTS) $(xineplug_vo_out_xvmc_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_xvmc_la_rpath) $(xineplug_vo_out_xvmc_la_LDFLAGS) $(xineplug_vo_out_xvmc_la_OBJECTS) $(xineplug_vo_out_xvmc_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_xvmc_la_LDFLAGS) $(xineplug_vo_out_xvmc_la_OBJECTS) $(xineplug_vo_out_xvmc_la_LIBADD) $(LIBS)
+ xineplug_vo_out_xxmc.la: $(xineplug_vo_out_xxmc_la_OBJECTS) $(xineplug_vo_out_xxmc_la_DEPENDENCIES)
+- $(LINK) $(am_xineplug_vo_out_xxmc_la_rpath) $(xineplug_vo_out_xxmc_la_LDFLAGS) $(xineplug_vo_out_xxmc_la_OBJECTS) $(xineplug_vo_out_xxmc_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(xineplug_vo_out_xxmc_la_LDFLAGS) $(xineplug_vo_out_xxmc_la_OBJECTS) $(xineplug_vo_out_xxmc_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -931,7 +692,9 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_aa.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_caca.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_directfb.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_directx.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_fb.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_macosx.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_none.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_opengl.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_pgx32.Plo@am__quote@
+@@ -945,101 +708,52 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_xvmc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_out_xxmc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11osd.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_directx_la-alphablend.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_directx_la-video_out_directx.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb_mmx.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_macosx_la-alphablend.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_vo_out_macosx_la-video_out_macosx.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvmc_mocomp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xvmc_vld.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mlib.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv2rgb_mmx.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+-
+-xineplug_vo_out_directx_la-alphablend.lo: alphablend.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_vo_out_directx_la-alphablend.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_directx_la-alphablend.Tpo" -c -o xineplug_vo_out_directx_la-alphablend.lo `test -f 'alphablend.c' || echo '$(srcdir)/'`alphablend.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_directx_la-alphablend.Tpo" "$(DEPDIR)/xineplug_vo_out_directx_la-alphablend.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_directx_la-alphablend.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alphablend.c' object='xineplug_vo_out_directx_la-alphablend.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_vo_out_directx_la-alphablend.lo `test -f 'alphablend.c' || echo '$(srcdir)/'`alphablend.c
+-
+-xineplug_vo_out_directx_la-yuv2rgb.lo: yuv2rgb.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_vo_out_directx_la-yuv2rgb.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb.Tpo" -c -o xineplug_vo_out_directx_la-yuv2rgb.lo `test -f 'yuv2rgb.c' || echo '$(srcdir)/'`yuv2rgb.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb.Tpo" "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='yuv2rgb.c' object='xineplug_vo_out_directx_la-yuv2rgb.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_vo_out_directx_la-yuv2rgb.lo `test -f 'yuv2rgb.c' || echo '$(srcdir)/'`yuv2rgb.c
+-
+-xineplug_vo_out_directx_la-yuv2rgb_mmx.lo: yuv2rgb_mmx.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_vo_out_directx_la-yuv2rgb_mmx.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb_mmx.Tpo" -c -o xineplug_vo_out_directx_la-yuv2rgb_mmx.lo `test -f 'yuv2rgb_mmx.c' || echo '$(srcdir)/'`yuv2rgb_mmx.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb_mmx.Tpo" "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb_mmx.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_directx_la-yuv2rgb_mmx.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='yuv2rgb_mmx.c' object='xineplug_vo_out_directx_la-yuv2rgb_mmx.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_vo_out_directx_la-yuv2rgb_mmx.lo `test -f 'yuv2rgb_mmx.c' || echo '$(srcdir)/'`yuv2rgb_mmx.c
+-
+-xineplug_vo_out_directx_la-video_out_directx.lo: video_out_directx.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_vo_out_directx_la-video_out_directx.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_directx_la-video_out_directx.Tpo" -c -o xineplug_vo_out_directx_la-video_out_directx.lo `test -f 'video_out_directx.c' || echo '$(srcdir)/'`video_out_directx.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_directx_la-video_out_directx.Tpo" "$(DEPDIR)/xineplug_vo_out_directx_la-video_out_directx.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_directx_la-video_out_directx.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='video_out_directx.c' object='xineplug_vo_out_directx_la-video_out_directx.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_directx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_vo_out_directx_la-video_out_directx.lo `test -f 'video_out_directx.c' || echo '$(srcdir)/'`video_out_directx.c
+-
+-xineplug_vo_out_macosx_la-alphablend.lo: alphablend.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_macosx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xineplug_vo_out_macosx_la-alphablend.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_macosx_la-alphablend.Tpo" -c -o xineplug_vo_out_macosx_la-alphablend.lo `test -f 'alphablend.c' || echo '$(srcdir)/'`alphablend.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_macosx_la-alphablend.Tpo" "$(DEPDIR)/xineplug_vo_out_macosx_la-alphablend.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_macosx_la-alphablend.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alphablend.c' object='xineplug_vo_out_macosx_la-alphablend.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_macosx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xineplug_vo_out_macosx_la-alphablend.lo `test -f 'alphablend.c' || echo '$(srcdir)/'`alphablend.c
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ .m.o:
+-@am__fastdepOBJC_TRUE@ if $(OBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(OBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .m.obj:
+-@am__fastdepOBJC_TRUE@ if $(OBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(OBJCCOMPILE) -c -o $@ `cygpath -w $<`
+
+ .m.lo:
+-@am__fastdepOBJC_TRUE@ if $(LTOBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $<
+-
+-xineplug_vo_out_macosx_la-video_out_macosx.lo: video_out_macosx.m
+-@am__fastdepOBJC_TRUE@ if $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_macosx_la_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT xineplug_vo_out_macosx_la-video_out_macosx.lo -MD -MP -MF "$(DEPDIR)/xineplug_vo_out_macosx_la-video_out_macosx.Tpo" -c -o xineplug_vo_out_macosx_la-video_out_macosx.lo `test -f 'video_out_macosx.m' || echo '$(srcdir)/'`video_out_macosx.m; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/xineplug_vo_out_macosx_la-video_out_macosx.Tpo" "$(DEPDIR)/xineplug_vo_out_macosx_la-video_out_macosx.Plo"; else rm -f "$(DEPDIR)/xineplug_vo_out_macosx_la-video_out_macosx.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='video_out_macosx.m' object='xineplug_vo_out_macosx_la-video_out_macosx.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xineplug_vo_out_macosx_la_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o xineplug_vo_out_macosx_la-video_out_macosx.lo `test -f 'video_out_macosx.m' || echo '$(srcdir)/'`video_out_macosx.m
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTOBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++OBJCDEPMODE = @OBJCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -1105,10 +819,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -1118,23 +833,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -1143,24 +849,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -1169,22 +859,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -1199,17 +886,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1219,9 +904,8 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -1233,31 +917,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -1275,8 +956,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -1284,35 +964,29 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-libLTLIBRARIES install-man \
++ install-recursive install-strip installcheck installcheck-am \
++ installdirs installdirs-am installdirs-recursive \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-libLTLIBRARIES \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,106 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libdha_la_SOURCES) $(nodist_libdha_la_SOURCES) $(test_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-EXTRA_PROGRAMS = test$(EXEEXT)
+-subdir = src/video_out/libdha
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libdha_la_LIBADD =
+-am_libdha_la_OBJECTS = libdha.lo mtrr.lo pci.lo mmi.lo ports.lo irq.lo \
+- cpu_flush.lo
+-nodist_libdha_la_OBJECTS = pci_names.lo
+-libdha_la_OBJECTS = $(am_libdha_la_OBJECTS) \
+- $(nodist_libdha_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_libdha_la_rpath =
+-am_test_OBJECTS = test.$(OBJEXT)
+-test_OBJECTS = $(am_test_OBJECTS)
+-test_DEPENDENCIES = $(top_builddir)/src/video_out/libdha/libdha.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdha_la_SOURCES) $(nodist_libdha_la_SOURCES) \
+- $(test_SOURCES)
+-DIST_SOURCES = $(libdha_la_SOURCES) $(test_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -120,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -140,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -166,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -195,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -324,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -339,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -353,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -367,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -391,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -428,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -443,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -460,122 +271,111 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = README pci_db2c.awk
++
+ SUBDIRS = bin kernelhelper oth sysdep
++
+ AM_CFLAGS = @STATIC@
++
+ @HAVE_VIDIX_TRUE@dha_lib = libdha.la
++
+ awk_generated = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h
+ CLEANFILES = $(awk_generated)
++
+ noinst_LTLIBRARIES = $(dha_lib)
++
+ libdha_la_SOURCES = libdha.c mtrr.c pci.c mmi.c ports.c irq.c cpu_flush.c
+ nodist_libdha_la_SOURCES = pci_names.c
++
++EXTRA_PROGRAMS = test
++
+ test_SOURCES = test.c
+ test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
++
+ noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
++subdir = src/video_out/libdha
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libdha_la_LDFLAGS =
++libdha_la_LIBADD =
++am_libdha_la_OBJECTS = libdha.lo mtrr.lo pci.lo mmi.lo ports.lo irq.lo \
++ cpu_flush.lo
++nodist_libdha_la_OBJECTS = pci_names.lo
++libdha_la_OBJECTS = $(am_libdha_la_OBJECTS) $(nodist_libdha_la_OBJECTS)
++EXTRA_PROGRAMS = test$(EXEEXT)
++am_test_OBJECTS = test.$(OBJEXT)
++test_OBJECTS = $(am_test_OBJECTS)
++test_DEPENDENCIES = $(top_builddir)/src/video_out/libdha/libdha.la
++test_LDFLAGS =
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_flush.Plo ./$(DEPDIR)/irq.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/libdha.Plo ./$(DEPDIR)/mmi.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mtrr.Plo ./$(DEPDIR)/pci.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pci_names.Plo ./$(DEPDIR)/ports.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/test.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libdha_la_SOURCES) $(test_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libdha_la_SOURCES) $(nodist_libdha_la_SOURCES) $(test_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/libdha/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/libdha/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libdha.la: $(libdha_la_OBJECTS) $(libdha_la_DEPENDENCIES)
+- $(LINK) $(am_libdha_la_rpath) $(libdha_la_LDFLAGS) $(libdha_la_OBJECTS) $(libdha_la_LIBADD) $(LIBS)
++ $(LINK) $(libdha_la_LDFLAGS) $(libdha_la_OBJECTS) $(libdha_la_LIBADD) $(LIBS)
+ test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
+ @rm -f test$(EXEEXT)
+ $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -590,26 +390,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ports.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -675,10 +476,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -688,23 +490,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -713,24 +506,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -739,22 +516,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -769,17 +543,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -789,6 +561,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -800,7 +573,7 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+@@ -808,24 +581,21 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -843,8 +613,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -852,34 +621,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/bin/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/libdha/bin
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,93 +271,28 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = README mapdev.copyright mapdev.vxd
++subdir = src/video_out/libdha/bin
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = README Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/libdha/bin/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/libdha/bin/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -522,24 +306,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -557,7 +335,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -569,28 +349,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -608,34 +386,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/kernelhelper/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,89 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-SOURCES = $(test_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-EXTRA_PROGRAMS = test$(EXEEXT)
+-subdir = src/video_out/libdha/kernelhelper
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am_test_OBJECTS = test.$(OBJEXT)
+-test_OBJECTS = $(am_test_OBJECTS)
+-test_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(test_SOURCES)
+-DIST_SOURCES = $(test_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -103,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -123,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -149,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -178,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -307,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -322,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -336,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -350,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -374,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -411,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -426,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -443,133 +271,103 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = README dhahelper.c
++
+ KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo @LINUX_INCLUDE@ | sed -e 's/\-I//g'`/linux/modversions.h
++
+ KVERSION = $(shell $(SHELL) -c 'uname -r')
+ moddir = /lib/modules/$(KVERSION)/misc
++
+ KCOMPILE = $(CC) $(CFLAGS) $(KCFLAGS) $(INCLUDES) $(LINUX_INCLUDE)
++
+ @BUILD_DHA_KMOD_TRUE@@HAVE_LINUX_TRUE@KERNEL_MODULE = dhahelper.o
++
+ noinst_HEADERS = dhahelper.h
++
++EXTRA_PROGRAMS = test
+ test_SOURCES = test.c
++subdir = src/video_out/libdha/kernelhelper
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++EXTRA_PROGRAMS = test$(EXEEXT)
++am_test_OBJECTS = test.$(OBJEXT)
++test_OBJECTS = $(am_test_OBJECTS)
++test_LDADD = $(LDADD)
++test_DEPENDENCIES =
++test_LDFLAGS =
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(test_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(test_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/libdha/kernelhelper/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/libdha/kernelhelper/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
+ @rm -f test$(EXEEXT)
+ $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -581,6 +379,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -589,7 +392,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -601,24 +403,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -627,22 +413,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -660,7 +443,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -672,30 +457,27 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -713,8 +495,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -722,30 +503,20 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-local
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-compile \
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-exec-local install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-exec-local \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am \
+- uninstall-local
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-local
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/oth/Makefile.in 2005-02-13 01:08:02.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/libdha/oth
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,93 +271,28 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = pci.db
++subdir = src/video_out/libdha/oth
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/libdha/oth/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/libdha/oth/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -522,24 +306,18 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -557,7 +335,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -569,28 +349,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -608,34 +386,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/libdha/sysdep/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,72 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/libdha/sysdep
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -86,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -106,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -132,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -161,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -290,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -305,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -319,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -333,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -357,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -394,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -409,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -426,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = \
+ libdha_os2.c \
+ libdha_win32.c \
+@@ -505,6 +303,7 @@
+ pci_win32.c \
+ pci_x86.c
+
++
+ noinst_HEADERS = \
+ AsmMacros_alpha.h \
+ AsmMacros_arm32.h \
+@@ -514,38 +313,22 @@
+ AsmMacros_sparc.h \
+ AsmMacros_x86.h
+
++subdir = src/video_out/libdha/sysdep
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/libdha/sysdep/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/libdha/sysdep/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -557,6 +340,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -565,7 +353,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -577,24 +364,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -603,22 +374,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -636,7 +404,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -648,20 +418,20 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -669,8 +439,6 @@
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -688,35 +456,26 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool ctags distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool distclean distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/macosx/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,106 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libxineMacOSXVideo_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/macosx
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libxineMacOSXVideo_la_LIBADD =
+-am__libxineMacOSXVideo_la_SOURCES_DIST = XineOpenGLView.m \
+- XineVideoWindow.m
+-@HAVE_MACOSX_VIDEO_TRUE@am_libxineMacOSXVideo_la_OBJECTS = \
+-@HAVE_MACOSX_VIDEO_TRUE@ XineOpenGLView.lo XineVideoWindow.lo
+-libxineMacOSXVideo_la_OBJECTS = $(am_libxineMacOSXVideo_la_OBJECTS)
+-@HAVE_MACOSX_VIDEO_TRUE@am_libxineMacOSXVideo_la_rpath = -rpath \
+-@HAVE_MACOSX_VIDEO_TRUE@ $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-OBJCLD = $(OBJC)
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
+- $(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libxineMacOSXVideo_la_SOURCES)
+-DIST_SOURCES = $(am__libxineMacOSXVideo_la_SOURCES_DIST)
+-am__include_HEADERS_DIST = video_window.h XineOpenGLView.h \
+- XineVideoWindow.h
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -120,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -140,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -166,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -195,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -324,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -339,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -353,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -367,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -391,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -428,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -443,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -460,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = \
+ video_window.h \
+ XineOpenGLView.m \
+@@ -521,82 +285,96 @@
+ XineVideoWindow.m \
+ XineVideoWindow.h
+
++
+ @HAVE_MACOSX_VIDEO_TRUE@lib_LTLIBRARIES = libxineMacOSXVideo.la
++
+ @HAVE_MACOSX_VIDEO_TRUE@libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m
+ # The "-Wl,-framework -Wl,..." is needed for libtool versions before
+ # 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220)
+ @HAVE_MACOSX_VIDEO_TRUE@libxineMacOSXVideo_la_LDFLAGS = -version-info \
+-@HAVE_MACOSX_VIDEO_TRUE@ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++@HAVE_MACOSX_VIDEO_TRUE@ $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
+ @HAVE_MACOSX_VIDEO_TRUE@ -Wl,-framework -Wl,Cocoa -framework Cocoa \
+ @HAVE_MACOSX_VIDEO_TRUE@ -Wl,-framework -Wl,OpenGL -framework OpenGL
+
+ @HAVE_MACOSX_VIDEO_TRUE@libxine_MacOSXVideo_la_OBJCFLAGS = $(OBJCFLAGS)
++
+ @HAVE_MACOSX_VIDEO_TRUE@include_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h
++subdir = src/video_out/macosx
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libxineMacOSXVideo_la_LIBADD =
++@HAVE_MACOSX_VIDEO_TRUE@am_libxineMacOSXVideo_la_OBJECTS = \
++@HAVE_MACOSX_VIDEO_TRUE@ XineOpenGLView.lo XineVideoWindow.lo
++libxineMacOSXVideo_la_OBJECTS = $(am_libxineMacOSXVideo_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/XineOpenGLView.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/XineVideoWindow.Plo
++OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_OBJCFLAGS) $(OBJCFLAGS)
++OBJCLD = $(OBJC)
++OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libxineMacOSXVideo_la_SOURCES)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
++SOURCES = $(libxineMacOSXVideo_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .lo .m .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/macosx/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/macosx/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libxineMacOSXVideo.la: $(libxineMacOSXVideo_la_OBJECTS) $(libxineMacOSXVideo_la_DEPENDENCIES)
+- $(OBJCLINK) $(am_libxineMacOSXVideo_la_rpath) $(libxineMacOSXVideo_la_LDFLAGS) $(libxineMacOSXVideo_la_OBJECTS) $(libxineMacOSXVideo_la_LIBADD) $(LIBS)
++ $(OBJCLINK) -rpath $(libdir) $(libxineMacOSXVideo_la_LDFLAGS) $(libxineMacOSXVideo_la_OBJECTS) $(libxineMacOSXVideo_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -604,26 +382,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XineOpenGLView.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XineVideoWindow.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .m.o:
+-@am__fastdepOBJC_TRUE@ if $(OBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(OBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .m.obj:
+-@am__fastdepOBJC_TRUE@ if $(OBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(OBJCCOMPILE) -c -o $@ `cygpath -w $<`
+
+ .m.lo:
+-@am__fastdepOBJC_TRUE@ if $(LTOBJCCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepOBJC_FALSE@ $(LTOBJCCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTOBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++OBJCDEPMODE = @OBJCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -634,6 +413,12 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -643,7 +428,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -655,24 +439,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -681,22 +449,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -714,10 +479,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -729,31 +494,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -771,8 +533,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -780,33 +541,23 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook \
+- uninstall-includeHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-includeHEADERS install-info \
++ install-info-am install-libLTLIBRARIES install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ tags uninstall uninstall-am uninstall-includeHEADERS \
++ uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,99 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libvidix_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/vidix
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libvidix_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_libvidix_la_OBJECTS = vidixlib.lo
+-libvidix_la_OBJECTS = $(am_libvidix_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_libvidix_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libvidix_la_SOURCES)
+-DIST_SOURCES = $(libvidix_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -113,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -133,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -159,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -188,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -317,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -332,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -346,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -360,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -384,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -421,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -436,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -453,144 +271,120 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = README vidix.txt
++
+ SUBDIRS = drivers
++
+ AM_CFLAGS = @STATIC@
++
+ @HAVE_VIDIX_TRUE@vidix_lib = libvidix.la
++
+ noinst_LTLIBRARIES = $(vidix_lib)
++
+ libvidix_la_SOURCES = vidixlib.c
+ libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS)
++
+ noinst_HEADERS = fourcc.h vidix.h vidixlib.h
++
+ AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+ -I$(top_builddir)/src/video_out/libdha
+
++subdir = src/video_out/vidix
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libvidix_la_LDFLAGS =
++libvidix_la_DEPENDENCIES =
++am_libvidix_la_OBJECTS = vidixlib.lo
++libvidix_la_OBJECTS = $(am_libvidix_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vidixlib.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libvidix_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libvidix_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/vidix/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/vidix/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libvidix.la: $(libvidix_la_OBJECTS) $(libvidix_la_DEPENDENCIES)
+- $(LINK) $(am_libvidix_la_rpath) $(libvidix_la_LDFLAGS) $(libvidix_la_OBJECTS) $(libvidix_la_LIBADD) $(LIBS)
++ $(LINK) $(libvidix_la_LDFLAGS) $(libvidix_la_OBJECTS) $(libvidix_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vidixlib.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -656,10 +450,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -669,23 +464,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -694,24 +480,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -720,22 +490,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -750,17 +517,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -770,6 +535,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -781,31 +547,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -823,8 +586,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -832,34 +594,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in
+--- xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/video_out/vidix/drivers/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,139 +13,67 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(cyberblade_vid_la_SOURCES) $(mach64_vid_la_SOURCES) $(mga_crtc2_vid_la_SOURCES) $(mga_vid_la_SOURCES) $(pm2_vid_la_SOURCES) $(pm3_vid_la_SOURCES) $(radeon_vid_la_SOURCES) $(rage128_vid_la_SOURCES) $(sis_vid_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = src/video_out/vidix/drivers
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-cyberblade_vid_la_LIBADD =
+-am_cyberblade_vid_la_OBJECTS = cyberblade_vid.lo
+-cyberblade_vid_la_OBJECTS = $(am_cyberblade_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_cyberblade_vid_la_rpath = -rpath $(libdir)
+-mach64_vid_la_LIBADD =
+-am_mach64_vid_la_OBJECTS = mach64_vid.lo
+-mach64_vid_la_OBJECTS = $(am_mach64_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_mach64_vid_la_rpath = -rpath $(libdir)
+-mga_crtc2_vid_la_DEPENDENCIES =
+-am_mga_crtc2_vid_la_OBJECTS = mga_crtc2_vid.lo
+-mga_crtc2_vid_la_OBJECTS = $(am_mga_crtc2_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_mga_crtc2_vid_la_rpath = -rpath $(libdir)
+-mga_vid_la_DEPENDENCIES =
+-am_mga_vid_la_OBJECTS = mga_vid.lo
+-mga_vid_la_OBJECTS = $(am_mga_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_mga_vid_la_rpath = -rpath $(libdir)
+-pm2_vid_la_LIBADD =
+-am_pm2_vid_la_OBJECTS = pm2_vid.lo
+-pm2_vid_la_OBJECTS = $(am_pm2_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_pm2_vid_la_rpath = -rpath $(libdir)
+-pm3_vid_la_LIBADD =
+-am_pm3_vid_la_OBJECTS = pm3_vid.lo
+-pm3_vid_la_OBJECTS = $(am_pm3_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_pm3_vid_la_rpath = -rpath $(libdir)
+-radeon_vid_la_DEPENDENCIES =
+-am_radeon_vid_la_OBJECTS = radeon_vid.lo
+-radeon_vid_la_OBJECTS = $(am_radeon_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_radeon_vid_la_rpath = -rpath $(libdir)
+-rage128_vid_la_LIBADD =
+-am_rage128_vid_la_OBJECTS = rage128_vid.lo
+-rage128_vid_la_OBJECTS = $(am_rage128_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_rage128_vid_la_rpath = -rpath $(libdir)
+-sis_vid_la_LIBADD =
+-am_sis_vid_la_OBJECTS = sis_vid.lo sis_bridge.lo
+-sis_vid_la_OBJECTS = $(am_sis_vid_la_OBJECTS)
+-@HAVE_VIDIX_TRUE@am_sis_vid_la_rpath = -rpath $(libdir)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(cyberblade_vid_la_SOURCES) $(mach64_vid_la_SOURCES) \
+- $(mga_crtc2_vid_la_SOURCES) $(mga_vid_la_SOURCES) \
+- $(pm2_vid_la_SOURCES) $(pm3_vid_la_SOURCES) \
+- $(radeon_vid_la_SOURCES) $(rage128_vid_la_SOURCES) \
+- $(sis_vid_la_SOURCES)
+-DIST_SOURCES = $(cyberblade_vid_la_SOURCES) $(mach64_vid_la_SOURCES) \
+- $(mga_crtc2_vid_la_SOURCES) $(mga_vid_la_SOURCES) \
+- $(pm2_vid_la_SOURCES) $(pm3_vid_la_SOURCES) \
+- $(radeon_vid_la_SOURCES) $(rage128_vid_la_SOURCES) \
+- $(sis_vid_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++
++libdir = $(XINE_PLUGINDIR)/vidix
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -153,16 +81,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -173,18 +92,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -199,26 +110,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -228,124 +134,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -357,7 +152,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -372,9 +166,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -386,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -400,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -424,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -461,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -476,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -493,61 +272,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = $(XINE_PLUGINDIR)/vidix
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+-EXTRA_DIST = genfb_vid.c nvidia_vid.c
++
++EXTRA_DIST = genfb_vid.c
++
+ @HAVE_VIDIX_TRUE@vidix_drivers = \
+ @HAVE_VIDIX_TRUE@ mach64_vid.la \
+ @HAVE_VIDIX_TRUE@ mga_crtc2_vid.la \
+@@ -557,153 +290,272 @@
+ @HAVE_VIDIX_TRUE@ radeon_vid.la \
+ @HAVE_VIDIX_TRUE@ rage128_vid.la \
+ @HAVE_VIDIX_TRUE@ cyberblade_vid.la \
++@HAVE_VIDIX_TRUE@ unichrome_vid.la \
++@HAVE_VIDIX_TRUE@ nvidia_vid.la \
+ @HAVE_VIDIX_TRUE@ sis_vid.la
+
++
+ lib_LTLIBRARIES = $(vidix_drivers)
++
+ radeon_vid_la_SOURCES = radeon_vid.c
+ radeon_vid_la_LIBADD = -lm
+ radeon_vid_la_LDFLAGS = -avoid-version -module
+-rage128_vid_la_SOURCES = rage128_vid.c
++
++rage128_vid_la_SOURCES = radeon_vid.c
+ rage128_vid_la_LDFLAGS = -avoid-version -module
++rage128_vid_la_CFLAGS = -DRAGE128 $(AM_CFLAGS)
++
+ pm2_vid_la_SOURCES = pm2_vid.c
+ pm2_vid_la_LDFLAGS = -avoid-version -module
++
+ pm3_vid_la_SOURCES = pm3_vid.c
+ pm3_vid_la_LDFLAGS = -avoid-version -module
++
+ mach64_vid_la_SOURCES = mach64_vid.c
+ mach64_vid_la_LDFLAGS = -avoid-version -module
++
+ mga_vid_la_SOURCES = mga_vid.c
+ mga_vid_la_LIBADD = -lm
+ mga_vid_la_LDFLAGS = -avoid-version -module
+-mga_crtc2_vid_la_SOURCES = mga_crtc2_vid.c
++
++mga_crtc2_vid_la_SOURCES = mga_vid.c
+ mga_crtc2_vid_la_LIBADD = -lm
+ mga_crtc2_vid_la_LDFLAGS = -avoid-version -module
++mga_crtc2_vid_la_CFLAGS = -DCRTC2 $(AM_CFLAGS)
++
+ cyberblade_vid_la_SOURCES = cyberblade_vid.c
+ cyberblade_vid_la_LDFLAGS = -avoid-version -module
++
++unichrome_vid_la_SOURCES = unichrome_vid.c
++unichrome_vid_la_LDFLAGS = -avoid-version -module
++
++nvidia_vid_la_SOURCES = nvidia_vid.c
++nvidia_vid_la_LDFLAGS = -avoid-version -module
++
+ sis_vid_la_SOURCES = sis_vid.c sis_bridge.c
+ sis_vid_la_LDFLAGS = -avoid-version -module
++
+ noinst_HEADERS = mach64.h nvidia.h glint_regs.h pm3_regs.h radeon.h \
+- cyberblade_regs.h sis_defs.h sis_regs.h
++ cyberblade_regs.h unichrome_regs.h nvidia.h sis_defs.h sis_regs.h
++
+
+ AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+ -I$(top_srcdir)/src/video_out/libdha \
+ -I$(top_builddir)/src/video_out/libdha
+
++subdir = src/video_out/vidix/drivers
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++cyberblade_vid_la_LIBADD =
++am_cyberblade_vid_la_OBJECTS = cyberblade_vid.lo
++cyberblade_vid_la_OBJECTS = $(am_cyberblade_vid_la_OBJECTS)
++mach64_vid_la_LIBADD =
++am_mach64_vid_la_OBJECTS = mach64_vid.lo
++mach64_vid_la_OBJECTS = $(am_mach64_vid_la_OBJECTS)
++mga_crtc2_vid_la_DEPENDENCIES =
++am_mga_crtc2_vid_la_OBJECTS = mga_crtc2_vid_la-mga_vid.lo
++mga_crtc2_vid_la_OBJECTS = $(am_mga_crtc2_vid_la_OBJECTS)
++mga_vid_la_DEPENDENCIES =
++am_mga_vid_la_OBJECTS = mga_vid.lo
++mga_vid_la_OBJECTS = $(am_mga_vid_la_OBJECTS)
++nvidia_vid_la_LIBADD =
++am_nvidia_vid_la_OBJECTS = nvidia_vid.lo
++nvidia_vid_la_OBJECTS = $(am_nvidia_vid_la_OBJECTS)
++pm2_vid_la_LIBADD =
++am_pm2_vid_la_OBJECTS = pm2_vid.lo
++pm2_vid_la_OBJECTS = $(am_pm2_vid_la_OBJECTS)
++pm3_vid_la_LIBADD =
++am_pm3_vid_la_OBJECTS = pm3_vid.lo
++pm3_vid_la_OBJECTS = $(am_pm3_vid_la_OBJECTS)
++radeon_vid_la_DEPENDENCIES =
++am_radeon_vid_la_OBJECTS = radeon_vid.lo
++radeon_vid_la_OBJECTS = $(am_radeon_vid_la_OBJECTS)
++rage128_vid_la_LIBADD =
++am_rage128_vid_la_OBJECTS = rage128_vid_la-radeon_vid.lo
++rage128_vid_la_OBJECTS = $(am_rage128_vid_la_OBJECTS)
++sis_vid_la_LIBADD =
++am_sis_vid_la_OBJECTS = sis_vid.lo sis_bridge.lo
++sis_vid_la_OBJECTS = $(am_sis_vid_la_OBJECTS)
++unichrome_vid_la_LIBADD =
++am_unichrome_vid_la_OBJECTS = unichrome_vid.lo
++unichrome_vid_la_OBJECTS = $(am_unichrome_vid_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cyberblade_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mach64_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mga_crtc2_vid_la-mga_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mga_vid.Plo ./$(DEPDIR)/nvidia_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/pm2_vid.Plo ./$(DEPDIR)/pm3_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/radeon_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/rage128_vid_la-radeon_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sis_bridge.Plo ./$(DEPDIR)/sis_vid.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/unichrome_vid.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(cyberblade_vid_la_SOURCES) $(mach64_vid_la_SOURCES) \
++ $(mga_crtc2_vid_la_SOURCES) $(mga_vid_la_SOURCES) \
++ $(nvidia_vid_la_SOURCES) $(pm2_vid_la_SOURCES) \
++ $(pm3_vid_la_SOURCES) $(radeon_vid_la_SOURCES) \
++ $(rage128_vid_la_SOURCES) $(sis_vid_la_SOURCES) \
++ $(unichrome_vid_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++SOURCES = $(cyberblade_vid_la_SOURCES) $(mach64_vid_la_SOURCES) $(mga_crtc2_vid_la_SOURCES) $(mga_vid_la_SOURCES) $(nvidia_vid_la_SOURCES) $(pm2_vid_la_SOURCES) $(pm3_vid_la_SOURCES) $(radeon_vid_la_SOURCES) $(rage128_vid_la_SOURCES) $(sis_vid_la_SOURCES) $(unichrome_vid_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/video_out/vidix/drivers/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/video_out/vidix/drivers/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ cyberblade_vid.la: $(cyberblade_vid_la_OBJECTS) $(cyberblade_vid_la_DEPENDENCIES)
+- $(LINK) $(am_cyberblade_vid_la_rpath) $(cyberblade_vid_la_LDFLAGS) $(cyberblade_vid_la_OBJECTS) $(cyberblade_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(cyberblade_vid_la_LDFLAGS) $(cyberblade_vid_la_OBJECTS) $(cyberblade_vid_la_LIBADD) $(LIBS)
+ mach64_vid.la: $(mach64_vid_la_OBJECTS) $(mach64_vid_la_DEPENDENCIES)
+- $(LINK) $(am_mach64_vid_la_rpath) $(mach64_vid_la_LDFLAGS) $(mach64_vid_la_OBJECTS) $(mach64_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(mach64_vid_la_LDFLAGS) $(mach64_vid_la_OBJECTS) $(mach64_vid_la_LIBADD) $(LIBS)
++mga_crtc2_vid_la-mga_vid.lo: mga_vid.c
+ mga_crtc2_vid.la: $(mga_crtc2_vid_la_OBJECTS) $(mga_crtc2_vid_la_DEPENDENCIES)
+- $(LINK) $(am_mga_crtc2_vid_la_rpath) $(mga_crtc2_vid_la_LDFLAGS) $(mga_crtc2_vid_la_OBJECTS) $(mga_crtc2_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(mga_crtc2_vid_la_LDFLAGS) $(mga_crtc2_vid_la_OBJECTS) $(mga_crtc2_vid_la_LIBADD) $(LIBS)
+ mga_vid.la: $(mga_vid_la_OBJECTS) $(mga_vid_la_DEPENDENCIES)
+- $(LINK) $(am_mga_vid_la_rpath) $(mga_vid_la_LDFLAGS) $(mga_vid_la_OBJECTS) $(mga_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(mga_vid_la_LDFLAGS) $(mga_vid_la_OBJECTS) $(mga_vid_la_LIBADD) $(LIBS)
++nvidia_vid.la: $(nvidia_vid_la_OBJECTS) $(nvidia_vid_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(nvidia_vid_la_LDFLAGS) $(nvidia_vid_la_OBJECTS) $(nvidia_vid_la_LIBADD) $(LIBS)
+ pm2_vid.la: $(pm2_vid_la_OBJECTS) $(pm2_vid_la_DEPENDENCIES)
+- $(LINK) $(am_pm2_vid_la_rpath) $(pm2_vid_la_LDFLAGS) $(pm2_vid_la_OBJECTS) $(pm2_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(pm2_vid_la_LDFLAGS) $(pm2_vid_la_OBJECTS) $(pm2_vid_la_LIBADD) $(LIBS)
+ pm3_vid.la: $(pm3_vid_la_OBJECTS) $(pm3_vid_la_DEPENDENCIES)
+- $(LINK) $(am_pm3_vid_la_rpath) $(pm3_vid_la_LDFLAGS) $(pm3_vid_la_OBJECTS) $(pm3_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(pm3_vid_la_LDFLAGS) $(pm3_vid_la_OBJECTS) $(pm3_vid_la_LIBADD) $(LIBS)
+ radeon_vid.la: $(radeon_vid_la_OBJECTS) $(radeon_vid_la_DEPENDENCIES)
+- $(LINK) $(am_radeon_vid_la_rpath) $(radeon_vid_la_LDFLAGS) $(radeon_vid_la_OBJECTS) $(radeon_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(radeon_vid_la_LDFLAGS) $(radeon_vid_la_OBJECTS) $(radeon_vid_la_LIBADD) $(LIBS)
++rage128_vid_la-radeon_vid.lo: radeon_vid.c
+ rage128_vid.la: $(rage128_vid_la_OBJECTS) $(rage128_vid_la_DEPENDENCIES)
+- $(LINK) $(am_rage128_vid_la_rpath) $(rage128_vid_la_LDFLAGS) $(rage128_vid_la_OBJECTS) $(rage128_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(rage128_vid_la_LDFLAGS) $(rage128_vid_la_OBJECTS) $(rage128_vid_la_LIBADD) $(LIBS)
+ sis_vid.la: $(sis_vid_la_OBJECTS) $(sis_vid_la_DEPENDENCIES)
+- $(LINK) $(am_sis_vid_la_rpath) $(sis_vid_la_LDFLAGS) $(sis_vid_la_OBJECTS) $(sis_vid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(sis_vid_la_LDFLAGS) $(sis_vid_la_OBJECTS) $(sis_vid_la_LIBADD) $(LIBS)
++unichrome_vid.la: $(unichrome_vid_la_OBJECTS) $(unichrome_vid_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(unichrome_vid_la_LDFLAGS) $(unichrome_vid_la_OBJECTS) $(unichrome_vid_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cyberblade_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach64_vid.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_crtc2_vid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_crtc2_vid_la-mga_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_vid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm2_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm3_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeon_vid.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rage128_vid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rage128_vid_la-radeon_vid.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sis_bridge.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sis_vid.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unichrome_vid.Plo@am__quote@
++
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
++mga_crtc2_vid_la-mga_vid.o: mga_vid.c
++@AMDEP_TRUE@ source='mga_vid.c' object='mga_crtc2_vid_la-mga_vid.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.Po' tmpdepfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mga_crtc2_vid_la_CFLAGS) $(CFLAGS) -c -o mga_crtc2_vid_la-mga_vid.o `test -f 'mga_vid.c' || echo '$(srcdir)/'`mga_vid.c
++
++mga_crtc2_vid_la-mga_vid.obj: mga_vid.c
++@AMDEP_TRUE@ source='mga_vid.c' object='mga_crtc2_vid_la-mga_vid.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.Po' tmpdepfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mga_crtc2_vid_la_CFLAGS) $(CFLAGS) -c -o mga_crtc2_vid_la-mga_vid.obj `cygpath -w mga_vid.c`
++
++mga_crtc2_vid_la-mga_vid.lo: mga_vid.c
++@AMDEP_TRUE@ source='mga_vid.c' object='mga_crtc2_vid_la-mga_vid.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.Plo' tmpdepfile='$(DEPDIR)/mga_crtc2_vid_la-mga_vid.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mga_crtc2_vid_la_CFLAGS) $(CFLAGS) -c -o mga_crtc2_vid_la-mga_vid.lo `test -f 'mga_vid.c' || echo '$(srcdir)/'`mga_vid.c
++
++rage128_vid_la-radeon_vid.o: radeon_vid.c
++@AMDEP_TRUE@ source='radeon_vid.c' object='rage128_vid_la-radeon_vid.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/rage128_vid_la-radeon_vid.Po' tmpdepfile='$(DEPDIR)/rage128_vid_la-radeon_vid.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rage128_vid_la_CFLAGS) $(CFLAGS) -c -o rage128_vid_la-radeon_vid.o `test -f 'radeon_vid.c' || echo '$(srcdir)/'`radeon_vid.c
++
++rage128_vid_la-radeon_vid.obj: radeon_vid.c
++@AMDEP_TRUE@ source='radeon_vid.c' object='rage128_vid_la-radeon_vid.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/rage128_vid_la-radeon_vid.Po' tmpdepfile='$(DEPDIR)/rage128_vid_la-radeon_vid.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rage128_vid_la_CFLAGS) $(CFLAGS) -c -o rage128_vid_la-radeon_vid.obj `cygpath -w radeon_vid.c`
++
++rage128_vid_la-radeon_vid.lo: radeon_vid.c
++@AMDEP_TRUE@ source='radeon_vid.c' object='rage128_vid_la-radeon_vid.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/rage128_vid_la-radeon_vid.Plo' tmpdepfile='$(DEPDIR)/rage128_vid_la-radeon_vid.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rage128_vid_la_CFLAGS) $(CFLAGS) -c -o rage128_vid_la-radeon_vid.lo `test -f 'radeon_vid.c' || echo '$(srcdir)/'`radeon_vid.c
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -715,6 +567,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -723,7 +580,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -735,24 +591,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -761,22 +601,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -794,10 +631,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -809,31 +646,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -851,8 +685,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -860,30 +693,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-info-am uninstall-libLTLIBRARIES
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
+
+ $(XINE_LIB):
+@@ -943,36 +767,6 @@
+ -@echo "This command is intended for maintainers to use;"
+ -@echo "it deletes files that may require special tools to rebuild."
+ -rm -f Makefile.in
+-
+-rage128_vid.c:
+- @echo "$(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/radeon_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c"; \
+- $(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/radeon_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c
+-
+-rage128_vid.lo: $(rage128_vid_la_SOURCES)
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -DRAGE128 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+-
+-mach64_vid.lo:
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+-
+-mga_crtc2_vid.c:
+- @echo "$(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/mga_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c"; \
+- $(LN_S) -f $(top_srcdir)/src/video_out/vidix/drivers/mga_vid.c \
+- $(top_builddir)/src/video_out/vidix/drivers/$*.c
+-
+-mga_crtc2_vid.lo: $(mga_crtc2_vid_la_SOURCES)
+- source='$*.c' object='$@' libtool=yes \
+- depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+- $(CCDEPMODE) $(depcomp) \
+- $(LTCOMPILE) -DCRTC2 -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urNad xine-lib-vdr-1.0/src/xine-engine/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-engine/Makefile.in
+--- xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-engine/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,111 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libxine_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(srcdir)/xineintl.h.in $(top_srcdir)/lib/Makefile.common \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/xine-engine
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = xineintl.h
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/src/xine-utils/libxineutils.la
+-am__DEPENDENCIES_3 = $(top_builddir)/win32/contrib/libdirent.la
+-@WIN32_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
+-am__DEPENDENCIES_5 = $(top_builddir)/lib/libxineposix.la
+-am_libxine_la_OBJECTS = xine.lo metronom.lo configfile.lo buffer.lo \
+- load_plugins.lo video_decoder.lo buffer_types.lo \
+- audio_decoder.lo video_out.lo audio_out.lo resample.lo \
+- events.lo video_overlay.lo osd.lo scratch.lo demux.lo \
+- vo_scale.lo xine_interface.lo post.lo tvmode.lo broadcaster.lo \
+- io_helper.lo input_rip.lo input_cache.lo info_helper.lo \
+- refcounter.lo
+-libxine_la_OBJECTS = $(am_libxine_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libxine_la_SOURCES)
+-DIST_SOURCES = $(libxine_la_SOURCES)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -125,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -145,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -171,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -200,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -329,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -344,12 +165,11 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
++
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
+@@ -358,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -372,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -396,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -433,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -448,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -465,63 +272,17 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+ LIBXINEPOSIX = $(top_builddir)/lib/libxineposix.la
++
+ AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)
+ lib_LTLIBRARIES = libxine.la
++
+ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
+ INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
+ DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
+@@ -531,6 +292,7 @@
+ @WIN32_TRUE@dirent_lib = $(DIRENT_LIB)
+ @WIN32_TRUE@pthread_dep = $(INTERNAL_PTHREAD_LIB)
+ @WIN32_TRUE@def_ldflags = "-Wl,--output-def,$(DEF_FILE)"
++
+ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
+ load_plugins.c video_decoder.c buffer_types.c \
+ audio_decoder.c video_out.c audio_out.c resample.c events.c \
+@@ -541,6 +303,7 @@
+
+ # FIXME: these are currently unused:
+ EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
++
+ @INCLUDED_INTL_TRUE@INCLUDED_INTLLIBS = @INTLLIBS@
+ libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) $(zlib_dep) \
+ $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX)
+@@ -549,8 +312,11 @@
+ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \
+ $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS)
+
++
+ libxine_la_LDFLAGS = \
+- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags)
++ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
++ $(def_ldflags)
++
+
+ include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \
+ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
+@@ -558,66 +324,99 @@
+ plugin_catalog.h audio_decoder.h video_decoder.h post.h \
+ io_helper.h broadcaster.h info_helper.h refcounter.h
+
++
+ noinst_HEADERS = bswap.h
++subdir = src/xine-engine
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES = xineintl.h
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++am_libxine_la_OBJECTS = xine.lo metronom.lo configfile.lo buffer.lo \
++ load_plugins.lo video_decoder.lo buffer_types.lo \
++ audio_decoder.lo video_out.lo audio_out.lo resample.lo \
++ events.lo video_overlay.lo osd.lo scratch.lo demux.lo \
++ vo_scale.lo xine_interface.lo post.lo tvmode.lo broadcaster.lo \
++ io_helper.lo input_rip.lo input_cache.lo info_helper.lo \
++ refcounter.lo
++libxine_la_OBJECTS = $(am_libxine_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/audio_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/broadcaster.Plo ./$(DEPDIR)/buffer.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/buffer_types.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/configfile.Plo ./$(DEPDIR)/demux.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/info_helper.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_cache.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/input_rip.Plo ./$(DEPDIR)/io_helper.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/load_plugins.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/metronom.Plo ./$(DEPDIR)/osd.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/post.Plo ./$(DEPDIR)/refcounter.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/resample.Plo ./$(DEPDIR)/scratch.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/tvmode.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_decoder.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_out.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/video_overlay.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/vo_scale.Plo ./$(DEPDIR)/xine.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_interface.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libxine_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in xineintl.h.in
++SOURCES = $(libxine_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/lib/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xine-engine/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/lib/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/xine-engine/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-xineintl.h: $(top_builddir)/config.status $(srcdir)/xineintl.h.in
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++xineintl.h: $(top_builddir)/config.status xineintl.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -625,7 +424,7 @@
+ $(LINK) -rpath $(libdir) $(libxine_la_LDFLAGS) $(libxine_la_OBJECTS) $(libxine_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -657,26 +456,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_interface.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -687,6 +487,12 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -696,7 +502,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -708,24 +513,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -734,22 +523,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../lib $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -767,10 +553,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -782,33 +568,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-@WIN32_FALSE@uninstall-local:
+-@WIN32_FALSE@install-exec-local:
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -826,8 +607,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -835,33 +615,23 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-local
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-exec-local install-includeHEADERS install-info \
+- install-info-am install-libLTLIBRARIES install-man \
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
++ distclean-depend distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
++ install-exec-am install-exec-local install-includeHEADERS \
++ install-info install-info-am install-libLTLIBRARIES install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-hook \
+- uninstall-includeHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES uninstall-local
++ tags uninstall uninstall-am uninstall-includeHEADERS \
++ uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/src/xine-utils/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-utils/Makefile.in
+--- xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/src/xine-utils/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,107 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libxineutils_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = src/xine-utils
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libxineutils_la_LIBADD =
+-am__libxineutils_la_SOURCES_DIST = ppcasm_string.S cpu_accel.c color.c \
+- copy.c list.c memcpy.c monitor.c utils.c xine_check.c \
+- xine_mutex.c xmllexer.c xine_buffer.c xmlparser.c
+-@HOST_OS_DARWIN_FALSE@@PPC_ARCH_TRUE@am__objects_1 = ppcasm_string.lo
+-am_libxineutils_la_OBJECTS = $(am__objects_1) cpu_accel.lo color.lo \
+- copy.lo list.lo memcpy.lo monitor.lo utils.lo xine_check.lo \
+- xine_mutex.lo xmllexer.lo xine_buffer.lo xmlparser.lo
+-libxineutils_la_OBJECTS = $(am_libxineutils_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+- $(CCASFLAGS)
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libxineutils_la_SOURCES)
+-DIST_SOURCES = $(am__libxineutils_la_SOURCES_DIST)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(includedir)"
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -121,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -141,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -167,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -196,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -325,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -340,12 +165,11 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
++
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@
+@@ -354,12 +178,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -368,23 +190,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -392,16 +206,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -429,9 +240,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -444,6 +252,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -461,64 +272,20 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+ noinst_LTLIBRARIES = libxineutils.la
++
+ EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
++
+ @HOST_OS_DARWIN_FALSE@@PPC_ARCH_TRUE@pppc_files = ppcasm_string.S
++
+ AM_CFLAGS = $(X_CFLAGS)
++
+ libxineutils_la_SOURCES = $(pppc_files) \
+ cpu_accel.c \
+ color.c \
+@@ -533,6 +300,7 @@
+ xine_buffer.c \
+ xmlparser.c
+
++
+ include_HEADERS = \
+ attributes.h \
+ compat.h \
+@@ -541,46 +309,68 @@
+ xmllexer.h \
+ xmlparser.h
+
++
+ noinst_HEADERS = ppcasm_string.h xine_check.h
++subdir = src/xine-utils
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libxineutils_la_LDFLAGS =
++libxineutils_la_LIBADD =
++@HOST_OS_DARWIN_FALSE@@PPC_ARCH_TRUE@am__objects_1 = ppcasm_string.lo
++am_libxineutils_la_OBJECTS = $(am__objects_1) cpu_accel.lo color.lo \
++ copy.lo list.lo memcpy.lo monitor.lo utils.lo xine_check.lo \
++ xine_mutex.lo xmllexer.lo xine_buffer.lo xmlparser.lo
++libxineutils_la_OBJECTS = $(am_libxineutils_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/color.Plo ./$(DEPDIR)/copy.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpu_accel.Plo ./$(DEPDIR)/list.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/memcpy.Plo ./$(DEPDIR)/monitor.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/utils.Plo ./$(DEPDIR)/xine_buffer.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_check.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xine_mutex.Plo ./$(DEPDIR)/xmllexer.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/xmlparser.Plo
++LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
++ $(CCASFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libxineutils_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
++ Makefile.in
++SOURCES = $(libxineutils_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xine-utils/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/xine-utils/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+@@ -588,7 +378,7 @@
+ $(LINK) $(libxineutils_la_LDFLAGS) $(libxineutils_la_OBJECTS) $(libxineutils_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -606,35 +396,36 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmllexer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparser.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .S.o:
+- $(CCASCOMPILE) -c $<
++ $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .S.obj:
+- $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
++ $(CCASCOMPILE) -c `cygpath -w $<`
+
+ .S.lo:
+- $(LTCCASCOMPILE) -c -o $@ $<
++ $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -645,6 +436,12 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -654,7 +451,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -666,24 +462,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -692,22 +472,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -725,10 +502,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -740,31 +517,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -782,8 +556,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -791,31 +564,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-man install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-hook uninstall-includeHEADERS \
+- uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-includeHEADERS \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
++ uninstall-am uninstall-includeHEADERS uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/win32/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/Makefile.in
+--- xine-lib-vdr-1.0/win32/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/Makefile.in 2005-02-13 01:08:03.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,77 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = win32
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -91,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -111,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -137,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -166,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -295,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -310,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -324,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -338,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -362,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -399,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -414,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -431,61 +271,15 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = contrib include
++
+ EXTRA_DIST = \
+ scripts/move_xine_fonts.bat \
+ README \
+@@ -496,38 +290,26 @@
+ libxine.dsw \
+ xine.dsw
+
++subdir = win32
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = README Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -593,10 +375,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -606,23 +389,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -631,24 +405,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -657,22 +415,20 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../misc $(distdir)/scripts
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/scripts
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -687,29 +443,28 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$(top_distdir)" distdir="$(distdir)" \
++ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
+ check-am: all-am
+ check: check-recursive
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -721,20 +476,20 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+@@ -742,8 +497,6 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -761,40 +514,33 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive dist-hook distclean distclean-generic \
+- distclean-libtool distclean-recursive distclean-tags distdir \
+- dvi dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-recursive distclean \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
+ install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-hook \
+- uninstall-info-am
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-info-recursive uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/win32/contrib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,98 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libdirent_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common
+-subdir = win32/contrib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libdirent_la_LIBADD =
+-am_libdirent_la_OBJECTS = dirent.lo
+-libdirent_la_OBJECTS = $(am_libdirent_la_OBJECTS)
+-@WIN32_TRUE@am_libdirent_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdirent_la_SOURCES)
+-DIST_SOURCES = $(libdirent_la_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -112,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -132,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -158,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -187,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -316,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -331,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -345,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -359,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -383,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -420,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -435,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -452,145 +271,130 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ SUBDIRS = zlib pthreads
++
+ noinst_HEADERS = dirent/dirent.h
++
+ @WIN32_TRUE@win32libs = libdirent.la
++
+ noinst_LTLIBRARIES = $(win32libs)
++
+ libdirent_la_SOURCES = dirent/dirent.c
++subdir = win32/contrib
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libdirent_la_LDFLAGS =
++libdirent_la_LIBADD =
++am_libdirent_la_OBJECTS = dirent.lo
++libdirent_la_OBJECTS = $(am_libdirent_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dirent.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libdirent_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
++ uninstall-info-recursive all-recursive install-data-recursive \
++ install-exec-recursive installdirs-recursive install-recursive \
++ uninstall-recursive check-recursive installcheck-recursive
++DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = $(libdirent_la_SOURCES)
++
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/contrib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/contrib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
++dirent.lo: dirent/dirent.c
+ libdirent.la: $(libdirent_la_OBJECTS) $(libdirent_la_DEPENDENCIES)
+- $(LINK) $(am_libdirent_la_rpath) $(libdirent_la_LDFLAGS) $(libdirent_la_OBJECTS) $(libdirent_la_LIBADD) $(LIBS)
++ $(LINK) $(libdirent_la_LDFLAGS) $(libdirent_la_OBJECTS) $(libdirent_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirent.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
++dirent.o: dirent/dirent.c
++@AMDEP_TRUE@ source='dirent/dirent.c' object='dirent.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/dirent.Po' tmpdepfile='$(DEPDIR)/dirent.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirent.o `test -f 'dirent/dirent.c' || echo '$(srcdir)/'`dirent/dirent.c
++
++dirent.obj: dirent/dirent.c
++@AMDEP_TRUE@ source='dirent/dirent.c' object='dirent.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/dirent.Po' tmpdepfile='$(DEPDIR)/dirent.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirent.obj `cygpath -w dirent/dirent.c`
+
+ dirent.lo: dirent/dirent.c
+-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dirent.lo -MD -MP -MF "$(DEPDIR)/dirent.Tpo" -c -o dirent.lo `test -f 'dirent/dirent.c' || echo '$(srcdir)/'`dirent/dirent.c; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dirent.Tpo" "$(DEPDIR)/dirent.Plo"; else rm -f "$(DEPDIR)/dirent.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dirent/dirent.c' object='dirent.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirent.lo `test -f 'dirent/dirent.c' || echo '$(srcdir)/'`dirent/dirent.c
++@AMDEP_TRUE@ source='dirent/dirent.c' object='dirent.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/dirent.Plo' tmpdepfile='$(DEPDIR)/dirent.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirent.lo `test -f 'dirent/dirent.c' || echo '$(srcdir)/'`dirent/dirent.c
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -656,10 +460,11 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
++
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -669,23 +474,14 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -694,24 +490,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -720,22 +500,20 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc $(distdir)/dirent
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/dirent
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -750,17 +528,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -770,6 +546,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -781,31 +558,28 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-recursive
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+@@ -823,8 +597,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
+@@ -832,34 +605,28 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-recursive
+-
+-pdf-am:
+-
+-ps: ps-recursive
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-hook uninstall-info-am
++.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
++ clean-generic clean-libtool clean-noinstLTLIBRARIES \
++ clean-recursive distclean distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-recursive \
++ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++ info-recursive install install-am install-data install-data-am \
++ install-data-recursive install-exec install-exec-am \
++ install-exec-recursive install-info install-info-am \
++ install-info-recursive install-man install-recursive \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am installdirs-recursive maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive tags tags-recursive uninstall \
++ uninstall-am uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/pthreads/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,106 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libpthread_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-subdir = win32/contrib/pthreads
+-DIST_COMMON = README $(am__include_HEADERS_DIST) \
+- $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in COPYING.LIB ChangeLog NEWS TODO
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libpthread_la_LIBADD =
+-am_libpthread_la_OBJECTS = attr.lo barrier.lo cancel.lo cleanup.lo \
+- condvar.lo create.lo dll.lo errno.lo exit.lo fork.lo global.lo \
+- misc.lo mutex.lo nonportable.lo private.lo rwlock.lo sched.lo \
+- semaphore.lo signal.lo spin.lo sync.lo tsd.lo
+-libpthread_la_OBJECTS = $(am_libpthread_la_OBJECTS)
+-@WIN32_TRUE@am_libpthread_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libpthread_la_SOURCES)
+-DIST_SOURCES = $(libpthread_la_SOURCES)
+-am__include_HEADERS_DIST = pthread.h sched.h
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(includedir)"
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-am__noinst_HEADERS_DIST = config.h implement.h need_errno.h \
+- semaphore.h pthread.h sched.h
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -120,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -140,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -166,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -195,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -324,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -339,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -353,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -367,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -391,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -428,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -443,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -460,113 +271,92 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
++
+ AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C
++
+ EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw diff_to_original.patch
++
+ @WIN32_TRUE@noinst_LTLIBRARIES = libpthread.la
+ @WIN32_TRUE@include_HEADERS = pthread.h sched.h
+-@WIN32_FALSE@noinst_HEADERS = config.h implement.h need_errno.h semaphore.h pthread.h sched.h
+ @WIN32_TRUE@noinst_HEADERS = config.h implement.h need_errno.h semaphore.h
++@WIN32_FALSE@noinst_HEADERS = config.h implement.h need_errno.h semaphore.h pthread.h sched.h
++
+ libpthread_la_SOURCES = attr.c barrier.c cancel.c cleanup.c condvar.c create.c dll.c errno.c exit.c fork.c global.c misc.c mutex.c nonportable.c private.c rwlock.c sched.c semaphore.c signal.c spin.c sync.c tsd.c
++subdir = win32/contrib/pthreads
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libpthread_la_LDFLAGS =
++libpthread_la_LIBADD =
++am_libpthread_la_OBJECTS = attr.lo barrier.lo cancel.lo cleanup.lo \
++ condvar.lo create.lo dll.lo errno.lo exit.lo fork.lo global.lo \
++ misc.lo mutex.lo nonportable.lo private.lo rwlock.lo sched.lo \
++ semaphore.lo signal.lo spin.lo sync.lo tsd.lo
++libpthread_la_OBJECTS = $(am_libpthread_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attr.Plo ./$(DEPDIR)/barrier.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/cancel.Plo ./$(DEPDIR)/cleanup.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/condvar.Plo ./$(DEPDIR)/create.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/dll.Plo ./$(DEPDIR)/errno.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/exit.Plo ./$(DEPDIR)/fork.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/misc.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/mutex.Plo ./$(DEPDIR)/nonportable.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/private.Plo ./$(DEPDIR)/rwlock.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sched.Plo ./$(DEPDIR)/semaphore.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/signal.Plo ./$(DEPDIR)/spin.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/sync.Plo ./$(DEPDIR)/tsd.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libpthread_la_SOURCES)
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) COPYING.LIB \
++ ChangeLog Makefile.am Makefile.in NEWS TODO
++SOURCES = $(libpthread_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/contrib/pthreads/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/contrib/pthreads/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libpthread.la: $(libpthread_la_OBJECTS) $(libpthread_la_DEPENDENCIES)
+- $(LINK) $(am_libpthread_la_rpath) $(libpthread_la_LDFLAGS) $(libpthread_la_OBJECTS) $(libpthread_la_LIBADD) $(LIBS)
++ $(LINK) $(libpthread_la_LDFLAGS) $(libpthread_la_OBJECTS) $(libpthread_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -594,26 +384,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sync.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsd.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -624,24 +415,30 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ done
+
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+- rm -f "$(DESTDIR)$(includedir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++ rm -f $(DESTDIR)$(includedir)/$$f; \
+ done
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -650,7 +447,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -662,24 +458,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -688,21 +468,19 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -720,10 +498,10 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(includedir)
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -735,31 +513,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -777,8 +552,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -786,27 +560,18 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-includeHEADERS uninstall-info-am
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am \
+- install-includeHEADERS install-info install-info-am \
+- install-man install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-includeHEADERS \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool tags uninstall \
+ uninstall-am uninstall-includeHEADERS uninstall-info-am
+
+
+diff -urNad xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in
+--- xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/contrib/zlib/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,94 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+-
+-SOURCES = $(libzlib_la_SOURCES)
++SHELL = @SHELL@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(top_srcdir)/misc/Makefile.common \
+- ChangeLog
+-subdir = win32/contrib/zlib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libzlib_la_LIBADD =
+-am_libzlib_la_OBJECTS = adler32.lo compress.lo crc32.lo deflate.lo \
+- gzio.lo infblock.lo infcodes.lo inffast.lo inflate.lo \
+- inftrees.lo infutil.lo trees.lo uncompr.lo zutil.lo
+-libzlib_la_OBJECTS = $(am_libzlib_la_OBJECTS)
+-@HAVE_ZLIB_FALSE@am_libzlib_la_rpath =
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libzlib_la_SOURCES)
+-DIST_SOURCES = $(libzlib_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -108,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -128,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -154,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -183,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -312,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -327,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -341,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -355,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -379,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -416,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -431,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -448,120 +271,95 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = inffixed.h ChangeLog FAQ INDEX README example.c maketree.c \
+ minigzip.c zlib.3 algorithm.txt build.tar.gz nt/Makefile.emx \
+ nt/Makefile.gcc nt/Makefile.nt nt/zlib.dnt
+
++
+ @HAVE_ZLIB_FALSE@link_zlib = libzlib.la
++
+ noinst_LTLIBRARIES = $(link_zlib)
++
+ libzlib_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c infblock.c \
+ infcodes.c inffast.c inflate.c inftrees.c infutil.c \
+ trees.c uncompr.c zutil.c
+
++
+ noinst_HEADERS = deflate.h infblock.h infcodes.h inffast.h inftrees.h \
+ infutil.h trees.h zconf.h zlib.h zutil.h
+
++subdir = win32/contrib/zlib
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libzlib_la_LDFLAGS =
++libzlib_la_LIBADD =
++am_libzlib_la_OBJECTS = adler32.lo compress.lo crc32.lo deflate.lo \
++ gzio.lo infblock.lo infcodes.lo inffast.lo inflate.lo \
++ inftrees.lo infutil.lo trees.lo uncompr.lo zutil.lo
++libzlib_la_OBJECTS = $(am_libzlib_la_OBJECTS)
++
++DEFS = @DEFS@
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/gzio.Plo ./$(DEPDIR)/infblock.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/infcodes.Plo ./$(DEPDIR)/inffast.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/infutil.Plo ./$(DEPDIR)/trees.Plo \
++@AMDEP_TRUE@ ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CFLAGS = @CFLAGS@
++DIST_SOURCES = $(libzlib_la_SOURCES)
++HEADERS = $(noinst_HEADERS)
++
++DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
++ Makefile.in
++SOURCES = $(libzlib_la_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/contrib/zlib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/contrib/zlib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
++ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+ libzlib.la: $(libzlib_la_OBJECTS) $(libzlib_la_DEPENDENCIES)
+- $(LINK) $(am_libzlib_la_rpath) $(libzlib_la_LDFLAGS) $(libzlib_la_OBJECTS) $(libzlib_la_LIBADD) $(LIBS)
++ $(LINK) $(libzlib_la_LDFLAGS) $(libzlib_la_OBJECTS) $(libzlib_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -581,26 +379,27 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@
+
++distclean-depend:
++ -rm -rf ./$(DEPDIR)
++
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(COMPILE) -c `cygpath -w $<`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++CCDEPMODE = @CCDEPMODE@
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -612,6 +411,11 @@
+ -rm -f libtool
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -620,7 +424,6 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -632,24 +435,8 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
+-ctags: CTAGS
+-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- tags=; \
+- here=`pwd`; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+ GTAGS:
+@@ -658,22 +445,20 @@
+ && gtags -i $(GTAGS_ARGS) $$here
+
+ distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../../misc $(distdir)/nt
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/nt
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -691,7 +476,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -703,31 +490,28 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+ distclean: distclean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++
++distclean-am: clean-am distclean-compile distclean-depend \
++ distclean-generic distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -745,8 +529,7 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -rf ./$(DEPDIR)
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+@@ -754,29 +537,21 @@
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-hook install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-hook uninstall-info-am
++.PHONY: GTAGS all all-am check check-am clean clean-generic \
++ clean-libtool clean-noinstLTLIBRARIES distclean \
++ distclean-compile distclean-depend distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ $(XINE_LIB):
+diff -urNad xine-lib-vdr-1.0/win32/include/Makefile.in /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/include/Makefile.in
+--- xine-lib-vdr-1.0/win32/include/Makefile.in 2005-02-13 01:06:48.000000000 +0000
++++ /tmp/dpep.t0gUhR/xine-lib-vdr-1.0/win32/include/Makefile.in 2005-02-13 01:08:04.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.3 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,68 +13,66 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SHELL = @SHELL@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
++transform = @program_transform_name@
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-build_triplet = @build@
++host_alias = @host_alias@
+ host_triplet = @host@
+-target_triplet = @target@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+- $(top_srcdir)/misc/Makefile.common
+-subdir = win32/include
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \
+- $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \
+- $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \
+- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/directx.m4 \
+- $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \
+- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/ffmpeg.m4 \
+- $(top_srcdir)/m4/freetype2.m4 $(top_srcdir)/m4/gettext.m4 \
+- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+- $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lcmessage.m4 \
+- $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \
+- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \
+- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/progtest.m4 \
+- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/speex.m4 \
+- $(top_srcdir)/m4/theora.m4 $(top_srcdir)/m4/vorbis.m4 \
+- $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++EXEEXT = @EXEEXT@
++OBJEXT = @OBJEXT@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ AAINFO = @AAINFO@
+ AALIB_CFLAGS = @AALIB_CFLAGS@
+ AALIB_CONFIG = @AALIB_CONFIG@
+ AALIB_LIBS = @AALIB_LIBS@
+-ACLOCAL = @ACLOCAL@
+ ACLOCAL_DIR = @ACLOCAL_DIR@
+-ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALSA_STATIC_LIB = @ALSA_STATIC_LIB@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ARTS_CFLAGS = @ARTS_CFLAGS@
+@@ -82,16 +80,7 @@
+ ARTS_LIBS = @ARTS_LIBS@
+ AS = @AS@
+ ASFLAGS = @ASFLAGS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_ASF_FALSE = @BUILD_ASF_FALSE@
+-BUILD_ASF_TRUE = @BUILD_ASF_TRUE@
+-BUILD_DHA_KMOD_FALSE = @BUILD_DHA_KMOD_FALSE@
+-BUILD_DHA_KMOD_TRUE = @BUILD_DHA_KMOD_TRUE@
+-BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@
+-BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CACA_CFLAGS = @CACA_CFLAGS@
+ CACA_CONFIG = @CACA_CONFIG@
+@@ -102,18 +91,10 @@
+ CCAS = @CCAS@
+ CCASCOMPILE = @CCASCOMPILE@
+ CCASFLAGS = @CCASFLAGS@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+@@ -128,26 +109,21 @@
+ DVDNAV_LIBS = @DVDNAV_LIBS@
+ DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@
+ ECHO = @ECHO@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_VCD_FALSE = @ENABLE_VCD_FALSE@
+-ENABLE_VCD_TRUE = @ENABLE_VCD_TRUE@
+ ESD_CFLAGS = @ESD_CFLAGS@
+ ESD_CONFIG = @ESD_CONFIG@
+ ESD_LIBS = @ESD_LIBS@
+-EXEEXT = @EXEEXT@
+ EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@
+ EXTRA_X_LIBS = @EXTRA_X_LIBS@
+ F77 = @F77@
+-FFLAGS = @FFLAGS@
+ FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@
+ FFMPEG_LIBS = @FFMPEG_LIBS@
+ FIG2DEV = @FIG2DEV@
+ FREETYPE_CONFIG = @FREETYPE_CONFIG@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_LIBS = @FT2_LIBS@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
+ GENCAT = @GENCAT@
+ GLIBC21 = @GLIBC21@
+ GLUT_LIBS = @GLUT_LIBS@
+@@ -157,124 +133,13 @@
+ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+ GOOM_LIBS = @GOOM_LIBS@
+-HAVE_AA_FALSE = @HAVE_AA_FALSE@
+-HAVE_AA_TRUE = @HAVE_AA_TRUE@
+-HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@
+-HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@
+-HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@
+-HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@
+-HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@
+-HAVE_ARMV4L_TRUE = @HAVE_ARMV4L_TRUE@
+-HAVE_ARTS_FALSE = @HAVE_ARTS_FALSE@
+-HAVE_ARTS_TRUE = @HAVE_ARTS_TRUE@
+ HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@
+-HAVE_CACA_FALSE = @HAVE_CACA_FALSE@
+-HAVE_CACA_TRUE = @HAVE_CACA_TRUE@
+-HAVE_CDROM_IOCTLS_FALSE = @HAVE_CDROM_IOCTLS_FALSE@
+-HAVE_CDROM_IOCTLS_TRUE = @HAVE_CDROM_IOCTLS_TRUE@
+-HAVE_COREAUDIO_FALSE = @HAVE_COREAUDIO_FALSE@
+-HAVE_COREAUDIO_TRUE = @HAVE_COREAUDIO_TRUE@
+ HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@
+-HAVE_DIRECTFB_FALSE = @HAVE_DIRECTFB_FALSE@
+-HAVE_DIRECTFB_TRUE = @HAVE_DIRECTFB_TRUE@
+-HAVE_DIRECTX_FALSE = @HAVE_DIRECTX_FALSE@
+-HAVE_DIRECTX_TRUE = @HAVE_DIRECTX_TRUE@
+-HAVE_DVDNAV_FALSE = @HAVE_DVDNAV_FALSE@
+-HAVE_DVDNAV_TRUE = @HAVE_DVDNAV_TRUE@
+-HAVE_DXR3_FALSE = @HAVE_DXR3_FALSE@
+-HAVE_DXR3_TRUE = @HAVE_DXR3_TRUE@
+-HAVE_ESD_FALSE = @HAVE_ESD_FALSE@
+-HAVE_ESD_TRUE = @HAVE_ESD_TRUE@
+-HAVE_FB_FALSE = @HAVE_FB_FALSE@
+-HAVE_FB_TRUE = @HAVE_FB_TRUE@
+-HAVE_FFMMX_FALSE = @HAVE_FFMMX_FALSE@
+-HAVE_FFMMX_TRUE = @HAVE_FFMMX_TRUE@
+-HAVE_FFMPEG_FALSE = @HAVE_FFMPEG_FALSE@
+-HAVE_FFMPEG_TRUE = @HAVE_FFMPEG_TRUE@
+-HAVE_FIG2DEV_FALSE = @HAVE_FIG2DEV_FALSE@
+-HAVE_FIG2DEV_TRUE = @HAVE_FIG2DEV_TRUE@
+-HAVE_FLAC_FALSE = @HAVE_FLAC_FALSE@
+-HAVE_FLAC_TRUE = @HAVE_FLAC_TRUE@
+ HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@
+-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
+-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
+-HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@
+-HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@
+-HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@
+-HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@
+-HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@
+-HAVE_LIBMNG_TRUE = @HAVE_LIBMNG_TRUE@
+-HAVE_LIBPNG_FALSE = @HAVE_LIBPNG_FALSE@
+-HAVE_LIBPNG_TRUE = @HAVE_LIBPNG_TRUE@
+-HAVE_LIBRTE_FALSE = @HAVE_LIBRTE_FALSE@
+-HAVE_LIBRTE_TRUE = @HAVE_LIBRTE_TRUE@
+-HAVE_LIBSMBCLIENT_FALSE = @HAVE_LIBSMBCLIENT_FALSE@
+-HAVE_LIBSMBCLIENT_TRUE = @HAVE_LIBSMBCLIENT_TRUE@
+ HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@
+-HAVE_LINUX_FALSE = @HAVE_LINUX_FALSE@
+-HAVE_LINUX_TRUE = @HAVE_LINUX_TRUE@
+-HAVE_MACOSX_VIDEO_FALSE = @HAVE_MACOSX_VIDEO_FALSE@
+-HAVE_MACOSX_VIDEO_TRUE = @HAVE_MACOSX_VIDEO_TRUE@
+-HAVE_MLIB_FALSE = @HAVE_MLIB_FALSE@
+-HAVE_MLIB_TRUE = @HAVE_MLIB_TRUE@
+-HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
+-HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
+-HAVE_OSS_FALSE = @HAVE_OSS_FALSE@
+-HAVE_OSS_TRUE = @HAVE_OSS_TRUE@
+-HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@
+-HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@
+-HAVE_SDL_FALSE = @HAVE_SDL_FALSE@
+-HAVE_SDL_TRUE = @HAVE_SDL_TRUE@
+-HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@
+-HAVE_SGMLTOOLS_TRUE = @HAVE_SGMLTOOLS_TRUE@
+ HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@
+-HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
+-HAVE_SPEEX_TRUE = @HAVE_SPEEX_TRUE@
+-HAVE_STK_FALSE = @HAVE_STK_FALSE@
+-HAVE_STK_TRUE = @HAVE_STK_TRUE@
+-HAVE_SUNAUDIO_FALSE = @HAVE_SUNAUDIO_FALSE@
+-HAVE_SUNAUDIO_TRUE = @HAVE_SUNAUDIO_TRUE@
+-HAVE_SUNDGA_FALSE = @HAVE_SUNDGA_FALSE@
+-HAVE_SUNDGA_TRUE = @HAVE_SUNDGA_TRUE@
+-HAVE_SUNFB_FALSE = @HAVE_SUNFB_FALSE@
+-HAVE_SUNFB_TRUE = @HAVE_SUNFB_TRUE@
+-HAVE_SYNCFB_FALSE = @HAVE_SYNCFB_FALSE@
+-HAVE_SYNCFB_TRUE = @HAVE_SYNCFB_TRUE@
+-HAVE_THEORA_FALSE = @HAVE_THEORA_FALSE@
+-HAVE_THEORA_TRUE = @HAVE_THEORA_TRUE@
+-HAVE_V4L_FALSE = @HAVE_V4L_FALSE@
+-HAVE_V4L_TRUE = @HAVE_V4L_TRUE@
+-HAVE_VCDNAV_FALSE = @HAVE_VCDNAV_FALSE@
+-HAVE_VCDNAV_TRUE = @HAVE_VCDNAV_TRUE@
+-HAVE_VIDIX_FALSE = @HAVE_VIDIX_FALSE@
+-HAVE_VIDIX_TRUE = @HAVE_VIDIX_TRUE@
+-HAVE_VLDXVMC_FALSE = @HAVE_VLDXVMC_FALSE@
+-HAVE_VLDXVMC_TRUE = @HAVE_VLDXVMC_TRUE@
+-HAVE_VORBIS_FALSE = @HAVE_VORBIS_FALSE@
+-HAVE_VORBIS_TRUE = @HAVE_VORBIS_TRUE@
+-HAVE_W32DLL_FALSE = @HAVE_W32DLL_FALSE@
+-HAVE_W32DLL_TRUE = @HAVE_W32DLL_TRUE@
+ HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@
+-HAVE_X11_FALSE = @HAVE_X11_FALSE@
+-HAVE_X11_TRUE = @HAVE_X11_TRUE@
+-HAVE_XVMC_FALSE = @HAVE_XVMC_FALSE@
+-HAVE_XVMC_TRUE = @HAVE_XVMC_TRUE@
+-HAVE_XV_FALSE = @HAVE_XV_FALSE@
+-HAVE_XV_TRUE = @HAVE_XV_TRUE@
+-HAVE_XXMC_FALSE = @HAVE_XXMC_FALSE@
+-HAVE_XXMC_TRUE = @HAVE_XXMC_TRUE@
+-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
+-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
+-HOST_OS_DARWIN_FALSE = @HOST_OS_DARWIN_FALSE@
+-HOST_OS_DARWIN_TRUE = @HOST_OS_DARWIN_TRUE@
+-INCLUDED_INTL_FALSE = @INCLUDED_INTL_FALSE@
+-INCLUDED_INTL_TRUE = @INCLUDED_INTL_TRUE@
+ INCLUDES = @INCLUDES@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_M4_FALSE = @INSTALL_M4_FALSE@
+-INSTALL_M4_TRUE = @INSTALL_M4_TRUE@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
+@@ -286,7 +151,6 @@
+ IRIXAL_LIBS = @IRIXAL_LIBS@
+ IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@
+ KSTAT_LIBS = @KSTAT_LIBS@
+-LDFLAGS = @LDFLAGS@
+ LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
+ LIBCDIO_LIBS = @LIBCDIO_LIBS@
+ LIBFAME_CFLAGS = @LIBFAME_CFLAGS@
+@@ -301,9 +165,7 @@
+ LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
+ LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@
+ LIBNAME = @LIBNAME@
+-LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+-LIBS = @LIBS@
+ LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+@@ -315,12 +177,10 @@
+ LIBVCD_SYSDEP = @LIBVCD_SYSDEP@
+ LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@
+ LINUX_INCLUDE = @LINUX_INCLUDE@
++LIRC_INCLUDE = @LIRC_INCLUDE@
++LIRC_LIBS = @LIRC_LIBS@
+ LN_S = @LN_S@
+-LTLIBOBJS = @LTLIBOBJS@
+-LT_AGE = @LT_AGE@
+-LT_CURRENT = @LT_CURRENT@
+-LT_REVISION = @LT_REVISION@
+-MAKEINFO = @MAKEINFO@
++MAINT = @MAINT@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKNOD = @MKNOD@
+ MLIB_CFLAGS = @MLIB_CFLAGS@
+@@ -329,23 +189,15 @@
+ MSGFMT = @MSGFMT@
+ NET_LIBS = @NET_LIBS@
+ OBJC = @OBJC@
+-OBJCDEPMODE = @OBJCDEPMODE@
+ OBJCFLAGS = @OBJCFLAGS@
+ OBJDUMP = @OBJDUMP@
+-OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
+ OPENGL_CFLAGS = @OPENGL_CFLAGS@
+ OPENGL_LIBS = @OPENGL_LIBS@
+ PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASS1_CFLAGS = @PASS1_CFLAGS@
+ PASS2_CFLAGS = @PASS2_CFLAGS@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ PNG_CFLAGS = @PNG_CFLAGS@
+ PNG_LIBS = @PNG_LIBS@
+@@ -353,16 +205,13 @@
+ POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@
+ POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@
+ POSUB = @POSUB@
+-PPC_ARCH_FALSE = @PPC_ARCH_FALSE@
+-PPC_ARCH_TRUE = @PPC_ARCH_TRUE@
+ RANLIB = @RANLIB@
++RC = @RC@
+ RT_LIBS = @RT_LIBS@
+ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+-SET_MAKE = @SET_MAKE@
+ SGMLTOOLS = @SGMLTOOLS@
+-SHELL = @SHELL@
+ SPEC_VERSION = @SPEC_VERSION@
+ SPEEX_CFLAGS = @SPEEX_CFLAGS@
+ SPEEX_LIBS = @SPEEX_LIBS@
+@@ -390,9 +239,6 @@
+ W32DLL_DEP = @W32DLL_DEP@
+ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
+ WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+-WIN32_FALSE = @WIN32_FALSE@
+-WIN32_TRUE = @WIN32_TRUE@
+-XGETTEXT = @XGETTEXT@
+ XINE_ACFLAGS = @XINE_ACFLAGS@
+ XINE_BIN_AGE = @XINE_BIN_AGE@
+ XINE_BUILD_CC = @XINE_BUILD_CC@
+@@ -405,6 +251,9 @@
+ XINE_IFACE_AGE = @XINE_IFACE_AGE@
+ XINE_LOCALEDIR = @XINE_LOCALEDIR@
+ XINE_LOCALEPATH = @XINE_LOCALEPATH@
++XINE_LT_AGE = @XINE_LT_AGE@
++XINE_LT_CURRENT = @XINE_LT_CURRENT@
++XINE_LT_REVISION = @XINE_LT_REVISION@
+ XINE_MAJOR = @XINE_MAJOR@
+ XINE_MINOR = @XINE_MINOR@
+ XINE_PLUGINDIR = @XINE_PLUGINDIR@
+@@ -422,60 +271,13 @@
+ ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ ZLIB_LIBS = @ZLIB_LIBS@
+ ZLIB_LIBS_CONFIG = @ZLIB_LIBS_CONFIG@
+-ac_ct_AR = @ac_ct_AR@
+-ac_ct_AS = @ac_ct_AS@
+-ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+-ac_ct_F77 = @ac_ct_F77@
+-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+-am__fastdepOBJC_FALSE = @am__fastdepOBJC_FALSE@
+-am__fastdepOBJC_TRUE = @am__fastdepOBJC_TRUE@
+ am__include = @am__include@
+-am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+-bindir = @bindir@
+-build = @build@
+-build_alias = @build_alias@
+-build_cpu = @build_cpu@
+-build_os = @build_os@
+-build_vendor = @build_vendor@
+-datadir = @datadir@
+-exec_prefix = @exec_prefix@
+-host = @host@
+-host_alias = @host_alias@
+-host_cpu = @host_cpu@
+-host_os = @host_os@
+-host_vendor = @host_vendor@
+-includedir = @includedir@
+-infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
+-libexecdir = @libexecdir@
+-localstatedir = @localstatedir@
+-mandir = @mandir@
+ mkdir_p = @mkdir_p@
+-oldincludedir = @oldincludedir@
+-prefix = @prefix@
+-program_transform_name = @program_transform_name@
+-sbindir = @sbindir@
+-sharedstatedir = @sharedstatedir@
+-sysconfdir = @sysconfdir@
+-target = @target@
+-target_alias = @target_alias@
+-target_cpu = @target_cpu@
+-target_os = @target_os@
+-target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
++
+ EXTRA_DIST = \
+ msvc/sys/time.h \
+ msvc/config.h \
+@@ -489,38 +291,20 @@
+ pwd.h \
+ unistd.h
+
++subdir = win32/include
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/include/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/misc/Makefile.common $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/include/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -534,24 +318,19 @@
+ tags: TAGS
+ TAGS:
+
+-ctags: CTAGS
+-CTAGS:
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../misc $(distdir)/msvc $(distdir)/msvc/sys $(distdir)/netinet $(distdir)/sys
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ $(mkinstalldirs) $(distdir)/msvc $(distdir)/msvc/sys $(distdir)/netinet $(distdir)/sys
++ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -569,7 +348,9 @@
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
++
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -581,28 +362,26 @@
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ clean: clean-am
+
+ clean-am: clean-generic clean-libtool mostlyclean-am
+
+ distclean: distclean-am
+- -rm -f Makefile
++
+ distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -620,34 +399,25 @@
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+- -rm -f Makefile
++
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+-pdf: pdf-am
+-
+-pdf-am:
+-
+-ps: ps-am
+-
+-ps-am:
+-
+ uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ dvi-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+
+
+ $(XINE_LIB):
Modified: general/xine-lib-vdr/trunk/debian/rules
===================================================================
--- general/xine-lib-vdr/trunk/debian/rules 2005-03-02 10:33:35 UTC (rev 224)
+++ general/xine-lib-vdr/trunk/debian/rules 2005-03-02 10:34:25 UTC (rev 225)
@@ -6,6 +6,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
# assuming created lib in src/xine-engine/.libs/libxine.so.<version>
version=`ls src/xine-engine/.libs/libxine*.so.* | \
awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
@@ -51,14 +54,17 @@
DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE)
endif
-configure: configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
+ # create compat symlinks (pre-1.0.1)
+ test -f $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c || \
+ ln -s ioctl.c $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
$(DEB_BUILD_GNU_OPTION) CFLAGS="$(CFLAGS)"
touch configure-stamp
-build: configure-stamp build-stamp
+build: patch configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -66,11 +72,15 @@
touch build-stamp
-clean:
+clean: clean-tree unpatch
+clean-tree:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp configure-stamp po/*.gmo
test -f Makefile && $(MAKE) distclean || true
+ # clean up any compat symlinks (pre-1.0.1)
+ test ! -L $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c || \
+ rm $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c
dh_clean
install: build
@@ -98,7 +108,9 @@
dh_installdocs
dh_installchangelogs -k ChangeLog
dh_link
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
+endif
dh_compress
dh_fixperms
dh_makeshlibs -V 'libxine1 (>= 1-rc3a)'
Property changes on: general/xine-lib-vdr/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
-
+ *