Changes of Revision 6
| [-] | Changed | xine-lib.spec |
|
x 1 2 %if %{with modplug}3 BuildRequires: libmodplug-devel4 %endif5 -Version: 1.1.206 -Release: 59.47 +Version: 1.1.20.18 +Release: 60.19 # bug43729310 %ifarch ppc6411 Obsoletes: xine-lib-64bit12 13 %endif14 15 %changelog16 -* Sat Nov 19 2011 coolo@suse.com17 -- add libtool as buildrequire to avoid implicit dependency18 -* Sun Nov 13 2011 Manfred.Tremmel@iiv.de19 -- update to 1.1.2020 - * Imagine that there's a large poppy here.21 - * Ensure that file and socket descriptors are marked as CLOEXEC.22 - * Enable FFmpeg's support for AAC LATM audio.23 - * Fix build-time check for dvdnav.24 - * Allow use of GraphicsMagick instead of ImageMagick.25 - * Fix build on Debian GNU/kFreeBSD (broken in 1.1.19).26 - * Add a Japanese translation from Takeshi Hamasaki.27 - * Czech translation update.28 - * New MinGW-w64 port, various portability fixes.29 - * MinGW port updates.30 - * Possibility to disable HW acceleration in directx video output.31 - * Header stripping support in Matroska demuxer.32 - * Update nosefart to 2.7-mls (stability with corrupted NSF files).33 - * Add .ass extension to be recognized as subtitle file. [Bug #123]34 -* Sun Nov 6 2011 reddwarf@opensuse.org35 -- Fix Packman build: since /usr/share/xine/mad is no longer needed36 - don't create it37 -* Fri Oct 21 2011 lnussel@suse.de38 -- fix build: /usr/share/xine/mad is no longer needed39 -* Thu Jul 7 2011 idonmez@novell.com40 -- Add xine-lib-v4l-2.6.38.patch: use the new v4l interface41 -* Sat May 28 2011 Manfred.Tremmel@iiv.de42 -- included a patch to build against new ffmpeg abi43 -* Thu Nov 18 2010 coolo@novell.com44 -- add patch from arch linux to fix build with newer xorg45 -* Tue Aug 3 2010 lnussel@suse.de46 -- remove unneeded libcdio-mini-devel buildignore again47 -* Mon Jul 26 2010 Manfred.Tremmel@iiv.de48 -- update to 1.1.1949 - * Handle odd widths properly (for ffmpeg-decoded video).50 - * Make buildable with current (external) libdvdnav & libdvdread.51 - * Fix V4L2 check.52 - * Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'.53 - * Add support for EAC3.54 - * Recognise video/mp2t and video/mp2p.55 - * TTA fixes.56 - * Add support for Xv gamma adjustment.57 - * Better recovery from ALSA-reported errors.58 - * Report stream buffer stats to the application.59 - * Recognise and handle the WebM container format.60 - (VP8 video is not yet supported.)61 - * Recognise ScreamTracker 2 & 3 files.62 - * Fix playback of the first file handled by the modplug demuxer.63 - * Refuse to build with known-broken libmodplug (0.8.8).64 - http://bugs.debian.org/58846565 - * Fix a potential freeing of unallocated memory.66 -* Mon Apr 26 2010 ro@suse.de67 -- buildignore libcdio-mini-devel68 -* Sun Mar 7 2010 Manfred.Tremmel@iiv.de69 -- update to 1.1.18.170 - * Oops. compat.c (for DXR3 support) was omitted.71 - * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L.72 - * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.73 - * Fix build with the old, outdated and deprecated internal ffmpeg.74 -* Wed Feb 24 2010 Manfred.Tremmel@iiv.de75 -- update to 1.1.1876 - * Bump the FLAC decoder's priority above ffmpegaudio. This should fix77 - various problems with FLAC playback.78 - * Build fix (undefined symbol) for when using older ffmpeg.79 - * TTA demuxer fixes; allow seeking.80 - * More meta-information tags.81 - Only the Ogg demuxer knows about these at present.82 - * Added basic support for .qtl (Quicktime media link).83 - * "Fixed" playback of 24-bit FLAC.84 - * Fixed playback of 24-bit LPCM.85 - * Work around an ffmpeg bug concerning Sorenson Video 3.86 - * Flash audio bug fixes, mostly concerning AAC.87 - * Fix DXR3 support for newer versions of the em8300 driver.88 - * Added support for WMA Pro.89 -* Wed Feb 3 2010 Manfred.Tremmel@iiv.de90 -- patches can't be build to work with crippled and non crippled tarball91 - with fuzz=0, added "-F2" for patch 50 and 61 to fix this92 -* Mon Feb 1 2010 jengelh@medozas.de93 -- package baselibs.conf94 -* Fri Jan 8 2010 ro@suse.de95 -- rediffed again96 -* Wed Dec 16 2009 meissner@suse.de97 -- rediffed for fuzz=098 -* Tue Dec 1 2009 Manfred.Tremmel@iiv.de99 -- update to 1.1.17100 - * Add support for Matroska SIMPLEBLOCK.101 - * Add support for sndio (OpenBSD sound API).102 - * Correct invalid MIME info in the MOD demuxer.103 - * Fix a resource leak in libdvdnav.104 - * Properly NUL-terminate when reading ID3v2.2 tag content.105 - * Fix handling of the length of UTF-16 content sourced from, e.g., ID3 tags.106 - * Make ~/.xine/catalog.cache writing safer: write a new file & atomically107 - replace the old one.108 - * Initial parsing of Xing header LAME extension.109 - * Fixes for gapless playback.110 - * Added padding delay to the first and last frames (MPEG audio).111 - * Fixed buggy discontinuity handling when playing short streams and using the gapless switch. The current time should not be used here.112 - * Added audio padding handling. (New buffer flag for this.)113 - * Fix seeking in large raw DV files.114 - * Ported to new libmpcdec API (retaining build compat. with the old API).115 - * Cope with CDDB return code 211 (multiple entries).116 - * Allow reading of non-block-sized chunks from audio CDs.117 - * Add a user agent & protocol hack ("qthttp://...") to allow direct118 - viewing of Apple film trailers.119 - * Fixed int-to-float conversion in the JACK output plugin.120 - * Work around MOD files with reported length == 0.121 - * Reworked Matroska demuxer. Now reads files created by mkvmerge 2.7.0.122 - * Support BluRay/HDMV streams & subtitles.123 - * The XML parser & lexer code now has re-entrancy.124 - * Fixed a bug which prevented "dvb://" (no channel specified) working with125 - the default configuration.126 - * Handle VC1 extradata requirement (should fix playback).127 -* Wed Nov 18 2009 lnussel@suse.de128 -- enable libmodplug on >= 11.2129 -* Sat Nov 14 2009 Manfred.Tremmel@iiv.de130 -- merged packman and openSUSE package131 -- update to 1.1.16.3132 - * Security fixes:133 - - Fix another possible int overflow in the 4XM demuxer.134 - (ref. TKADV2009-004, CVE-2009-0385)135 - - Fix an integer overflow in the Quicktime demuxer.136 - * Enable libmpeg2new (if configured with --enable-libmpeg2new).137 - This is not yet production code; the old mpeg2 decoder remains the default.138 - * Add support for OpenBSD.139 - * Fix a build failure on *BSD due to some rather useful GNUisms.140 - * Protect audio loop so it cannot write to a paused device (fix141 - pause/resume freeze with pulseaudio).142 - * Fix build with libavutil >= 50.0.0.143 - * Fix segfaults when playing VCDs.144 - * Fix calculation of frame duration for ffmpeg-decoded formats.145 - * Don't assume that ID3v2 tags with no content mean "end of ID3 data".146 -- changes from 1.1.16.1 to 1.1.16.2:147 - * Build fixes related to ImageMagick 6.4 & later.148 - * Fix an error in Matroska PTS calculation.149 - * Some front ends hang due to the hang fixes in 1.1.16. Fix this by150 - removing a break statement.151 - * Fix broken size checks in various input plugins (ref. CVE-2008-5239).152 - * More malloc checking (ref. CVE-2008-5240).153 - * Fix race conditions in gapless_switch (ref. kde bug #180339)154 - * Fix a possible integer overflow in the 4XM demuxer.155 - (TKADV2009-004, CVE-2009-0385)156 -* Tue Sep 29 2009 meissner@suse.de157 -- trying to fix timing issue in MJPEG plugin. bnc#327569158 -* Fri Sep 25 2009 meissner@suse.de159 -- Made my xine MJPEG plugin more stable. bnc#327569160 - (still crashes in XShm mode, but this might be due to XShm)161 -* Fri Mar 6 2009 mhopf@suse.de162 -- Updated security fix for 4xm demuxer (TKADV2009-004, bnc#473825)163 -* Tue Feb 17 2009 lnussel@suse.de164 -- fix libtool breakage on older distributions with hack165 -* Tue Feb 10 2009 mhopf@suse.de166 -- Security fix for 4xm demuxer (TKADV2009-004, bnc#473825)167 -* Tue Jan 27 2009 mhopf@suse.de168 -- Update to 1.1.16.1:169 - * Security fixes:170 - - Heap overflow in Quicktime atom parsing. (CVE-2008-5234)171 - - Multiple buffer overflows. (CVE-2008-5236)172 - - Multiple integer overflows. (CVE-2008-5237)173 - - Unchecked or incompletely-checked read function results. (CVE-2008-5239)174 - - Unchecked malloc using untrusted values. (CVE-2008-5240, CVE-2008-5242)175 - - Integer underflow in qt compressed atom handling. (CVE-2008-5241)176 - - Buffer indexing using untrusted or unchecked values. (CVE-2008-5243)177 - - Integer overflows in the ffmpeg audio decoder and the CDDA server.178 - - Heap buffer overflow in the ffmpeg video decoder.179 - - Avoid segfault on invalid track type in Matroska files.180 - - Avoid underflow (compressed atoms) in the Qt demuxer.181 - * Fix reported compilation failures (with C++ programs).182 - * Fix CDDB access in 64-bit builds.183 - * Fix seeking FLV clips that don't specify the movie length in the headers.184 - * Support H.264 and AAC streams within FLV.185 - * Fix timing issues (broken audio) on mingw.186 - * Add ID3 tag TDRC to replace/complement the deprecated tag TYER.187 - * Add a new meta-tag, "Composer", and use it in the FLAC demuxer.188 - * Correct AAC channel ordering for multi-channel audio, at least for FLAC189 - when using ALSA or PulseAudio. (Needs a proper fix.)190 - * Add position-based seeking independent from seekpoints.191 - * Fix some XCB Xv attribute configuration breakage.192 - * Add a configuration option for Xv bicubic filtering, implemented in193 - xf86-video-ati 6.9.1.194 - * Recognise Xv "blitter" adaptors for port selection purposes.195 - NOTE: you will need to remove ~/.xine/catalog.cache when upgrading from196 - xine-lib 1.1.15 or older if you wish to use this extra option.197 - * Fix MMS media requests where the URI contains %%-encoded characters.198 - * Fix two hangs related to stopping playback of broken audio streams where199 - no audio data is sent to the output thread.200 - * Fix WAV demuxer to send the last frames when they don't fit perfectly into201 |
||
| [+] | Deleted | xine-lib-1.1.20-assert.patch ^ |
| @@ -1,11 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.20/src/audio_out/audio_alsa_out.c ---- xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c 2011-10-04 23:42:53.000000000 +0200 -+++ xine-lib-1.1.20/src/audio_out/audio_alsa_out.c 2011-11-13 17:54:44.276984269 +0100 -@@ -41,6 +41,7 @@ - #ifdef HAVE_ALLOCA_H - #include <alloca.h> - #endif -+#include <assert.h> - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API | ||
| [+] | Deleted | xine-lib-1.1.20-demuxcheckfor_mad_ffmpeg.patch ^ |
| @@ -1,37 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c xine-lib-1.1.20/src/xine-engine/load_plugins.c ---- xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c 2011-10-16 20:59:32.000000000 +0200 -+++ xine-lib-1.1.20/src/xine-engine/load_plugins.c 2011-11-13 18:08:39.357570472 +0100 -@@ -2508,9 +2508,18 @@ - - plugin_catalog_t *catalog = self->plugin_catalog; - int list_id; -+ int havempgdecoder = 0; -+ const char * const * p; - - pthread_mutex_lock (&catalog->lock); - -+ _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]); -+ for (p = catalog->ids; p && *p; p++) { -+ if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) { -+ havempgdecoder = 1; -+ break; -+ } -+ } - /* calc length of output string and create an array of strings to - concatenate */ - size_t len = 0; -@@ -2522,7 +2531,13 @@ - if (node->plugin_class || _load_plugin_class(self, node, NULL)) { - demux_class_t *const cls = (demux_class_t *)node->plugin_class; - if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) -- len += strlen(extensions[list_id]) +1; -+ { -+ if(havempgdecoder || !strstr(extensions[list_id], "mp3")) { -+ len += strlen(extensions[list_id]) +1; -+ } else { -+ extensions[list_id] = NULL; -+ } -+ } - } - } - | ||
| [+] | Deleted | xine-lib-1.1.20-glitch-free-pulseaudio.patch ^ |
| @@ -1,22 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/xine-engine/audio_out.c xine-lib-1.1.20/src/xine-engine/audio_out.c ---- xine-lib-1.1.20.orig/src/xine-engine/audio_out.c 2010-08-16 18:36:37.000000000 +0200 -+++ xine-lib-1.1.20/src/xine-engine/audio_out.c 2011-11-13 17:23:52.677415436 +0100 -@@ -1156,8 +1156,17 @@ - - /* - * calculate gap: -+ * -+ * HACK (rwa): If we have no video stream we do not need an AV sync and so -+ * we assume a gap of 0. This seems to avoid the skips in the -+ * first seconds when playing audio-only via the "glitch-free" -+ * pulseaudio server. - */ -- gap = in_buf->vpts - hw_vpts; -+ if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { -+ gap = in_buf->vpts - hw_vpts; -+ } else { -+ gap = 0; -+ } - lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", - hw_vpts, in_buf->vpts, gap); - | ||
| [+] | Deleted | xine-lib-1.1.20-ia64-is-not-alpha.diff ^ |
| @@ -1,18 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 02:36:20.000000000 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:19:36.819687116 +0100 -@@ -2407,10 +2407,13 @@ - mips-*) - AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) - ;; -- alphaev56-* | alpha* | ia64-* | hppa*-linux-*) -+ alphaev56-* | alpha* | hppa*-linux-*) - AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) - AC_DEFINE_UNQUOTED(ARCH_ALPHA,,[Define this if you're running Alpha architecture]) - ;; -+ ia64-*) -+ AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) -+ ;; - armv4l-*-linux*) - AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation]) - AC_DEFINE_UNQUOTED(ARCH_ARM,,[Define this if you're running ARM architecture]) | ||
| [+] | Deleted | xine-lib-1.1.20-install-plugins-helper.diff ^ |
| @@ -1,266 +0,0 @@ -diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 -@@ -2657,6 +2657,28 @@ - - AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") - -+dnl --------------------------------------------- -+dnl let distro override plugin install helper path -+dnl --------------------------------------------- -+AC_ARG_WITH(install-plugins-helper, -+ AC_HELP_STRING([--with-install-plugins-helper], -+ [specify path of helper script to call to install plugins]), -+ [ -+ case "${withval}" in -+ yes) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; -+ no) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; -+ *) XINE_INSTALL_PLUGINS_HELPER="${withval}" ;; -+ esac -+ ], -+ [ -+ dnl Default value -+ XINE_INSTALL_PLUGINS_HELPER="`makeexpand "${libexecdir}/xine-install-plugins-helper"`" -+ ] -+) -+AC_MSG_NOTICE(Using $XINE_INSTALL_PLUGINS_HELPER as plugin install helper) -+AC_DEFINE_UNQUOTED(XINE_INSTALL_PLUGINS_HELPER, "$XINE_INSTALL_PLUGINS_HELPER", -+ [plugin install helper script]) -+AC_SUBST(XINE_INSTALL_PLUGINS_HELPER) - - dnl --------------------------------------------- - dnl some include paths ( !!! DO NOT REMOVE !!! ) -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.20/src/xine-engine/audio_decoder.c ---- xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/audio_decoder.c 2011-10-04 23:42:53.000000000 +0200 -@@ -41,6 +41,7 @@ - - #include "xine_internal.h" - #include "xineutils.h" -+#include "install_plugins_helper.h" - - static void *audio_decoder_loop (void *stream_gen) { - -@@ -344,6 +345,10 @@ - - _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, - (stream->audio_decoder_plugin != NULL)); -+ -+ if(buf->type != buftype_unknown && !stream->audio_decoder_plugin) -+ _x_install_plugins_helper(stream,"decoder-audio", buf->type, _x_buf_audio_name( buf->type )); -+ - } - - if (audio_type != stream->audio_type) { -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c ---- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 -@@ -0,0 +1,106 @@ -+/* -+ * Copyright (C) 2007 Sascha Sommer -+ * -+ * 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 -+ * -+ * helper functions to query the internet for additional plugins -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include <stdio.h> -+#include <unistd.h> -+#include <sys/wait.h> -+ -+#include "install_plugins_helper.h" -+ -+#define PROCNAME_LEN 100 -+ -+static const char * -+get_helper(xine_stream_t *stream) -+{ -+ const char *helper; -+ -+ helper = getenv("XINE_INSTALL_PLUGINS_HELPER"); -+ if (helper == NULL) -+ helper = XINE_INSTALL_PLUGINS_HELPER; -+ -+ xine_log (stream->xine, XINE_LOG_MSG, -+ _("Using plugin install helper '%s'"), helper); -+ -+ return helper; -+} -+ -+static void -+get_procname(char* procname, size_t len) -+{ -+ char name[100]; -+ FILE* fp; -+ size_t pos = 0; -+ snprintf(name, sizeof(name), "/proc/%u/cmdline", getpid()); -+ -+ fp = fopen(name,"rb"); -+ if(fp){ -+ while(fp && !feof(fp) && pos < sizeof(name)-1){ -+ procname[pos] = fgetc(fp); -+ if(procname[pos] == ' ') /* ignore arguments */ -+ break; -+ if(procname[pos] == '/') /* ignore the path to the executable */ -+ pos = 0; -+ else -+ ++pos; -+ } -+ fclose(fp); -+ } -+ procname[pos] = '\0'; -+} -+ -+ -+void _x_install_plugins_helper(xine_stream_t* stream,char* plugin_type, uint32_t id, char* plugin_desc) -+{ -+ xine_cfg_entry_t cfgentry; -+ char* helper = get_helper(stream); -+ FILE* fp; -+ -+ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value -+ && (fp = fopen(helper,"rb") )) { -+ char procname[PROCNAME_LEN]; -+// char* procname = getenv("_"); /* might deliver /opt/kde3/bin/start_kdeinit_wrapper etc... */ -+ pid_t pid; -+ fclose(fp); -+ get_procname(procname,PROCNAME_LEN); -+ pid = fork(); -+ if(pid == 0) { -+ size_t len = 5 + strlen(XINE_VERSION) + 1 + strlen(procname) + 1 + strlen(plugin_desc) + 1 + strlen(plugin_type) + 1 + 100 + 1; -+ char* str = calloc(1,len + 1); -+ if(str){ -+ snprintf(str,len,"xine|%s|%s|%s|%s=%u",XINE_VERSION,procname,plugin_desc,plugin_type,id); -+ if(execl(helper,"xine-install-plugins-helper",str, NULL) == -1) -+ xine_log(stream->xine, XINE_LOG_MSG, -+ _("Couldn't start plugins_helper")); -+ free(str); -+ } -+ }else if(pid < 0){ -+ xine_log(stream->xine, XINE_LOG_MSG, -+ _("Couldn't fork")); -+ }else{ -+ waitpid(pid, NULL, 0); -+ } -+ } -+} -+ -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h ---- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2007 Sascha Sommer -+ * -+ * 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 -+ * -+ * helper functions to query the internet for additional codecs -+ */ -+ -+#ifndef PLUGINS_HELPER_H -+#define PLUGINS_HELPER_H -+ -+#include <inttypes.h> -+#include "xine_internal.h" -+ -+/* -+ * execute install plugins helper -+ */ | ||
| [+] | Deleted | xine-lib-1.1.20-mjpegplugin.diff ^ |
| @@ -1,1252 +0,0 @@ -diff -uNr xine-lib-1.1.20.orig/configure xine-lib-1.1.20/configure ---- xine-lib-1.1.20.orig/configure 2011-11-13 02:37:22.000000000 +0100 -+++ xine-lib-1.1.20/configure 2011-11-13 17:40:51.568377304 +0100 -@@ -34954,6 +34954,7 @@ - echo " * video decoder plugins:" - echo " - MPEG 1,2 - Amiga Bitplane" - echo " - Raw RGB - Raw YUV" -+echo " - Motion JPEG" - if test "x$with_external_ffmpeg" = "xyes"; then - echo " - ffmpeg (external library):" - else -diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:38:54.705413389 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 -@@ -1109,6 +1109,28 @@ - AC_SUBST([SDL_LIBS]) - - dnl --------------------------------------------- -+dnl check for libjpeg -+dnl --------------------------------------------- -+ -+AC_ARG_ENABLE([jpeg], -+ AC_HELP_STRING([--disable-jpeg], [do not build JPEG support]), -+ [with_jpeg=$enableval], [with_jpeg=yes]) -+ -+if test "x$with_jpeg" = "xyes"; then -+ AC_CHECK_HEADERS(jpeglib.h, -+ [ -+ AC_CHECK_LIB(jpeg,jpeg_start_decompress, -+ [ -+ AC_DEFINE(HAVE_JPEG,1,[Define this if you have libjpeg library installed]) -+ ]) -+ ]) -+else -+ no_sdl=yes -+fi -+AM_CONDITIONAL(HAVE_JPEG, [test x"$with_jpeg" == x"yes"]) -+ -+ -+dnl --------------------------------------------- - dnl check for Libstk - dnl --------------------------------------------- - -@@ -2845,6 +2867,7 @@ - src/libxineadec/gsm610/Makefile - src/libxineadec/nosefart/Makefile - src/libreal/Makefile -+src/mjpeg/Makefile - src/post/Makefile - src/post/planar/Makefile - src/post/goom/Makefile -@@ -3063,6 +3086,9 @@ - dnl audio decoders - echo " * audio decoder plugins:" - echo " - GSM 06.10 - linear PCM" -+if test x"$with_jpeg" == x"yes"; then -+ echo " - Motion JPEG (libjpeg based)" -+fi - if test "x$with_external_ffmpeg" = "xyes"; then - echo " - ffmpeg (external library):" - echo " - Windows Media Audio v1/v2/Pro" -diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am ---- xine-lib-1.1.20.orig/src/Makefile.am 2011-11-13 17:38:54.705413389 +0100 -+++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:40:51.572377268 +0100 -@@ -27,6 +27,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined \ - vdr -diff -uNr xine-lib-1.1.20.orig/src/Makefile.in xine-lib-1.1.20/src/Makefile.in ---- xine-lib-1.1.20.orig/src/Makefile.in 2011-11-13 02:37:24.000000000 +0100 -+++ xine-lib-1.1.20/src/Makefile.in 2011-11-13 17:40:51.572377268 +0100 -@@ -460,6 +460,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined - -diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.am xine-lib-1.1.20/src/mjpeg/Makefile.am ---- xine-lib-1.1.20.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.20/src/mjpeg/Makefile.am 2011-11-13 17:40:51.572377268 +0100 -@@ -0,0 +1,9 @@ -+include $(top_srcdir)/misc/Makefile.common -+ -+if HAVE_JPEG -+xineplug_LTLIBRARIES = xineplug_decode_mjpeg.la -+xineplug_decode_mjpeg_la_SOURCES = xine_mjpeg_decoder.c -+xineplug_decode_mjpeg_la_LIBADD = $(XINE_LIB) -ljpeg -+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) -+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) -+endif -diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.in xine-lib-1.1.20/src/mjpeg/Makefile.in ---- xine-lib-1.1.20.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.20/src/mjpeg/Makefile.in 2011-11-13 17:40:51.572377268 +0100 -@@ -0,0 +1,751 @@ -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 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@ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/misc/Makefile.common -+subdir = src/mjpeg -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \ -+ $(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/attributes.m4 \ -+ $(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \ -+ $(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/gas.m4 \ -+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/ioctl_request.m4 $(top_srcdir)/m4/irixal.m4 \ -+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ -+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -+ $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \ -+ $(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \ -+ $(top_srcdir)/m4/opengl.m4 $(top_srcdir)/m4/optimizations.m4 \ -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ -+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/pthreads.m4 \ -+ $(top_srcdir)/m4/symbol.m4 $(top_srcdir)/m4/xv.m4 \ -+ $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+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)$(xineplugdir)" -+xineplugLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(xineplug_LTLIBRARIES) -+xineplug_decode_mjpeg_la_DEPENDENCIES = $(XINE_LIB) -+am__xineplug_decode_mjpeg_la_SOURCES_DIST = xine_mjpeg_decoder.c -+am_xineplug_decode_mjpeg_la_OBJECTS = xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo -+xineplug_decode_mjpeg_la_OBJECTS = \ -+ $(am_xineplug_decode_mjpeg_la_OBJECTS) -+xineplug_decode_mjpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) \ -+ $(xineplug_decode_mjpeg_la_LDFLAGS) $(LDFLAGS) -o $@ -+am_xineplug_decode_mjpeg_la_rpath = -rpath \ -+ $(xineplugdir) -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(xineplug_decode_mjpeg_la_SOURCES) -+DIST_SOURCES = $(am__xineplug_decode_mjpeg_la_SOURCES_DIST) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+AAINFO = @AAINFO@ -+AALIB_CFLAGS = @AALIB_CFLAGS@ -+AALIB_CONFIG = @AALIB_CONFIG@ -+AALIB_LIBS = @AALIB_LIBS@ | ||
| [+] | Added | xine-lib-1.1.20.1-assert.patch ^ |
| @@ -0,0 +1,11 @@ +diff -ur xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.20/src/audio_out/audio_alsa_out.c +--- xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c 2011-10-04 23:42:53.000000000 +0200 ++++ xine-lib-1.1.20/src/audio_out/audio_alsa_out.c 2011-11-13 17:54:44.276984269 +0100 +@@ -41,6 +41,7 @@ + #ifdef HAVE_ALLOCA_H + #include <alloca.h> + #endif ++#include <assert.h> + + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API | ||
| [+] | Added | xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch ^ |
| @@ -0,0 +1,37 @@ +diff -ur xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c xine-lib-1.1.20/src/xine-engine/load_plugins.c +--- xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c 2011-10-16 20:59:32.000000000 +0200 ++++ xine-lib-1.1.20/src/xine-engine/load_plugins.c 2011-11-13 18:08:39.357570472 +0100 +@@ -2508,9 +2508,18 @@ + + plugin_catalog_t *catalog = self->plugin_catalog; + int list_id; ++ int havempgdecoder = 0; ++ const char * const * p; + + pthread_mutex_lock (&catalog->lock); + ++ _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]); ++ for (p = catalog->ids; p && *p; p++) { ++ if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) { ++ havempgdecoder = 1; ++ break; ++ } ++ } + /* calc length of output string and create an array of strings to + concatenate */ + size_t len = 0; +@@ -2522,7 +2531,13 @@ + if (node->plugin_class || _load_plugin_class(self, node, NULL)) { + demux_class_t *const cls = (demux_class_t *)node->plugin_class; + if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) +- len += strlen(extensions[list_id]) +1; ++ { ++ if(havempgdecoder || !strstr(extensions[list_id], "mp3")) { ++ len += strlen(extensions[list_id]) +1; ++ } else { ++ extensions[list_id] = NULL; ++ } ++ } + } + } + | ||
| [+] | Added | xine-lib-1.1.20.1-glitch-free-pulseaudio.patch ^ |
| @@ -0,0 +1,22 @@ +diff -ur xine-lib-1.1.20.orig/src/xine-engine/audio_out.c xine-lib-1.1.20/src/xine-engine/audio_out.c +--- xine-lib-1.1.20.orig/src/xine-engine/audio_out.c 2010-08-16 18:36:37.000000000 +0200 ++++ xine-lib-1.1.20/src/xine-engine/audio_out.c 2011-11-13 17:23:52.677415436 +0100 +@@ -1156,8 +1156,17 @@ + + /* + * calculate gap: ++ * ++ * HACK (rwa): If we have no video stream we do not need an AV sync and so ++ * we assume a gap of 0. This seems to avoid the skips in the ++ * first seconds when playing audio-only via the "glitch-free" ++ * pulseaudio server. + */ +- gap = in_buf->vpts - hw_vpts; ++ if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { ++ gap = in_buf->vpts - hw_vpts; ++ } else { ++ gap = 0; ++ } + lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", + hw_vpts, in_buf->vpts, gap); + | ||
| [+] | Added | xine-lib-1.1.20.1-ia64-is-not-alpha.diff ^ |
| @@ -0,0 +1,18 @@ +diff -ur xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac +--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 02:36:20.000000000 +0100 ++++ xine-lib-1.1.20/configure.ac 2011-11-13 17:19:36.819687116 +0100 +@@ -2407,10 +2407,13 @@ + mips-*) + AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) + ;; +- alphaev56-* | alpha* | ia64-* | hppa*-linux-*) ++ alphaev56-* | alpha* | hppa*-linux-*) + AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) + AC_DEFINE_UNQUOTED(ARCH_ALPHA,,[Define this if you're running Alpha architecture]) + ;; ++ ia64-*) ++ AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) ++ ;; + armv4l-*-linux*) + AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation]) + AC_DEFINE_UNQUOTED(ARCH_ARM,,[Define this if you're running ARM architecture]) | ||
| [+] | Added | xine-lib-1.1.20.1-install-plugins-helper.diff ^ |
| @@ -0,0 +1,266 @@ +diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac +--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:46:57.513129735 +0100 ++++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 +@@ -2657,6 +2657,28 @@ + + AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") + ++dnl --------------------------------------------- ++dnl let distro override plugin install helper path ++dnl --------------------------------------------- ++AC_ARG_WITH(install-plugins-helper, ++ AC_HELP_STRING([--with-install-plugins-helper], ++ [specify path of helper script to call to install plugins]), ++ [ ++ case "${withval}" in ++ yes) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; ++ no) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; ++ *) XINE_INSTALL_PLUGINS_HELPER="${withval}" ;; ++ esac ++ ], ++ [ ++ dnl Default value ++ XINE_INSTALL_PLUGINS_HELPER="`makeexpand "${libexecdir}/xine-install-plugins-helper"`" ++ ] ++) ++AC_MSG_NOTICE(Using $XINE_INSTALL_PLUGINS_HELPER as plugin install helper) ++AC_DEFINE_UNQUOTED(XINE_INSTALL_PLUGINS_HELPER, "$XINE_INSTALL_PLUGINS_HELPER", ++ [plugin install helper script]) ++AC_SUBST(XINE_INSTALL_PLUGINS_HELPER) + + dnl --------------------------------------------- + dnl some include paths ( !!! DO NOT REMOVE !!! ) +diff -uNr xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.20/src/xine-engine/audio_decoder.c +--- xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c 2011-11-13 17:46:57.513129735 +0100 ++++ xine-lib-1.1.20/src/xine-engine/audio_decoder.c 2011-10-04 23:42:53.000000000 +0200 +@@ -41,6 +41,7 @@ + + #include "xine_internal.h" + #include "xineutils.h" ++#include "install_plugins_helper.h" + + static void *audio_decoder_loop (void *stream_gen) { + +@@ -344,6 +345,10 @@ + + _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, + (stream->audio_decoder_plugin != NULL)); ++ ++ if(buf->type != buftype_unknown && !stream->audio_decoder_plugin) ++ _x_install_plugins_helper(stream,"decoder-audio", buf->type, _x_buf_audio_name( buf->type )); ++ + } + + if (audio_type != stream->audio_type) { +diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c +--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c 2011-11-13 17:46:57.513129735 +0100 ++++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 +@@ -0,0 +1,106 @@ ++/* ++ * Copyright (C) 2007 Sascha Sommer ++ * ++ * 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 ++ * ++ * helper functions to query the internet for additional plugins ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++#include <stdio.h> ++#include <unistd.h> ++#include <sys/wait.h> ++ ++#include "install_plugins_helper.h" ++ ++#define PROCNAME_LEN 100 ++ ++static const char * ++get_helper(xine_stream_t *stream) ++{ ++ const char *helper; ++ ++ helper = getenv("XINE_INSTALL_PLUGINS_HELPER"); ++ if (helper == NULL) ++ helper = XINE_INSTALL_PLUGINS_HELPER; ++ ++ xine_log (stream->xine, XINE_LOG_MSG, ++ _("Using plugin install helper '%s'"), helper); ++ ++ return helper; ++} ++ ++static void ++get_procname(char* procname, size_t len) ++{ ++ char name[100]; ++ FILE* fp; ++ size_t pos = 0; ++ snprintf(name, sizeof(name), "/proc/%u/cmdline", getpid()); ++ ++ fp = fopen(name,"rb"); ++ if(fp){ ++ while(fp && !feof(fp) && pos < sizeof(name)-1){ ++ procname[pos] = fgetc(fp); ++ if(procname[pos] == ' ') /* ignore arguments */ ++ break; ++ if(procname[pos] == '/') /* ignore the path to the executable */ ++ pos = 0; ++ else ++ ++pos; ++ } ++ fclose(fp); ++ } ++ procname[pos] = '\0'; ++} ++ ++ ++void _x_install_plugins_helper(xine_stream_t* stream,char* plugin_type, uint32_t id, char* plugin_desc) ++{ ++ xine_cfg_entry_t cfgentry; ++ char* helper = get_helper(stream); ++ FILE* fp; ++ ++ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value ++ && (fp = fopen(helper,"rb") )) { ++ char procname[PROCNAME_LEN]; ++// char* procname = getenv("_"); /* might deliver /opt/kde3/bin/start_kdeinit_wrapper etc... */ ++ pid_t pid; ++ fclose(fp); ++ get_procname(procname,PROCNAME_LEN); ++ pid = fork(); ++ if(pid == 0) { ++ size_t len = 5 + strlen(XINE_VERSION) + 1 + strlen(procname) + 1 + strlen(plugin_desc) + 1 + strlen(plugin_type) + 1 + 100 + 1; ++ char* str = calloc(1,len + 1); ++ if(str){ ++ snprintf(str,len,"xine|%s|%s|%s|%s=%u",XINE_VERSION,procname,plugin_desc,plugin_type,id); ++ if(execl(helper,"xine-install-plugins-helper",str, NULL) == -1) ++ xine_log(stream->xine, XINE_LOG_MSG, ++ _("Couldn't start plugins_helper")); ++ free(str); ++ } ++ }else if(pid < 0){ ++ xine_log(stream->xine, XINE_LOG_MSG, ++ _("Couldn't fork")); ++ }else{ ++ waitpid(pid, NULL, 0); ++ } ++ } ++} ++ +diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h +--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h 2011-11-13 17:46:57.513129735 +0100 ++++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2007 Sascha Sommer ++ * ++ * 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 ++ * ++ * helper functions to query the internet for additional codecs ++ */ ++ ++#ifndef PLUGINS_HELPER_H ++#define PLUGINS_HELPER_H ++ ++#include <inttypes.h> ++#include "xine_internal.h" ++ ++/* ++ * execute install plugins helper ++ */ | ||
| [+] | Added | xine-lib-1.1.20.1-mjpegplugin.diff ^ |
| @@ -0,0 +1,1252 @@ +diff -uNr xine-lib-1.1.20.orig/configure xine-lib-1.1.20/configure +--- xine-lib-1.1.20.orig/configure 2011-11-13 02:37:22.000000000 +0100 ++++ xine-lib-1.1.20/configure 2011-11-13 17:40:51.568377304 +0100 +@@ -34954,6 +34954,7 @@ + echo " * video decoder plugins:" + echo " - MPEG 1,2 - Amiga Bitplane" + echo " - Raw RGB - Raw YUV" ++echo " - Motion JPEG" + if test "x$with_external_ffmpeg" = "xyes"; then + echo " - ffmpeg (external library):" + else +diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac +--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:38:54.705413389 +0100 ++++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 +@@ -1109,6 +1109,28 @@ + AC_SUBST([SDL_LIBS]) + + dnl --------------------------------------------- ++dnl check for libjpeg ++dnl --------------------------------------------- ++ ++AC_ARG_ENABLE([jpeg], ++ AC_HELP_STRING([--disable-jpeg], [do not build JPEG support]), ++ [with_jpeg=$enableval], [with_jpeg=yes]) ++ ++if test "x$with_jpeg" = "xyes"; then ++ AC_CHECK_HEADERS(jpeglib.h, ++ [ ++ AC_CHECK_LIB(jpeg,jpeg_start_decompress, ++ [ ++ AC_DEFINE(HAVE_JPEG,1,[Define this if you have libjpeg library installed]) ++ ]) ++ ]) ++else ++ no_sdl=yes ++fi ++AM_CONDITIONAL(HAVE_JPEG, [test x"$with_jpeg" == x"yes"]) ++ ++ ++dnl --------------------------------------------- + dnl check for Libstk + dnl --------------------------------------------- + +@@ -2845,6 +2867,7 @@ + src/libxineadec/gsm610/Makefile + src/libxineadec/nosefart/Makefile + src/libreal/Makefile ++src/mjpeg/Makefile + src/post/Makefile + src/post/planar/Makefile + src/post/goom/Makefile +@@ -3063,6 +3086,9 @@ + dnl audio decoders + echo " * audio decoder plugins:" + echo " - GSM 06.10 - linear PCM" ++if test x"$with_jpeg" == x"yes"; then ++ echo " - Motion JPEG (libjpeg based)" ++fi + if test "x$with_external_ffmpeg" = "xyes"; then + echo " - ffmpeg (external library):" + echo " - Windows Media Audio v1/v2/Pro" +diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am +--- xine-lib-1.1.20.orig/src/Makefile.am 2011-11-13 17:38:54.705413389 +0100 ++++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:40:51.572377268 +0100 +@@ -27,6 +27,7 @@ + libreal \ + libfaad \ + libmusepack \ ++ mjpeg \ + post \ + combined \ + vdr +diff -uNr xine-lib-1.1.20.orig/src/Makefile.in xine-lib-1.1.20/src/Makefile.in +--- xine-lib-1.1.20.orig/src/Makefile.in 2011-11-13 02:37:24.000000000 +0100 ++++ xine-lib-1.1.20/src/Makefile.in 2011-11-13 17:40:51.572377268 +0100 +@@ -460,6 +460,7 @@ + libreal \ + libfaad \ + libmusepack \ ++ mjpeg \ + post \ + combined + +diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.am xine-lib-1.1.20/src/mjpeg/Makefile.am +--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.20/src/mjpeg/Makefile.am 2011-11-13 17:40:51.572377268 +0100 +@@ -0,0 +1,9 @@ ++include $(top_srcdir)/misc/Makefile.common ++ ++if HAVE_JPEG ++xineplug_LTLIBRARIES = xineplug_decode_mjpeg.la ++xineplug_decode_mjpeg_la_SOURCES = xine_mjpeg_decoder.c ++xineplug_decode_mjpeg_la_LIBADD = $(XINE_LIB) -ljpeg ++xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) ++xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) ++endif +diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.in xine-lib-1.1.20/src/mjpeg/Makefile.in +--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.20/src/mjpeg/Makefile.in 2011-11-13 17:40:51.572377268 +0100 +@@ -0,0 +1,751 @@ ++# Makefile.in generated by automake 1.10 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006 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@ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/misc/Makefile.common ++subdir = src/mjpeg ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \ ++ $(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/attributes.m4 \ ++ $(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \ ++ $(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/gas.m4 \ ++ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ ++ $(top_srcdir)/m4/ioctl_request.m4 $(top_srcdir)/m4/irixal.m4 \ ++ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ ++ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ++ $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \ ++ $(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \ ++ $(top_srcdir)/m4/opengl.m4 $(top_srcdir)/m4/optimizations.m4 \ ++ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ ++ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/pthreads.m4 \ ++ $(top_srcdir)/m4/symbol.m4 $(top_srcdir)/m4/xv.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++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)$(xineplugdir)" ++xineplugLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(xineplug_LTLIBRARIES) ++xineplug_decode_mjpeg_la_DEPENDENCIES = $(XINE_LIB) ++am__xineplug_decode_mjpeg_la_SOURCES_DIST = xine_mjpeg_decoder.c ++am_xineplug_decode_mjpeg_la_OBJECTS = xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo ++xineplug_decode_mjpeg_la_OBJECTS = \ ++ $(am_xineplug_decode_mjpeg_la_OBJECTS) ++xineplug_decode_mjpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) \ ++ $(xineplug_decode_mjpeg_la_LDFLAGS) $(LDFLAGS) -o $@ ++am_xineplug_decode_mjpeg_la_rpath = -rpath \ ++ $(xineplugdir) ++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(xineplug_decode_mjpeg_la_SOURCES) ++DIST_SOURCES = $(am__xineplug_decode_mjpeg_la_SOURCES_DIST) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++AAINFO = @AAINFO@ ++AALIB_CFLAGS = @AALIB_CFLAGS@ ++AALIB_CONFIG = @AALIB_CONFIG@ ++AALIB_LIBS = @AALIB_LIBS@ | ||
| Added | xine-lib-1.1.20.1-52.5.src.rpm ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/ChangeLog ^ |
| @@ -1,3 +1,10 @@ +xine-lib (1.1.20.1) 2012-01-01 + * Various bug fixes. + * Use the current ImageMagick API (if using ImageMagick). + * Fix PVR plugin input building (needs V4L2). + * Fixes related to unknown audio & subtitle languages. + * Memory leak fixes. + xine-lib (1.1.20) 2011-11-13 * Imagine that there's a large poppy here. * Ensure that file and socket descriptors are marked as CLOEXEC. | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/configure ^ |
| @@ -2006,7 +2006,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -3379,14 +3379,14 @@ XINE_MAJOR=1 XINE_MINOR=1 XINE_SUB=20 -XINE_PATCH= +XINE_PATCH=.1 XINE_SERIES=1.1 XINE_SUBPART=".$XINE_SUB$XINE_PATCH" XINE_LT_CURRENT=31 -XINE_LT_REVISION=0 +XINE_LT_REVISION=1 XINE_LT_AGE=30 if test -f "${srcdir-.}/.cvsversion"; then @@ -7471,6 +7471,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -7510,7 +7515,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -7936,7 +7941,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -8573,13 +8578,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -8726,6 +8731,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -9114,7 +9120,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -9125,7 +9131,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -9765,7 +9784,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9776,6 +9801,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -9808,6 +9834,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -9829,7 +9856,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9933,7 +9962,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -10011,6 +10055,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -10470,7 +10518,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -10561,18 +10611,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -10934,7 +10999,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -11187,8 +11251,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -11568,6 +11631,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -11613,6 +11677,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -11641,10 +11706,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -11657,7 +11718,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11696,7 +11757,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -12320,11 +12380,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -12414,7 +12469,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -12423,7 +12478,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -12488,7 +12543,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12627,7 +12682,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -12635,10 +12690,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12646,7 +12697,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12664,7 +12715,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12684,7 +12735,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -12695,7 +12746,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -12756,7 +12807,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -12772,7 +12823,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -12809,9 +12860,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12905,7 +12956,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12974,7 +13025,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12999,7 +13050,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13023,7 +13074,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -13054,7 +13105,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13064,7 +13115,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13846,6 +13897,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -17931,22 +17984,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using external ffmpeg" >&5 $as_echo "using external ffmpeg" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: -********************************************************************* -xine-lib is configured to use internal ffmpeg. - -This copy of ffmpeg is old. You are strongly advised to install a -newer version (including development files) and to reconfigure -xine-lib to use it. -*********************************************************************" >&5 -$as_echo "$as_me: -********************************************************************* -xine-lib is configured to use internal ffmpeg. - -This copy of ffmpeg is old. You are strongly advised to install a -newer version (including development files) and to reconfigure -xine-lib to use it. -*********************************************************************" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using internal ffmpeg - NOT RECOMMENDED OR SUPPORTED" >&5 +$as_echo "using internal ffmpeg - NOT RECOMMENDED OR SUPPORTED" >&6; } LIBFFMPEG_CPPFLAGS="-DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DXINE_MPEG_ENCODER -D_ISOC9X_SOURCE -DCONFIG_DECODERS" ac_fn_c_check_type "$LINENO" "int_fast8_t" "ac_cv_type_int_fast8_t" "$ac_includes_default" if test "x$ac_cv_type_int_fast8_t" = xyes; then : @@ -24183,10 +24222,9 @@ $as_echo "a52dec support disabled" >&6; } elif test "x$external_a52dec" = "xyes"; then have_a52="yes" - for ac_header in a52dec/a52.h a52dec/a52_internal.h + for ac_header in a52dec/a52.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " + ac_fn_c_check_header_compile "$LINENO" "a52dec/a52.h" "ac_cv_header_a52dec_a52_h" " #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -24200,9 +24238,9 @@ #include <a52dec/a52.h> " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +if test "x$ac_cv_header_a52dec_a52_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_A52DEC_A52_H 1 _ACEOF else @@ -24947,6 +24985,9 @@ fi WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" + +$as_echo "#define HAVE_GRAPHICSMAGICK 1" >>confdefs.h + fi if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then as_fn_error $? "ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found" "$LINENO" 5 @@ -26969,6 +27010,46 @@ rm -f conf.dvdnavtest + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for navRead_DSI in -ldvdread" >&5 +$as_echo_n "checking for navRead_DSI in -ldvdread... " >&6; } +if ${ac_cv_lib_dvdread_navRead_DSI+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldvdread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char navRead_DSI (); +int +main () +{ +return navRead_DSI (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dvdread_navRead_DSI=yes +else + ac_cv_lib_dvdread_navRead_DSI=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dvdread_navRead_DSI" >&5 +$as_echo "$ac_cv_lib_dvdread_navRead_DSI" >&6; } +if test "x$ac_cv_lib_dvdread_navRead_DSI" = xyes; then : + DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread" +fi + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Use included DVDNAV support" >&5 $as_echo "Use included DVDNAV support" >&6; } @@ -32985,6 +33066,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -33065,7 +33147,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -33124,6 +33205,7 @@ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -33172,7 +33254,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -34075,8 +34156,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -34139,6 +34220,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -34434,10 +34518,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -35289,3 +35369,28 @@ ;; esac fi + +if test "x$with_external_ffmpeg" = "xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: +********************************************************************* +xine-lib is configured to use internal ffmpeg. + +This copy of ffmpeg is old and has known security problems. +Don't use it. We don't want you to. We only care that xine-lib is +compilable with it; beyond that, you're completely on your own. + +You are STRONGLY advised to install a newer version (including +development files) and to reconfigure xine-lib to use it. +*********************************************************************" >&5 +$as_echo "$as_me: +********************************************************************* +xine-lib is configured to use internal ffmpeg. + +This copy of ffmpeg is old and has known security problems. +Don't use it. We don't want you to. We only care that xine-lib is +compilable with it; beyond that, you're completely on your own. + +You are STRONGLY advised to install a newer version (including +development files) and to reconfigure xine-lib to use it. +*********************************************************************" >&6;} +fi | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/configure.ac ^ |
| @@ -19,7 +19,7 @@ XINE_MINOR=1 XINE_SUB=20 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar -XINE_PATCH= +XINE_PATCH=.1 dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) XINE_SERIES=1.1 @@ -56,7 +56,7 @@ dnl libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION XINE_LT_CURRENT=31 -XINE_LT_REVISION=0 +XINE_LT_REVISION=1 XINE_LT_AGE=30 dnl for a release tarball do "rm .cvsversion" before "make dist" @@ -372,14 +372,7 @@ AC_MSG_RESULT([using external ffmpeg]) else - AC_MSG_NOTICE([ -********************************************************************* -xine-lib is configured to use internal ffmpeg. - -This copy of ffmpeg is old. You are strongly advised to install a -newer version (including development files) and to reconfigure -xine-lib to use it. -*********************************************************************]) + AC_MSG_RESULT([using internal ffmpeg - NOT RECOMMENDED OR SUPPORTED]) LIBFFMPEG_CPPFLAGS="-DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DXINE_MPEG_ENCODER -D_ISOC9X_SOURCE -DCONFIG_DECODERS" AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CPPFLAGS="$LIBFFMPEG_CPPFLAGS -DEMULATE_FAST_INT"]) AC_SUBST([LIBFFMPEG_CPPFLAGS]) @@ -1309,7 +1302,7 @@ AC_MSG_RESULT([a52dec support disabled]) elif test "x$external_a52dec" = "xyes"; then have_a52="yes" - AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no", + AC_CHECK_HEADERS([a52dec/a52.h],, have_a52="no", [ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -1433,11 +1426,12 @@ dnl the flags for plain GraphicsMagick WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" + AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed]) fi if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) elif test "x$have_imagemagick" = "xyes"; then - AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed]) + AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick or GraphicsMagick's compat layer installed]) fi fi @@ -1773,6 +1767,7 @@ AM_PATH_DVDNAV(0.1.9, AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) + AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) else AC_MSG_RESULT([Use included DVDNAV support]) fi @@ -3367,3 +3362,18 @@ ;; esac fi + +dnl warn if internal ffmpeg is being used +if test "x$with_external_ffmpeg" = "xno"; then + AC_MSG_NOTICE([ +********************************************************************* +xine-lib is configured to use internal ffmpeg. + +This copy of ffmpeg is old and has known security problems. +Don't use it. We don't want you to. We only care that xine-lib is +compilable with it; beyond that, you're completely on your own. + +You are STRONGLY advised to install a newer version (including +development files) and to reconfigure xine-lib to use it. +*********************************************************************]) +fi | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/include/configure.h.in ^ |
| @@ -92,9 +92,6 @@ /* Define to 1 if you have the <a52dec/a52.h> header file. */ #undef HAVE_A52DEC_A52_H -/* Define to 1 if you have the <a52dec/a52_internal.h> header file. */ -#undef HAVE_A52DEC_A52_INTERNAL_H - /* Define to 1 if you have the <alloca.h> header file. */ #undef HAVE_ALLOCA_H @@ -236,6 +233,9 @@ /* Define this if you have gnome-vfs installed */ #undef HAVE_GNOME_VFS +/* Define this if you have GraphicsMagick installed */ +#undef HAVE_GRAPHICSMAGICK + /* Define to 1 if you have 'hstrerror' in <netdb.h> */ #undef HAVE_HSTRERROR @@ -539,7 +539,8 @@ /* Define to 1 if you have the `vsscanf' function. */ #undef HAVE_VSSCANF -/* Define this if you have ImageMagick installed */ +/* Define this if you have ImageMagick or GraphicsMagick's compat layer + installed */ #undef HAVE_WAND /* Define 1 if you have MinGW CD-ROM support */ | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/include/xine.h ^ |
| @@ -114,7 +114,7 @@ #define XINE_MAJOR_VERSION 1 #define XINE_MINOR_VERSION 1 #define XINE_SUB_VERSION 20 -#define XINE_VERSION "1.1.20" +#define XINE_VERSION "1.1.20.1" /* * pre-init the xine engine | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/libtool ^ |
| @@ -1,13 +1,13 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (xine-lib) 1.1.20 +# Generated automatically by config.status (xine-lib) 1.1.20.1 # Libtool was configured on host flibble: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -70,6 +70,9 @@ # An echo program that protects backslashes. ECHO="printf %s\\n" +# The PATH separator for the build system. +PATH_SEPARATOR=":" + # The host system. host_alias= host=x86_64-unknown-linux-gnu @@ -154,7 +157,7 @@ # Commands used to install an old-style archive. RANLIB="ranlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" +old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib" old_postuninstall_cmds="" # Whether to use a lock for old archive extraction. @@ -299,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" # Commands used to build an old-style archive. -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" +old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" # A language specific compiler. CC="gcc" @@ -368,10 +371,6 @@ # This must work even if $libdir does not exist hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" -# If ld is used when linking, flag to hardcode $libdir into a binary -# during linking. This must work even if $libdir does not exist. -hardcode_libdir_flag_spec_ld="" - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator="" | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/m4/libtool.m4 ^ |
| @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,7 +2513,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -2466,7 +2524,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2527,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2543,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2580,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2657,7 +2715,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2726,7 +2784,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2751,7 +2809,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2775,7 +2833,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2806,7 +2864,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2816,7 +2874,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3238,7 +3296,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3658,6 +3716,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4242,7 +4301,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4334,18 +4395,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4505,7 +4581,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4533,7 +4611,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4787,8 +4864,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5084,6 +5160,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5130,10 +5207,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5146,7 +5219,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5185,7 +5258,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5627,9 +5699,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5787,7 +5856,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6157,7 +6225,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6918,12 +6986,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7120,7 +7194,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7253,7 +7326,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7440,6 +7512,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7509,6 +7652,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/m4/ltoptions.m4 ^ |
| @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/misc/SlackBuild ^ |
| @@ -27,7 +27,7 @@ # do_descr() { cat > package_descriptions << EOF -xine-lib: xine-lib 1.1.20. +xine-lib: xine-lib 1.1.20.1. xine-lib: xine-lib: xine-lib is the beating heart of xine (a free gpl-licensed xine-lib: video player for unix-like systems) which among others provides @@ -53,12 +53,12 @@ cd $CWD rm -rf $TMPBUILD mkdir -p $TMPBUILD - cd $TMPBUILD && tar -xzf $CWD/xine-lib-1.1.20.tar.gz + cd $TMPBUILD && tar -xzf $CWD/xine-lib-1.1.20.1.tar.gz do_install_sh; - cd xine-lib-1.1.20 + cd xine-lib-1.1.20.1 DIE=1 - echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/xine-lib-1.1.20/src/xine-engine/.libs" && \ - ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/xine-lib-1.1.20/src/xine-engine/.libs && \ + echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/xine-lib-1.1.20.1/src/xine-engine/.libs" && \ + ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/xine-lib-1.1.20.1/src/xine-engine/.libs && \ mkdir -p $PKG/install && cp $TMPBUILD/doinst.sh $PKG/install && \ cd $PKG && \ echo "n" | /sbin/makepkg $PACKAGE && \ @@ -83,7 +83,7 @@ build_pentiumpro() { echo "*****************************************************" echo - echo "building slack for xine-lib 1.1.20" + echo "building slack for xine-lib 1.1.20.1" echo echo "current architecture:pentiumpro" echo "slackware package will be copied to ./slack directory" @@ -93,7 +93,7 @@ export XINE_BUILD=i686-pc-linux-gnu do_build if test "$DIE" -eq 0; then - tar -czvf xine-lib-1.1.20-i686.tar.gz $PACKAGE package_descriptions + tar -czvf xine-lib-1.1.20.1-i686.tar.gz $PACKAGE package_descriptions fi do_clean } @@ -104,7 +104,7 @@ build_pentium() { echo "*****************************************************" echo - echo "building slack for xine-lib 1.1.20" + echo "building slack for xine-lib 1.1.20.1" echo echo "current architecture:pentium" echo "slackware package will be copied to ./slack directory" @@ -114,7 +114,7 @@ export XINE_BUILD=i586-pc-linux-gnu do_build if test "$DIE" -eq 0; then - tar -czvf xine-lib-1.1.20-i586.tar.gz $PACKAGE package_descriptions + tar -czvf xine-lib-1.1.20.1-i586.tar.gz $PACKAGE package_descriptions fi do_clean } @@ -125,7 +125,7 @@ build_k6() { echo "*****************************************************" echo - echo "building slack for xine-lib 1.1.20" + echo "building slack for xine-lib 1.1.20.1" echo echo "current architecture:k6" echo "slackware package will be copied to ./slack directory" @@ -135,7 +135,7 @@ export XINE_BUILD=k6-pc-linux-gnu do_build if test "$DIE" -eq 0; then - tar -czvf xine-lib-1.1.20-k6.tar.gz $PACKAGE package_descriptions + tar -czvf xine-lib-1.1.20.1-k6.tar.gz $PACKAGE package_descriptions fi do_clean } @@ -146,7 +146,7 @@ build_k7() { echo "*****************************************************" echo - echo "building slack for xine-lib 1.1.20" + echo "building slack for xine-lib 1.1.20.1" echo echo "current architecture:k7" echo "slackware package will be copied to ./slack directory" @@ -156,7 +156,7 @@ export XINE_BUILD=athlon-pc-linux-gnu do_build if test "$DIE" -eq 0; then - tar -czvf xine-lib-1.1.20-k7.tar.gz $PACKAGE package_descriptions + tar -czvf xine-lib-1.1.20.1-k7.tar.gz $PACKAGE package_descriptions fi do_clean } @@ -172,7 +172,7 @@ build_pentium build_k6 build_k7 - mv -f $CWD/xine-lib-1.1.20.tar.gz $SLCK + mv -f $CWD/xine-lib-1.1.20.1.tar.gz $SLCK } @@ -184,7 +184,7 @@ mkdir -p $SLCK rm -f config.cache && ./autogen.sh && make dist $barch - mv -f $CWD/xine-lib-1.1.20.tar.gz $SLCK + mv -f $CWD/xine-lib-1.1.20.1.tar.gz $SLCK } case "$1" in | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/misc/build_rpms.sh ^ |
| @@ -14,14 +14,14 @@ fi if [ `expr $RPMVERSION` -lt 400 ]; then - RPM_BA="rpm -ba -ta ./xine-lib-1.1.20.tar.gz" - RPM_BB="rpm -bb -ta ./xine-lib-1.1.20.tar.gz" + RPM_BA="rpm -ba -ta ./xine-lib-1.1.20.1.tar.gz" + RPM_BB="rpm -bb -ta ./xine-lib-1.1.20.1.tar.gz" elif [ `expr $RPMVERSION` -lt 420 ]; then - RPM_BA="rpm -ta ./xine-lib-1.1.20.tar.gz -ba" - RPM_BB="rpm -ta ./xine-lib-1.1.20.tar.gz -bb" + RPM_BA="rpm -ta ./xine-lib-1.1.20.1.tar.gz -ba" + RPM_BB="rpm -ta ./xine-lib-1.1.20.1.tar.gz -bb" else - RPM_BA="rpmbuild -ta ./xine-lib-1.1.20.tar.gz -ba" - RPM_BB="rpmbuild -ta ./xine-lib-1.1.20.tar.gz -bb" + RPM_BA="rpmbuild -ta ./xine-lib-1.1.20.1.tar.gz -ba" + RPM_BB="rpmbuild -ta ./xine-lib-1.1.20.1.tar.gz -bb" fi ##VERSION="1.1.20" @@ -33,7 +33,7 @@ echo "*****************************************************" echo -echo "building rpm for xine-lib 1.1.20" +echo "building rpm for xine-lib 1.1.20.1" echo echo "current architecture:pentium" echo "rpms will be copied to ./rpms directory" @@ -44,13 +44,13 @@ eval $RPM_BA -mv /usr/src/redhat/SRPMS/libxine-1.1.20-$DATE.src.rpm ./rpms/ -mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20-$DATE.i586.rpm -mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-1.1.20-$DATE.i386.rpm ./rpms/$PKGNAME-devel-1.1.20-$DATE.i586.rpm +mv /usr/src/redhat/SRPMS/libxine-1.1.20.1-$DATE.src.rpm ./rpms/ +mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20.1-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20.1-$DATE.i586.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-1.1.20.1-$DATE.i386.rpm ./rpms/$PKGNAME-devel-1.1.20.1-$DATE.i586.rpm echo "*****************************************************" echo -echo "building rpm for xine-lib 1.1.20" +echo "building rpm for xine-lib 1.1.20.1" echo echo "current architecture:pentiumpro" echo "rpms will be copied to ./rpms directory" @@ -61,11 +61,11 @@ eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20-$DATE.i686.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20.1-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20.1-$DATE.i686.rpm echo "*****************************************************" echo -echo "building rpm for xine-lib 1.1.20" +echo "building rpm for xine-lib 1.1.20.1" echo echo "current architecture:k6" echo "rpms will be copied to ./rpms directory" @@ -76,11 +76,11 @@ eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20-$DATE.k6.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20.1-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20.1-$DATE.k6.rpm echo "*****************************************************" echo -echo "building rpm for xine-lib 1.1.20" +echo "building rpm for xine-lib 1.1.20.1" echo echo "current architecture:k7" echo "rpms will be copied to ./rpms directory" @@ -91,6 +91,6 @@ eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20-$DATE.k7.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-1.1.20.1-$DATE.i386.rpm ./rpms/$PKGNAME-1.1.20.1-$DATE.k7.rpm echo "Done." | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/misc/xine-lib.spec ^ |
| @@ -1,6 +1,6 @@ %define shortname libxine %define name libxine1 -%define version 1.1.20 +%define version 1.1.20.1 %define release 0 %define major 1 @@ -80,7 +80,7 @@ License: GPL Group: Development/Libraries URL: http://www.xine-project.org -Source: http://prdownloads.sourceforge.net/xine/xine-lib-1.1.20.tar.bz2 +Source: http://prdownloads.sourceforge.net/xine/xine-lib-1.1.20.1.tar.bz2 Packager: Manfred Tremmel <Manfred.Tremmel@iiv.de> Obsoletes: xine Obsoletes: xine-lib @@ -662,7 +662,7 @@ %prep -%setup -q -n xine-lib-1.1.20 +%setup -q -n xine-lib-1.1.20.1 %build export CFLAGS="${RPM_OPT_FLAGS}" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/cs.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/cs.po ^ |
| @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xine-lib 1.1.18\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2010-10-10 01:06+0200\n" "Last-Translator: František Dvořák <valtri@civ.zcu.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -548,7 +548,7 @@ msgid "xine audio output plugin using esound" msgstr "modul zvukového výstupu xine použije esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "modul zvukového výstupu xine do souboru" @@ -855,17 +855,17 @@ 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/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: pokus o otevření kodeku null\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: nelze otevřít dekodér\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: nelze otevřít dekodér\n" @@ -875,46 +875,46 @@ 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/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: nepodporovaný formát, DR1 zakázáno.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format 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/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, 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/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: nelze otevřít dekodér\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: nelze otevřít dekodér (2. průchod)\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: přímé renderování povoleno\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, 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/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "kvalita dodatečného zpracování MPEG-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -929,11 +929,11 @@ "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/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "Počet vláken na dekódování videa FFmpegem" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -947,11 +947,11 @@ "dekódovací vlákno na jeden logický procesor (typicky od 1 do 4).\n" "Změna tohoto nastavení se projeví při přehrávání následujícího videa." -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "Přeskakování filtru ve smyčce" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -967,12 +967,12 @@ "'all' (všechny).Výchozí hodnota ponechává rozhodnutí na implementaci.\n" "Změna tohoto nastavení se projeví při přehrávání následujícího videa." -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "Upřednostnit rychlost před vyhověním specifikacím" # "zneuctívají specifikace kodeku" ;-) -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1720,15 +1720,15 @@ 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:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "digitální zvukové CD (CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "zařízení použité pro zvukové CD" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1736,11 +1736,11 @@ "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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "dotazovat se CDDB" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1754,11 +1754,11 @@ "internetového serveru, který by pak mohl znát profil vašich poslechových " "zvyků." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "jméno serveru CDDB" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1771,21 +1771,21 @@ "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:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "port serveru CDDB" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 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:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "adresář se záznamy CDDB" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1797,11 +1797,11 @@ "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:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "zpomalit diskovou jednotku na tento rychlostní faktor" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2238,19 +2238,19 @@ msgid "file input plugin" msgstr "modul pro vstup ze souboru" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "počáteční umístění při procházení souborů" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 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_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "ukazovat skryté soubory" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2411,45 +2411,45 @@ msgid "pnm streaming input plugin" msgstr "vstupní modul pnm pro streamovaná data" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, 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:738 +#: src/input/input_pvr.c:744 #, 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:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: chyba čtení (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, 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:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format 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:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format 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:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "Vstupní modul WinTV-PVR 250/350" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 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:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "Cesta k zařízení vaší karty WinTV." @@ -2982,16 +2982,16 @@ "1024: nehybný snímek\n" "2048: debugování z VCDINFO\n" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "POMÓC! Zvukový ovladač pouze mono?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "hlasitost A/52" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -3002,11 +3002,11 @@ "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_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "povolit zhuštění dynamického rozsahu A/52" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -3016,11 +3016,11 @@ "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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "redukce zvuku do 2.0 surround stereo" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4387,34 +4387,34 @@ "video_out_syncfb: chyba. (formát YV12 není podporován vaší grafickou " "kartou)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format 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:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format 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:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format 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:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format 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:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format 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:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4422,7 +4422,7 @@ msgstr "" "video_out_syncfb: ruší se. (modul SyncFB nepodporuje YV12, YUY2 ani RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4433,27 +4433,27 @@ "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:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "Výchozí počet opakování snímku" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 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:1070 +#: src/video_out/video_out_syncfb.c:1067 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:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "Jméno zařízení SyncFB" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4636,7 +4636,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xcbxv: Rozšíření Xv není přítomno.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "%s: nepodařilo se otevřít Xv port %d - najde se automaticky\n" @@ -4697,12 +4697,12 @@ msgstr "video_out_xcbxv: tento adaptér podporuje formát yuy2.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "metoda korekce prokládání (zavrženo)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4868,10 +4868,10 @@ 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:1432 -#, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" -msgstr "%s: nepodařilo se otevřít Xv port %<PRId32> - vyhledá se automaticky\n" +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 +#, fuzzy, c-format +msgid "%s: could not open Xv port %lu - autodetecting\n" +msgstr "%s: nepodařilo se otevřít Xv port %d - najde se automaticky\n" #: src/video_out/video_out_xv.c:1451 #, c-format @@ -4904,16 +4904,16 @@ 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_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 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/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: rozšíření XvMC není přítomno.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4922,7 +4922,7 @@ "video_out_xvmc: rozšíření Xv je přítomno, ale nebyl nalezen použitelný port " "yuv12\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4931,22 +4931,22 @@ "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:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " idct a akcelerace kompenzace pohybu\n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " pouze akcelerace kompenzace pohybu\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " žádná podpora XvMC\n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " S Overlay = %d; UnsignedIntra = %d.\n" @@ -5424,35 +5424,35 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "Selhalo načtení konfigurace ze souboru '%s': %s\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, 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/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: VAROVÁNÍ: vaše konfigurace nebude uložena\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: VAROVÁNÍ: zápis konfigurace do %s selhal\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, 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/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, 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/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, 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" @@ -5559,31 +5559,31 @@ 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:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: čekání ukončeno\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: čekání selhalo: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "selhalo získání stavu soketu" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Přístup odepřen\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Soubor nenalezen\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Spojení odmítnuto\n" @@ -5732,12 +5732,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: použije se demultiplexor '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, 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:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5746,7 +5746,7 @@ "load_plugins: automatické testování zvukového výstupu nenašlo žádný " "použitelný zvukový ovladač.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" @@ -6348,3 +6348,7 @@ #, c-format msgid "Benchmarking memcpy methods (smaller is better):\n" msgstr "Výkonnostní testování metod memcpy (menší je lepší):\n" + +#~ msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +#~ msgstr "" +#~ "%s: nepodařilo se otevřít Xv port %<PRId32> - vyhledá se automaticky\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/de.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/de.po ^ |
| @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xine-lib 1.1.6\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2007-04-18 11:00+0200\n" "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n" "Language-Team: German <de@li.org>\n" @@ -547,7 +547,7 @@ msgid "xine audio output plugin using esound" msgstr "xine Soundausgabe benutzt esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "xine Date Soundausgabe" @@ -851,17 +851,17 @@ msgstr "" "ffmpeg_audio_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: Besuche NULl-Codec zu öffnen\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: Konnte Dekoder nicht öffnen\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: Konnte Dekoder nicht öffnen\n" @@ -871,47 +871,47 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "dvaudio: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" "ffmpeg_video_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: Direktausgabe aktiviert\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, 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/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "Qualität der MPEG-4 Nachbearbeitungsstufe" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -925,11 +925,11 @@ "kann zu starke Nachbearbeitung das Bild durch zu starkes verwischen " "verschlechtern." -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -938,11 +938,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -952,11 +952,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1711,15 +1711,15 @@ msgstr "" "input_cdda: Kann keine Verbindung zum CDDB-Server '%s:%d' (%s) herstellen.\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "CD Digital Audio (CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "Gerät für CD-Audio" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1727,11 +1727,11 @@ "Pfadangabe zum Gerät (normalerweise CD oder DVD Laufwerk), das zur " "Wiedergabe von Audio-CDs benutzt werden soll." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "CDDB abfragen" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1744,11 +1744,11 @@ "Informationen von einem Internetserver bezogen werden, der ein Profil Ihrer " "Hörgewohnheiten erstellen kann." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "CDDB Servername" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1760,19 +1760,19 @@ "Ihren Hörgewohnheiten erhält und bösartige Antworten senden kann. Geben Sie " "nur einen Server ihres Vertrauens an." -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "CDDB Serverport" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 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:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "CDDB Cacheverzeichnis" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1785,11 +1785,11 @@ "Namen innerhalb dieses Verzeichnises angelegt werden. Stellen Sie sicher, " "daß das Verzeichnis nur für CDDB Zwischenpufferung genutzt wird." -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "Laufwerk auf diesen Faktor verlangsamen" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2227,19 +2227,19 @@ msgid "file input plugin" msgstr "Datei Plugin" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "Startverzeichnis für Dateisuche" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 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_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "Versteckte Dateien anzeigen" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2399,45 +2399,45 @@ msgid "pnm streaming input plugin" msgstr "PNM Streaming-Plugin" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, 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:738 +#: src/input/input_pvr.c:744 #, 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:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: Lesefehler (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, 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:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format 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:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format 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:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "WinTV-PVR 250/350 Plugin" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 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:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "Pfadangame zum Gerät der WinTV-Karte" @@ -2973,16 +2973,16 @@ "1024: Standbilder\n" "2048: Debugging von VCDINFO\n" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "HILFE! Ein nur-Mono-Audiogerät?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "A/52 Lautstärke" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2994,11 +2994,11 @@ "dekodiert sind und nachfolgende Operationen wie Heruntermischen direkt mit " "diesen Audiodaten arbeiten können." -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "Benutze dynamische A/52 Bereichskomprimierung" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -3009,11 +3009,11 @@ "ermöglicht ein besseres Verständnis des Tons in lauten Umgebungen, ohne " "dabei andere zu stören." -#: src/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "Heruntermischen zu Zweikanal Stereo Raumklang" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4386,34 +4386,34 @@ msgstr "" "video_out_syncfb: Fehler. (YV12 wird von der Grafikkarte nicht unterstützt)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format 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:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format 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:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format 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:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format 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:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format 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:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4422,7 +4422,7 @@ "video_out_syncfb: Abbruch. (SyncFB unterstützt weder YV12, YUY2 noch " "RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4433,26 +4433,26 @@ "das SyncFB-Kernelmodul veraltet scheint. Lesen Sie bitte README.syncfb zu " "Updateinformationen.)\n" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "Standardanzahl von Bildwiederholungen" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 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:1070 +#: src/video_out/video_out_syncfb.c:1067 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:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "SyncFB Gerätename" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4636,7 +4636,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xcbxv: Xv-Erweiterung nicht vorhanden.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4695,12 +4695,12 @@ msgstr "video_out_xcbxv: Adapter unterstützt YUY2 Format.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "Deinterlace-Methode (veraltet)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4865,9 +4865,9 @@ 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:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4900,16 +4900,16 @@ 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_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "xine Videoausgabe benutzt XvMC XVideo-Erweiterung" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4918,7 +4918,7 @@ "video_out_xvmc: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer " "YUV12-Port gefunden.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4927,22 +4927,22 @@ "video_out_xvmc: Benutze Xv-Port %ld von Adapter %s for Hardware-" "Farbraumtransformation und Skalierung\n" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " IDCT und Bewegungskompensationsbeschleunigung \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " nur Bewegungskompensationsbeschleunigung\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " Keine XvMC-Unterstützung \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " Mit Überlagerung = %d; UnsignedIntra = %d.\n" @@ -5421,34 +5421,34 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: Öffnen der DVB-Kanaldatei '%s' schlug fehl\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, 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:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: WARNUNG: Ihre Konfigurationsdatei wird nicht gesichert\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, 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:1154 +#: src/xine-engine/configfile.c:1156 #, 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:1155 +#: src/xine-engine/configfile.c:1157 #, 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:1290 +#: src/xine-engine/configfile.c:1292 #, 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" @@ -5557,31 +5557,31 @@ 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:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: Warten aufgegeben\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: Warten fehlgeschlagen: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "Status des Sockets konnte nicht ermittelt werden" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Zugriff verweigert\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Datei nicht gefunden\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Verbindung verweigert\n" @@ -5731,12 +5731,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: Benutze Demultiplexer '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, 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:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5745,7 +5745,7 @@ "load_plugins: Suche nach Audio-Ausgabe fand keinen benutzbaren " "Audiotreiber.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/en_US.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/en_US.po ^ |
| @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xine-lib.hg\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2009-01-15 19:04+0000\n" "Last-Translator: Not translated <null@example.com>\n" "Language-Team: en_US <none>\n" @@ -489,7 +489,7 @@ msgid "xine audio output plugin using esound" msgstr "" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "" @@ -727,17 +727,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -747,46 +747,46 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -795,11 +795,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -808,11 +808,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -822,11 +822,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1436,25 +1436,25 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1463,11 +1463,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1475,19 +1475,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1495,11 +1495,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1854,19 +1854,19 @@ msgid "file input plugin" msgstr "" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2017,45 +2017,45 @@ msgid "pnm streaming input plugin" msgstr "" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2537,16 +2537,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2554,22 +2554,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3615,39 +3615,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3655,26 +3655,26 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -3830,7 +3830,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -3880,12 +3880,12 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -3999,9 +3999,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4029,45 +4029,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4451,32 +4451,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4577,31 +4577,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "" @@ -4734,19 +4734,19 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/eo.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/eo.po ^ |
| @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: eo\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2007-05-24 17:57+0200\n" "Last-Translator: Antonio C. Codazzi <f_sophia@libero.it>\n" "Language-Team: <it@li.org>\n" @@ -500,7 +500,7 @@ msgid "xine audio output plugin using esound" msgstr "aŭdeliga xine-kromaĵo uzanta esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "kromaĵo de aŭdeligo por xine dosiero" @@ -757,17 +757,17 @@ "ffmpeg_audio_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x" "%X\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: mi provas malfermi nulan kodaĵon\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: estas neeble malfermi malkodilon\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: estas neeble malfermi malkodilon\n" @@ -777,50 +777,50 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "dvaudio: agordo de bufro je %d por eviti troon.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" "ffmpeg_video_dec: nesubtenita formato de bildero, DR1 estas malebligita.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" "ffmpeg_video_dec: nesubtenitaj dimensioj de bildero, DR1 estas malebligita.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" "ffmpeg_video_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x" "%X\n" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: estas neeble malfermi malkodilon\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: estas neeble malfermi malkodilon\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: ebligita rekta bildigo\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "ffmpeg_video_dec: agordo de bufro je %d por eviti troon.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "kvalito de MPEG-4 postprocesado" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -834,11 +834,11 @@ "altkvalita, grava postprocezado povas igi bildon pli aĉa ĉar ĝi estas tro " "malfokusita." -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -847,11 +847,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -861,11 +861,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1519,25 +1519,25 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: malsukcesa konekto kun cddb servilo '%s:%d' (%s).\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "KD Diĝita Aŭdo (alie CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "informmendo de CDDB" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1546,11 +1546,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "Nomo de servilo de CDDB" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1558,19 +1558,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "Servilpordo de CDDB" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "Dosierujo de kaŝmemoro de CDDB" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1578,11 +1578,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "Malrapidigu disk-turnilon per faktoro je tiu ĉi rapideco" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1951,19 +1951,19 @@ msgid "file input plugin" msgstr "eniga kromaĵo de dosiero" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "startpunkto de foliumo" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "listo de kaŝitaj dosieroj" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2119,45 +2119,45 @@ msgid "pnm streaming input plugin" msgstr "eniga kromaĵo por pmn-datumstio" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: eraro dum kreado de dosiero pvr (%s)\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: eraro dum malfermado de dosiero pvr (%s)\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: eraro de lego (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: eraro dum malfermado de aparato %s\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_G_CODEC malsukcesis, ĉu API estas ŝanĝita?\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_S_CODEC malsukcesis, ĉu API estas ŝanĝita?\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "eniga kromaĵo WinTV-PVR 250/350" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "aparato uzata por WinTV-PVR 250/350 (pvr-kromaĵo)" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "Raŭto por la aparato de WinTV-karto." @@ -2647,16 +2647,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "HELPO! Ĉu nur unufonia aŭdozorgilo?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "A/52 laŭteco" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2664,22 +2664,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "uzu A/52 dinamikan kunpremon" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "downmix aŭdo kun 2 (surround) stereaj kanaloj" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3805,34 +3805,34 @@ msgstr "" "video_out_syncfb: eraro. (YV12 ne estas subtenita de via grafika karto)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" "video_out_syncfb: informo. (SyncFB-modjulo subtenas YUV 4:2:0 (3 plano))\n" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" "video_out_syncfb: informo. (SyncFB-modjulo subtenas YUV 4:2:0 (2 plano))\n" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "video_out_syncfb: informo. (SyncFB-modjulo subtenas YUV 4:2:2)\n" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "video_out_syncfb: informo. (SyncFB-modjulo subtenas YUY2))\n" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "video_out_syncfb: informo. (SyncFB-modjulo subtenas RGB565)\n" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -3840,7 +3840,7 @@ msgstr "" "video_out_syncfb: ĉesigo. (SyncFB-modjulo ne subtenas YV12, YUY2 aŭ RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3851,28 +3851,28 @@ "ĉar via SyncFB-kernomodjulo ŝajnas kadukiĝinta. Bonvolu legi README.syncfb " "por informoj pri ĝisdatigo de ĝi.)\n" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "defaŭlta nombro da ripetoj de filmeroj" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "Tio difinas kiom da fojoj estos unu filmero estos vidigita sekve." -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" "videoeliga kromaĵo de xine estas uzanta la SyncFB-modjulon por Matrox G200/" "G400 kartoj" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "Nomo de SyncFB-aparato" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4049,7 +4049,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xv: Xv-etendilo neĉeestas.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4104,12 +4104,12 @@ msgstr "video_out_xv: tiu ĉi adaptilo subtenas formaton yuy2.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "metodo de malplektado (evitinda)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4241,9 +4241,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "video_out_xv: Xv-etendilo neĉeestas.\n" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4276,16 +4276,16 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "video_out_xv: tiu ĉi adaptilo subtenas formaton yuy2.\n" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "videoeliga kromaĵo uzas videan etendilon de XvMC X" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: etendilo de XvMC neĉeestas.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4294,7 +4294,7 @@ "video_out_xvmc: la Xv-etendilo ĉeestas sed estas neeble trovi uzeblan yuv12 " "pordon.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4303,22 +4303,22 @@ "video_out_xvmc: uzante Xv-pordon %ld el adaptilo %s\n" " por hardvara konverto de kolorspaco kaj skalado\n" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " idct kaj kompensado por akcelo de movo \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " nur kompensado por akcelo de movo\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " neniu XvMC-subteno \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " Kun Surmeto = %d; NesignitaIntra = %d.\n" @@ -4732,33 +4732,33 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: malsukcesis malfermo de dosiero de dvb-kanalo '%s'\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "configfile: WARNING: reservado de configfile en %s malsukcesis\n" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ATENTU: via agordaĵo ne estos konservita\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: ATENTU: skribo de agordaĵo en %s malsukcesis\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ATENTU: formovovo de probable difektita dosiero de agordoj %s\n" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: ATENTU: kontrolu restaŭrdosieron %s\n" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: ero '%s' ne devas esti modifita el MRL\n" @@ -4865,31 +4865,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "input_rip: eraro dum malfermado de dosiero %s: %s\n" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: nuligita atendado\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: atendado malsukcesis: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "malsukcesis akiro de informoj pri stato de la kontaktoscatolo" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Rifuzita permeso\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Netrovita dosiero\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Rifuzita konektado\n" @@ -5036,12 +5036,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: uzante malmuksoron '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: ŝargo de aŭdeliga kromaĵo malsukcesis <%s>\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5049,7 +5049,7 @@ msgstr "" "load_plugins: mem-rekonado de aŭdeligo ne trovis uzelban aŭdozorgilon.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/es.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/es.po ^ |
| @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: xine-lib.hg\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2008-04-02 01:05+0200\n" "Last-Translator: Carlos E. R. M. <carloser@users.sourceforge.net>\n" "Language-Team: Spanish <none>\n" @@ -560,7 +560,7 @@ msgid "xine audio output plugin using esound" msgstr "complemento de xine de salida de audio usando esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "complemento de xine de salida de audio a fichero" @@ -887,17 +887,17 @@ "ffmpeg_audio_dec: no pude encontrar el decodificador ffmpeg para el tipo de " "tampón 0x%X\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: intentando abrir códec nulo\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: no pude abrir el decodificador\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: no pude abrir el decodificador\n" @@ -909,51 +909,51 @@ "dvaudio: incrementando el tamaño de la memoria tampón a %d para evitar el " "desbordamiento.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: formato de cuadro no soportado, DR1 desactivado.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" "ffmpeg_video_dec: dimensiones de cuadro no soportadas, DR1 desactivado.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" "ffmpeg_video_dec: no pude encontrar el decodificador ffmpeg para el tipo de " "tampón 0x%X\n" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: no pude abrir el decodificador\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: no pude abrir el decodificador\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: renderizado directo activado\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" "ffmpeg_video_dec: incrementando el tamaño de la memoria tampón a %d para " "evitar el desbordamiento.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "calidad de postprocesado MPEG-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -967,11 +967,11 @@ "bloque. Para contenido de alta calidad, demasiado postprocesado puede de " "hecho hacer la imagen peor emborronándola demasiado." -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "Conteo de hilos decodificando vídeo FFmpeg" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -985,12 +985,12 @@ "decodificador por cada CPU lógica (típicamente de 1 a 4). Un cambio hará " "efecto cuando se reproduzca el siguiente flujo." -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "Saltarse filtro de bucle" # Cer "saltar" por"skip" suena raro. -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -1007,11 +1007,11 @@ "manos de la implementación.\n" "Un cambio de este ajuste tendrá efecto a la reproducción de siguiente flujo." -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "Elegir velocidad en vez de conformidad con la especificación" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1786,15 +1786,15 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: falló al conectar al servidor cddb '%s:%d' (%s).\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "audio CD digital (alias CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "dispositivo usado para audio CD" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1802,11 +1802,11 @@ "El camino al dispositivo, normalmente un lector de de CD o DVD, que desea " "usar para reproducir CDs de audio." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "consultar la CDDB" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1820,11 +1820,11 @@ "información se obtiene de un servidor en Internet que podría sacar un perfil " "de sus hábitos de escucha." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "nombre del servidor CDDB" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1837,20 +1837,20 @@ "consultas con respuestas maliciosas. Asegúrese de poner un servidor del que " "se pueda fiar." -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "puerto del servidor CDDB" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" "El puerto del servidor usado para obtener la información de título y pista." -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "directorio caché del CDDB" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1863,11 +1863,11 @@ "serán creados en este directorio. Asegúrese de poner un directorio dedicado " "que no se use para ninguna otra cosa que el cacheado del CDDB." -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "enlentecer la unidad de disco a este factor de velocidad" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2318,21 +2318,21 @@ msgid "file input plugin" msgstr "complemento de fichero entrada" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "localización de comienzo de ojeado de ficheros" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" "El ojeador para seleccionar el fichero a reproducir comenzará en esta " "localización." -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "listar ficheros ocultos" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2494,49 +2494,49 @@ msgid "pnm streaming input plugin" msgstr "complemento de flujo de bits pnm de entrada" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: error al crear el archivo pvr (%s)\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: error al abrir el archivo pvr (%s)\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: error de lectura (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: error al abrir el dispositivo %s\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_G_CODEC falló, ¿quizás cambió la API? (interfase para " "programación de aplicaciones)\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_S_CODEC falló, ¿quizás cambió la API? (interfase para " "programación de aplicaciones)\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "complemento de entrada para WinTV-PVR 250/350" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "dispositivo usado para WinTV-PVR 250/350 (complemento pvr)" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "El camino al dispositivo de su tarjeta WinTV." @@ -3087,16 +3087,16 @@ "1024: Cuadro congelado\n" "2048: Depurando desde VCDINFO\n" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "¡AYUDA! ¿¡Un manejador de audio exclusivamente mono-aural?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "Volúmen A/52" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -3108,11 +3108,11 @@ "de modo que las operaciones posteriores como mezclado hacia abajo de canales " "trabajaran en un flujo de bits de audio del volúmen dado." -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "use A/52 compresión de rango dinámico" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -3123,11 +3123,11 @@ "flojos, de modo que puede escuchar el audio en un entorno ruidoso sin " "molestar a nadie." -#: src/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "mezcla reducida de audio a 2 canales estereo envolvente" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4558,32 +4558,32 @@ msgstr "" "video_out_syncfb: error. (YV12 no está soportado por su tarjeta gráfica)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:0 (3 planos))\n" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:0 (2 planos))\n" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUV 4:2:2)\n" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "video_out_syncfb: info. (módulo SyncFB soporta YUY2)\n" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "video_out_syncfb: info. (módulo SyncFB soporta RGB565)\n" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4592,7 +4592,7 @@ "video_out_syncfb: abortando. (módulo SyncFB no soporta YV12, YUY2 ni " "RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4603,11 +4603,11 @@ "porque su módulo del kernel SyncFB parece estar anticuado. Por favor, " "refiérase a README.syncfb para información sobre como actualizarlo.)\n" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "número por defecto de repeticiones de cuadros" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." @@ -4615,18 +4615,18 @@ "Esto especifica cuantas veces se mostrará consecutivamente el mismo cuadro " "de vídeo." -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" "complemento de vídeo de xine usando el módulo SyncFB para tarjetas Matrox " "G200/G400" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "Nombre de dispositivo de SyncFB" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4823,7 +4823,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xcbxv: la extensión Xv no está presente.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "%s: no se pudo abrir el puerto Xv %d - autodetectando\n" @@ -4884,12 +4884,12 @@ msgstr "video_out_xcbxv: éste adaptador soporta el formato yuy2.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "método de desentrelazado (obsolescente)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -5067,9 +5067,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "video_out_xv: la extensión Xv no está presente.\n" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, fuzzy, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "%s: no se pudo abrir el puerto Xv %d - autodetectando\n" #: src/video_out/video_out_xv.c:1451 @@ -5102,16 +5102,16 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "video_out_xv: éste adaptador soporta el formato yuy2.\n" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "complemento de vídeo de xine usando extensión de vídeo X XvMC" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: extensión XvMC no presente.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -5120,7 +5120,7 @@ "video_out_xvmc: la extensión Xv está presente pero no pude encontrar un " "puerto yuv12 usable.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -5129,22 +5129,22 @@ "video_out_xvmc: usando puerto %ld de Xv del adaptador %s\n" " para conversión del espacio de color y escalado en hardware\n" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " compensación de movimiento y aceleración idct \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " sólo compensación de aceleración \n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " sin soporte XvMC \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " Con Overlay = %d; UnsignedIntra = %d.\n" @@ -5640,35 +5640,35 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: falló al abrir el fichero de canales'%s': %s\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: AVISO: la copia de seguridad del fichero de configuración a %s " "falló\n" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: AVISO: su configuración no será guardada\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: AVISO: la escritura de la configuración a %s falló\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: AVISO: eliminando fichero de configuración %s posiblemente roto\n" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: AVISO: debería comprobar el fichero de respaldo %s\n" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: la entrada '%s' no debería ser modificada desde MRL\n" @@ -5780,31 +5780,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "input_rip: error abriendo fichero %s: %s\n" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: espera abandonada\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: falló la espera: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "falló la consecución de un socket" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Permiso denegado\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Fichero no encontrado\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Conexión Rechazada\n" @@ -5958,12 +5958,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: usando desmultiplexor '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: fallé al cargar complemento de salida de audio <%s>\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5972,7 +5972,7 @@ "load_plugins: el auto-probado de salida de audio no encontró ningún driver " "de audio usable audio.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" @@ -6585,3 +6585,7 @@ #, c-format msgid "Benchmarking memcpy methods (smaller is better):\n" msgstr "Evaluando métodos \"memcpy\" (menor es mejor):\n" + +#, fuzzy +#~ msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +#~ msgstr "%s: no se pudo abrir el puerto Xv %d - autodetectando\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/eu.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/eu.po ^ |
| @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: xine-lib-1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2005-02-17 14:29+0100\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: lubrezale <librezale@librezale.org>\n" @@ -557,7 +557,7 @@ msgid "xine audio output plugin using esound" msgstr "xine audio irteera plugina esound erabiliz" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "xine fitxategi audio irteera plugina" @@ -861,17 +861,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, fuzzy, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: ezin da deskodetzailea ireki\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: ezin da deskodetzailea ireki\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: ezin da deskodetzailea ireki\n" @@ -881,46 +881,46 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "dvaudio: bufeera %d -ra handitzen askieza sahiesteko.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, fuzzy, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: ezin da deskodetzailea ireki\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: ezin da deskodetzailea ireki\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: direct reenderizazioa gaiturik\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "ffmpeg_video_dec: bufferra %d -ra handitzen askieza saiesteko.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "MPEG-4 postprozesatze kalitatea" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -929,11 +929,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -942,11 +942,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -956,11 +956,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1670,15 +1670,15 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: huts cddb zerbitzarira konektatzerakoan '%s:%d' (%s).\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "CD Audio Digitala (hemen. CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "CD audio-k erabiliko duen gailua" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1686,11 +1686,11 @@ "Gailuaren bidea, arruntean audio CD erreproduzitzeko erabili nahi duzun CD " "edo DVD gailua." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "CDDB galderak" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1703,11 +1703,11 @@ "Izan kontutan zuk ez baduzu CDDB zerbitzari pribatu bat, informazio hau zure " "ohiturak grabatuko dituen internet ostalari batetatik jasoko da." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "CDDB zerbitzari izena" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1719,20 +1719,20 @@ "entzuteko ohituraz informazioa jaso eta erantzun zitalekin erantzun bait " "dezake. Ziurtatu konfidantza duzun zerbitzari bat izatea." -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "CDDB zerbitzari ataka" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" "Izenburu eta pista informazioa jasotzeko erabiliko den zerbitzari ataka." -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "CDDB katxe karpeta" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1744,11 +1744,11 @@ "sortuko bait dira. Ziurtatu erabiliko den karpeta ez dela honetaz beste " "ezertarako erabiliko." -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "gutxitu diska gailua abiadura faktore honetara" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2131,20 +2131,20 @@ msgid "file input plugin" msgstr "fitxategi sarrera plugina" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "fitxategi kudeatzailearen abiarazte kokalekua" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" "Erreproduzitzeko fitxategi kudeatzailea kokaleu horretan abiaraziko da." -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "bistaratu ezkutatuako fitxategiak" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2303,45 +2303,45 @@ msgid "pnm streaming input plugin" msgstr "pnm korronte sarrera plugina" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: errorea¡pvr fitxategia (%s) sortzerakoan\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: errorea¡pvr fitxategia (%s) irekitzerakoan\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: irakurketa errorea (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: errorea %s gailua irekitzerakoan\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_G_CODEC-ak huts egin du, agian API-a aldatu da?\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_S_CODEC-ak huts egin du, agian API-a aldatu da?\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "WinTV-PVR 250/350 sarrera plugina" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "WinTV-PVR 250/350 (pvr plugin)-ek erabiliko duen gailua" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "WinTV txartelaren gailuaren bidea." @@ -2854,16 +2854,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "LAGUNTZA! mono bakarrik audio kontrolatzailea?\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "A/52 bolumena" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2871,22 +2871,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "A/52 bitarte dinamiko konpresioa" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4030,34 +4030,34 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "video_out_syncfb: errorea. (txartela grafikoak ez du YV12 onartzen)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" "video_out_syncfb: info. (SyncFB moduluak YUV 4:2:0 (3 plano) onartzen du)\n" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" "video_out_syncfb: info. (SyncFB moduluak YUV 4:2:0 (2 plano) onartzen du)\n" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "video_out_syncfb: info. (SyncFB moduluak YUV 4:2:2 onartzen du)\n" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "video_out_syncfb: info. (SyncFB moduluak YUY2 onartzen du)\n" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "video_out_syncfb: info. (SyncFB moduluak RGB565 onartzen du)\n" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4066,7 +4066,7 @@ "video_out_syncfb: uzten. (SyncFB moduluak ez du YV12, YUY2 edo RGB565 " "onartzen)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4074,29 +4074,29 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "marko errepikatze lehenetsiriko kopurua" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" "Bideo marko bat gelditu gabe zenbat aldiz errepikatu behar den ezartzen du." -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" "xine bideo irteera plugina Matrox G200/G400 txartelen SyncFB modulua " "erabiliaz" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "SyncFB gailu izena" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4258,7 +4258,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xv: Xv luzapena ez dago.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4311,12 +4311,12 @@ msgstr "video_out_xv: adaptadoreak yuy2 formatua onartzen du.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "ez-elkarlituriko metodoa (zaharkiturik)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4431,9 +4431,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "video_out_xv: Xv luzapena ez dago.\n" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4464,45 +4464,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "video_out_xv: adaptadoreak yuy2 formatua onartzen du.\n" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "xineo bideo irteera plugina XvMC X bideo luzapena erabiltzen" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: XvMC luzapena ez dago.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " ez da XvMC onartzen \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4898,36 +4898,36 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: huts '%s' dvb kanal fitxategia irekitzerakoan\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: ABISUA: %s-en konfigurazio fitxategia segurtasun kopia egiten\n" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ABISUA: zure konfigurazioa ezin da gorde\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: ABISUA: huts %s konfigurazioa gordetzerakoan\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ABISUA: agian apurturiko %s konfigurazio fitxategia ezabatzen\n" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" "configfile: ABISUA: zuk segurtasun kopia %s fitxategia egiaztatu beharko " "zenuke\n" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: ¡'%s' sarrera ezin MRL-tik aldatu\n" @@ -5032,31 +5032,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "input_rip: errorea %s fitxategia irekitzerakoan: %s\n" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, fuzzy, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: Baimena ukaturik\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, fuzzy, c-format msgid "io_helper: waiting failed: %s\n" msgstr "input_rip: bilaketak huts egin du: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "huts soket egoera eskuratzerakoan" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Baimena ukaturik\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Fitxategia ez da aurkitu\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Konexioa Ukaturik\n" @@ -5195,12 +5195,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: huts <%s> audio irteera plugina kargatzerakoan\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5209,7 +5209,7 @@ "load_plugins: audio irteera auto-frogak ez du adio kontrolatzailerik " "aurkitu.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, fuzzy, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/fr.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/fr.po ^ |
| @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xine-lib 1.1.9\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2008-01-01 15:18+0100\n" "Last-Translator: Christophe Giraud <chris256gnu@gmail.com>\n" "Language-Team: french <fr@li.org>\n" @@ -561,7 +561,7 @@ msgid "xine audio output plugin using esound" msgstr "plugin de sortie audio xine utilisant esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "plugin de sortie audio xine utilisant un fichier " @@ -814,17 +814,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -834,47 +834,47 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "dvaudio: augmentation du buffer à %d pour éviter sa saturation.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" "ffmpeg_video_dec: augmentation du buffer à %d pour éviter sa saturation.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "Qualité du post-traitement MPEG-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -890,11 +890,11 @@ "vidéo de haute qualité, un post-traitement trop important peut actuellement " "dégrader l'image en la rendant plus floue . " -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -903,11 +903,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -917,11 +917,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1542,15 +1542,15 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: impossible de se connecter au serveur cddb '%s:%d' (%s).\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "périphérique utilisé pour les cd audio" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1558,11 +1558,11 @@ "Le chemin d'accès vers le périphérique, généralement un lecteur CD ou DVD, " "choisissez celui que vous souhaitez utiliser pour lire vos CD audio." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1571,11 +1571,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "Nom du serveur CDDB" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1583,19 +1583,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "Port du serveur CDDB " -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1603,11 +1603,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1964,19 +1964,19 @@ msgid "file input plugin" msgstr "" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "lister les fichiers cachés" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2129,47 +2129,47 @@ msgid "pnm streaming input plugin" msgstr "" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: erreur à la création du fichier pvr (%s)\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: erreur à l'ouverture du fichier pvr (%s)\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: erreur de lecture (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: erreur à l'ouverture du périphérique %s\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_G_CODEC a échoué, peut-être que l' API a changé ?\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_S_CODEC a échoué, peut-être que l' API a changé ?\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "plugin d'entré WinTV-PVR 250/350" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "périphérique utilisé pour WinTV-PVR 250/350 (pvr plugin)" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "Le chemin d'accès vers le périphérique de votre carte WinTV." @@ -2657,16 +2657,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2674,22 +2674,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3743,39 +3743,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3783,26 +3783,26 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -3959,7 +3959,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4009,12 +4009,12 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4128,9 +4128,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4158,45 +4158,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "plugin de sortie video xine utilisant l'extension video XvMC " -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4582,32 +4582,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4708,31 +4708,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "input_rip: erreur à l'ouverture du fichier %s: %s\n" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Permission refusée\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Fichier non trouvé\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Connexion refusée\n" @@ -4867,19 +4867,19 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: utilise le demuxer '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: impossible de charger le plugin de sortie audio <%s>\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/it.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/it.po ^ |
| @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2007-12-24 16:09+0100\n" "Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>\n" "Language-Team: Italian\n" @@ -555,7 +555,7 @@ msgid "xine audio output plugin using esound" msgstr "pluging output audio di xine che usa esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "plugin di uscita audio per xine su file" @@ -869,17 +869,17 @@ "ffmpeg_audio_dec: impossibile trovare il decoder ffmpeg per il tipo di " "buffer 0x%X\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: provando ad aprire un codec nullo.\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: impossibile aprire il decoder.\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: impossibile aprire il decoder.\n" @@ -889,49 +889,49 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "dvaudio: aumentando il buffer a %d per evitare overflow.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: formato frame non supportato, DR1 disabilitato.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" "ffmpeg_video_dec: dimensioni del frame non supportate. DR1 disabilitato.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" "ffmpeg_video_dec: impossibile trovare il decoder ffmpeg per il tipo di " "buffer 0x%X\n" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: impossibile aprire il decoder\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: impossibile aprire il decoder\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: visualizzazione diretta abilitata\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "ffmpeg_video_dec: buffer aumentato a %d per evitare overflow.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "qualità di post-elaborazione MPEG-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -945,11 +945,11 @@ "otnenuto ad alta qualità, una post elaborazione troppo alta può in realtà " "rendere l'immagine peggiore sfocandola troppo." -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "Numero di thread di decodifica FFmpeg" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 #, fuzzy msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" @@ -965,11 +965,11 @@ "(tipicamente da 1 a 4). La modifica avrà effetto alla riproduzione del " "prossimo flusso." -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -979,11 +979,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1759,15 +1759,15 @@ 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/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "CD Audio (CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "dispositivo utilizzato per CD audio" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1775,11 +1775,11 @@ "Il percorso al dispositivo, solitamente un lettore CD o DVD, che si intende " "utilizzare per riprodurre CD audio." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "interroga CDDB" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1793,11 +1793,11 @@ "informazioni sono ricercate su un server internet che può raccogliere un " "profilo delle proprie abitudini d'ascolto." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "nome del server CDDB" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1810,19 +1810,19 @@ "risposte maliziose. Assicuratevi di inserire un server di cui ci si possa " "fidare." -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "porta del server CDDB" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "La porta del server utilizzato per recuperare titoli e tracce." -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "directory cache CDDB" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1834,11 +1834,11 @@ "file con nomi incontrollati. Assicurative di utilizzare una directory " "dedicata non utilizzata per altro oltre al caching CDDB. " -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "rallenta il lettore dischi a questa velocità" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2290,21 +2290,21 @@ msgid "file input plugin" msgstr "plugin di input del file" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "Posizione di partenza del navigatore di file" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" "Il navigatore per selezionare i file da riprodurre partirà da questa " "posizione." -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "elenca i file nascosti" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2466,45 +2466,45 @@ msgid "pnm streaming input plugin" msgstr "plugin di input per lo stream pnm" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: errore creando il file pvr (%s)\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: errore aprendo il file pvr (%s)\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: errore di lettura (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: errore aprendo il dispotivo %s\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_G_CODEC fallito, forse l'interfaccia è cambiata?\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "input_pvr: IVTV_IOC_S_CODEC fallito, forse l'interfaccia è cambiata?\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "WinTV-PVR 250/350 input plugin" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "dispositivo utilizzato per WinTV-PVR 250/350 (pvr plugin)" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "Il percorso al dispositivo della propria scheda WinTV." @@ -3042,16 +3042,16 @@ "1024: Still-frame\n" "2048: Debugging from VCDINFO\n" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "AIUTO! un driver audio solo mono?\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "volume A/52" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -3063,11 +3063,11 @@ "successive operazioni come il mixaggio dei canali funzioneranno su uno " "stream al volume richiesto." -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "usa la compressione dinamica A/52" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -3078,11 +3078,11 @@ "possa ascoltare più facilmente l'audio in un ambiente rumoroso senza " "disturbare." -#: src/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "declassa l'audio a due canali stereo surround" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4415,37 +4415,37 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "video_out_syncfb: errore. (YV12 non supportato dalla scheda grafica)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" "video_out_syncfb: informazione. (il modulo SyncFB supporta YUV 4:2:0 (3 " "piani))\n" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" "video_out_syncfb: informazione. (il modulo SyncFB supporta YUV 4:2:0 (2 " "piani))\n" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" "video_out_syncfb: informazione. (il modulo SyncFB supporta YUV 4:2:2)\n" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "video_out_syncfb: informazione. (il modulo SyncFB supporta YUY2)\n" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "video_out_syncfb: informazione. (il modulo SyncFB supporta RGB565)\n" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4454,7 +4454,7 @@ "video_out_syncfb: annullamento. (il modulo non supporta YV12, YUY2 o " "RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4465,11 +4465,11 @@ "disponibile perché il modulo SyncFB sembra obsoleto. Riferirsi a README." "syncfb per informazioni su come aggiornarlo.)\n" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "numero predefinito di ripetizioni dei frame" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." @@ -4477,18 +4477,18 @@ "Specifica quante volte un singolo frame video sarà visualizzato " "consecutivamente." -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" "plugin di uscita video per xine utilizzante il modulo SyncFB per schede " "Matrox G200/G400" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "nome del dispositivo SyncFB" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4675,7 +4675,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xcbxv: estensione Xv non presente.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4734,12 +4734,12 @@ msgstr "video_out_xcbxv: questo dispositivo supporta il formato yuv2.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "metodo di deinterlacciamento (deprecato)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4908,9 +4908,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "video_out_xv: estensione Xv non presente.\n" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4943,16 +4943,16 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "video_out_xv: questo dispositivo supporta il formato yuv2.\n" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "plugin di output video per xine utilizzante l'estensione X video XvMC" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: estensione XvMC non presente.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4961,7 +4961,7 @@ "video_out_xvmc: estensione XV presente ma non è stato possibile trovare una " "porta yuv12 utilizzabile.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4970,22 +4970,22 @@ "video_out_xxmc: utilizzando la porta Xv %ld dal dispositivo %s\n" " per la conversione di colori e il ridimensionamento hardware.\n" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " accelerazione idct e compensazione del movimento \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " solo accelerazione della compensazione di movimento\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " nessun supporto XvMC \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " Con overlay = %d; UnsignedIntra = %d.\n" @@ -5474,37 +5474,37 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: apertura file canali DVB non riuscita '%s': %s\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: ATTENZIONE: copia di backup del file di configurazione in %s " "fallita.\n" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: ATTENZIONE: la propria configurazione non sarà salvata.\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" "configfile: ATTENZIONE: scrittura della configurazione in %s fallita.\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: ATTENZIONE: rimozione del file di configurazione %s " "possibilmente rovinato.\n" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: ATTENZIONE: si controlli il file di backup %s.\n" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: la voce '%s' non deve essere modificata da MRL\n" @@ -5614,31 +5614,31 @@ 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:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: attesa annullata\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: attesa fallita: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "impossibile recuperare lo stato del socket" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: Permesso negato\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: File non trovato\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Connessionr rifiutata\n" @@ -5790,12 +5790,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: utilizzo del demuxer '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: caricamento del plugin output audio fallito <%s>\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5804,7 +5804,7 @@ "load_plugins: il riconoscimento automatico dell'output audio non ha trovato " "alcun driver audio utilizzabile.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/ja.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/ja.po ^ |
| @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xine-lib 1.1.19\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2010-07-31 01:14+0700\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -518,7 +518,7 @@ msgid "xine audio output plugin using esound" msgstr "" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 #, fuzzy msgid "xine file audio output plugin" msgstr "main: 音声出力プラグイン<%s> を探索中\n" @@ -761,17 +761,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -781,47 +781,47 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 #, fuzzy msgid "MPEG-4 postprocessing quality" msgstr "高 (普通の品質)" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -830,11 +830,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -843,12 +843,12 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 #, fuzzy msgid "Skip loop filter" msgstr "高域通過フィルタ" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -858,11 +858,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1483,27 +1483,27 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 #, fuzzy msgid "device used for CD audio" msgstr "CD-ROM ドライブとして使用するデバイス" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 #, fuzzy msgid "query CDDB" msgstr "Query status=%d\n" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1512,11 +1512,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "CDDBサーバ名" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1524,19 +1524,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "CDDBサーバのポート番号" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "CDDBキャッシュディレクトリ" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1544,11 +1544,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1914,20 +1914,20 @@ msgid "file input plugin" msgstr "入力ファイルが縮んだ" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 #, fuzzy msgid "file browsing start location" msgstr " --sort-by-file ファイルで出力をソート\n" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "隠しファイルを表示する" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2091,45 +2091,45 @@ msgid "pnm streaming input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, fuzzy, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "%s エラー: 適切な入力ファイル %s が必要です\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, fuzzy, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "ファイルをオープンする際にエラーが発生しました。" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, fuzzy, c-format msgid "input_pvr: read error (%s)\n" msgstr "標準入力上の読み込みエラーです" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2632,17 +2632,17 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 #, fuzzy msgid "A/52 volume" msgstr "--ボリュームヘッダ--\n" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2650,22 +2650,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3735,39 +3735,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3775,28 +3775,28 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 #, fuzzy msgid "default number of frame repetitions" msgstr "デフォルトのエントリにリビジョン番号がありません" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 #, fuzzy msgid "SyncFB device name" msgstr "%s: デバイス名は `%s' です\n" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -3958,7 +3958,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, fuzzy, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "Gaim は監視するポートを開けませんでした。" @@ -4009,13 +4009,13 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 #, fuzzy msgid "deinterlace method (deprecated)" msgstr "廃止予定の関数呼び出しです" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4129,10 +4129,10 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 -#, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" -msgstr "" +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 +#, fuzzy, c-format +msgid "%s: could not open Xv port %lu - autodetecting\n" +msgstr "Gaim は監視するポートを開けませんでした。" #: src/video_out/video_out_xv.c:1451 #, c-format @@ -4159,45 +4159,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, fuzzy, c-format msgid " no XvMC support \n" msgstr " -L, --no-lirc LIRC サポートを無効にする\n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, fuzzy, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "パターンをオーバーレイで使う" @@ -4589,32 +4589,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "'%s' から設定ファイルのパスを取得できませんでした" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4715,32 +4715,32 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "ファイルをオープンする際にエラーが発生しました。" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, fuzzy, c-format msgid "io_helper: waiting failed: %s\n" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 #, fuzzy msgid "failed to get status of socket" msgstr "クラスの状態を取得できません:" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, fuzzy, c-format msgid "io_helper: File not found\n" msgstr "日付サンプルファイルが見つかりません" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, fuzzy, c-format msgid "io_helper: Connection Refused\n" msgstr "サーバから接続を拒絶されました。応答: %s" @@ -4875,19 +4875,19 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/libxine1.pot ^ |
| @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xine-lib 1.1.20\n" +"Project-Id-Version: xine-lib 1.1.20.1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -491,7 +491,7 @@ msgid "xine audio output plugin using esound" msgstr "" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "" @@ -729,17 +729,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -749,46 +749,46 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -797,11 +797,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -810,11 +810,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -824,11 +824,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1438,25 +1438,25 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1465,11 +1465,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1477,19 +1477,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1497,11 +1497,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1856,19 +1856,19 @@ msgid "file input plugin" msgstr "" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2019,45 +2019,45 @@ msgid "pnm streaming input plugin" msgstr "" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2539,16 +2539,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2556,22 +2556,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3617,39 +3617,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3657,26 +3657,26 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -3832,7 +3832,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -3882,12 +3882,12 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4001,9 +4001,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4031,45 +4031,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4453,32 +4453,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4579,31 +4579,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "" @@ -4736,19 +4736,19 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/pl.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/pl.po ^ |
| @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pl_PL\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\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" @@ -517,7 +517,7 @@ msgstr "wtyczka wyjścia dźwięku używająca esound" # src/audio_out/audio_esd_out.c:441 -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 #, fuzzy msgid "xine file audio output plugin" msgstr "wtyczka wyjścia dźwięku używająca esound" @@ -780,17 +780,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -800,47 +800,47 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 #, fuzzy msgid "MPEG-4 postprocessing quality" msgstr "jakość post-przetwarzania ffmpeg mpeg-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -849,11 +849,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -862,11 +862,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -876,11 +876,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1553,27 +1553,27 @@ 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_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" # src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927 -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 #, fuzzy msgid "device used for CD audio" msgstr "urządzenie użyte do wyjścia 4-kanałowego" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1582,11 +1582,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1594,19 +1594,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1614,11 +1614,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1987,19 +1987,19 @@ msgid "file input plugin" msgstr "wtyczka wejścia pliku" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "miejsce startu nawigatora plików" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "listowanie ukrytych plików" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2170,46 +2170,46 @@ msgstr "wtyczka strumienia standardowego wejścia" # src/input/input_rtp.c:339 -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, 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:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "" # src/input/input_file.c:353 -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, fuzzy, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_file: błąd odczytu (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2737,18 +2737,18 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" # src/xine-engine/audio_out.c:868 -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 #, fuzzy msgid "A/52 volume" msgstr "głośność dźwięku" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2757,12 +2757,12 @@ msgstr "" # src/liba52/xine_decoder.c:577 -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 #, fuzzy msgid "use A/52 dynamic range compression" msgstr "włączanie dynamicznego zakresu kompensacji a/52" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -2770,12 +2770,12 @@ msgstr "" # src/liba52/xine_decoder.c:580 -#: src/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 #, fuzzy msgid "downmix audio to 2 channel surround stereo" msgstr "włącz redukcję dźwięku do 2.0 surround stereo" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3875,39 +3875,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3915,28 +3915,28 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 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:1070 +#: src/video_out/video_out_syncfb.c:1067 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:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4104,7 +4104,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4154,12 +4154,12 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4274,9 +4274,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4305,46 +4305,46 @@ msgstr "" # src/video_out/video_out_xv.c:1479 -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 #, 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" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4748,32 +4748,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_http: otwarcie gniazda zawiodło\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4876,31 +4876,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "" @@ -5056,12 +5056,12 @@ msgstr "load_plugins: wtyczka %s znaleziona\n" # src/xine-engine/load_plugins.c:520 -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, 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:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5069,7 +5069,7 @@ msgstr "" # src/xine-engine/load_plugins.c:138 -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, fuzzy, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/pt_BR.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/pt_BR.po ^ |
| @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xine-lib 0.9.13\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\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" @@ -492,7 +492,7 @@ msgid "xine audio output plugin using esound" msgstr "" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 #, fuzzy msgid "xine file audio output plugin" msgstr "http network stream input plugin" @@ -734,17 +734,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "" @@ -754,46 +754,46 @@ msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -802,11 +802,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -815,11 +815,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -829,11 +829,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1447,25 +1447,25 @@ msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_net: incapaz de conectar em '%s'.\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1474,11 +1474,11 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1486,19 +1486,19 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1506,11 +1506,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1866,19 +1866,19 @@ msgid "file input plugin" msgstr "" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2033,45 +2033,45 @@ msgid "pnm streaming input plugin" msgstr "http network stream input plugin" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, 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:738 +#: src/input/input_pvr.c:744 #, 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:814 +#: src/input/input_pvr.c:820 #, fuzzy, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_http: read error (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, 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:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2561,16 +2561,16 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2578,22 +2578,22 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3641,39 +3641,39 @@ msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " "RGB565)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -3681,26 +3681,26 @@ "README.syncfb for information on how to update it.)\n" msgstr "" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -3856,7 +3856,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -3906,12 +3906,12 @@ msgstr "" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4025,9 +4025,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4055,45 +4055,45 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format 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:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" @@ -4479,32 +4479,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4605,31 +4605,31 @@ 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:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, fuzzy, c-format msgid "io_helper: waiting failed: %s\n" msgstr "input_cda: fopen(%s) failed: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "" @@ -4772,21 +4772,21 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: achado o plugin de entrada: %s\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, 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:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " "driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, fuzzy, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/sk.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/sk.po ^ |
| @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: xine-lib 1.0\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2004-09-15 13:53+0100\n" "Last-Translator: \n" "Language-Team: Slovak <ski18n@lists.isternet.sk>\n" @@ -506,7 +506,7 @@ msgid "xine audio output plugin using esound" msgstr "výstupný xine audio plugin používa esound" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "xine file audio output plugin" @@ -774,17 +774,17 @@ 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/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, fuzzy, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n" @@ -794,47 +794,47 @@ 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/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, fuzzy, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, 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/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: priame vykreslovanie zapnuté\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, 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/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 #, fuzzy msgid "MPEG-4 postprocessing quality" msgstr "kvalita ffmpeg mpeg-4 postspracovania" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -843,11 +843,11 @@ "much." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " @@ -856,11 +856,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -870,11 +870,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1538,26 +1538,26 @@ 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:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "CD Digital Audio (aka. CDDA)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 #, fuzzy msgid "device used for CD audio" msgstr "zariadenie pre cdda mechaniku" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 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:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1566,12 +1566,12 @@ "listening habits." msgstr "" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 #, fuzzy msgid "CDDB server name" msgstr "cddbp meno servera" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1579,21 +1579,21 @@ "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 #, fuzzy msgid "CDDB server port" msgstr "cddbp port servra" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 #, fuzzy msgid "CDDB cache directory" msgstr "cddbp cache adresár" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1601,11 +1601,11 @@ "used for anything but CDDB caching." msgstr "" -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -1963,19 +1963,19 @@ msgid "file input plugin" msgstr "modul vstupu zo súboru" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "začiatočné miesto prehliadania súborov" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "zobraziť skryté súbory" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2134,45 +2134,45 @@ msgid "pnm streaming input plugin" msgstr "modul vstupu z prúdu pnm" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, 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:738 +#: src/input/input_pvr.c:744 #, 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:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: chyba pri čítaní (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: nemožno otvoriť zariadenie %s\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format 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:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format 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:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "modul vstupu z WinTV-PVR 250/350" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 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:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "" @@ -2693,17 +2693,17 @@ "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "POMOC! iba mono audio ovládač?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 #, fuzzy msgid "A/52 volume" msgstr "Hlasitosť" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2711,24 +2711,24 @@ "the given volume." msgstr "" -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 #, fuzzy msgid "use A/52 dynamic range compression" msgstr "povoliť a/52 dynamickú úpravu rozsahu" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 #, fuzzy msgid "downmix audio to 2 channel surround stereo" msgstr "povoliť audio zmiešanie na 2.0 priestorové stereo" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -3976,34 +3976,34 @@ 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:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format 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:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format 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:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format 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:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format 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:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format 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:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4011,7 +4011,7 @@ msgstr "" "video_out_syncfb: ruší sa. (SyncFB modul nepodporuje YV12, YUY2 ani RGB565)\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4022,28 +4022,28 @@ "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:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." msgstr "" -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 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:1088 +#: src/video_out/video_out_syncfb.c:1085 #, fuzzy msgid "SyncFB device name" msgstr "názov OSS audio zariadenia" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4220,7 +4220,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xv: Xv rozšírenie neprítomné.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4275,12 +4275,12 @@ msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4411,9 +4411,9 @@ 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:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4446,16 +4446,16 @@ 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_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 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/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format 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:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4464,7 +4464,7 @@ "video_out_xvmc: Xv rozšírenie je prítomné, ale nenašiel som použiteľný yuv12 " "port.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4473,22 +4473,22 @@ "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:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " idct a akcelerácia kompenzácie pohybu \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " iba akcelerácia kompenzácie pohybu\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " žiadna XvMC podpora \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " S Prekrývaním = %d; UnsignedIntra = %d.\n" @@ -4900,32 +4900,32 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, 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/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: VAROVANIE: vaša konfigurácia nebude uložená\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: VAROVANIE: zápis konfigurácie %s zlyhal\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, 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" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, 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" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: položka '%s' nesmie byť modifikovaná z MRL\n" @@ -5031,31 +5031,31 @@ 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:252 +#: src/xine-engine/io_helper.c:254 #, fuzzy, c-format msgid "io_helper: waiting abandoned\n" msgstr "Meno tuneru nenájdené\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, fuzzy, c-format msgid "io_helper: waiting failed: %s\n" msgstr "input_rip: skok zlyhal: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, fuzzy, c-format msgid "io_helper: File not found\n" msgstr "Meno tuneru nenájdené\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "" @@ -5195,12 +5195,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: nájdený demultiplexor '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, 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:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5209,7 +5209,7 @@ "load_plugins: auto-detekcia audio výstupu nenašla žiadne použiteľné audio " "ovládače.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, fuzzy, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| Changed | xine-lib-1.1.20.1.tar.bz2/po/tr.gmo ^ | |
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/po/tr.po ^ |
| @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libxine1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-11-13 01:50+0000\n" +"POT-Creation-Date: 2012-01-01 17:33+0000\n" "PO-Revision-Date: 2008-01-05 18:22+0200\n" "Last-Translator: Server Acim <sacim@kde.org.tr>\n" "Language-Team: Türkçe <yerellestirme@kde.org.tr>\n" @@ -528,7 +528,7 @@ msgid "xine audio output plugin using esound" msgstr "esound kullanan xine ses çıktısı eklentisi" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:375 msgid "xine file audio output plugin" msgstr "xine dosyası ses çıkışı eklentisi" @@ -836,17 +836,17 @@ msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "ffmpeg_audio_dec: 0x%X türü dışında ffmpeg kod çözücü bulamıyor\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:198 +#: src/combined/ffmpeg/ff_audio_decoder.c:200 #, c-format msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "ffmpeg_audio_dec: boş kodu açmaya çalışıyor\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:207 +#: src/combined/ffmpeg/ff_audio_decoder.c:209 #, c-format msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "ffmpeg_audio_dec: kod çözücüyü açamıyor\n" -#: src/combined/ffmpeg/ff_audio_decoder.c:479 +#: src/combined/ffmpeg/ff_audio_decoder.c:483 #, fuzzy, c-format msgid "ffmpeg_audio_dec: cannot read codec parameters from packet\n" msgstr "ffmpeg_audio_dec: kod çözücüyü açamıyor\n" @@ -857,48 +857,48 @@ msgstr "" "dvaudio: taşmayı önlemek için tampon belleği %d seviyesine çıkartıyor.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:187 +#: src/combined/ffmpeg/ff_video_decoder.c:188 #, c-format msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "ffmpeg_video_dec: desteklenmeyen çerçeve kipi, DR1 devre dışı.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:205 +#: src/combined/ffmpeg/ff_video_decoder.c:206 #, c-format msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "ffmpeg_video_dec: desteklenmeyen çerçeve boyutları, DR1 devre dışı.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:316 +#: src/combined/ffmpeg/ff_video_decoder.c:317 #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "ffmpeg_video_dec: 0x%Xtürü için ffmpeg kod çözücüyü bulamıyor\n" -#: src/combined/ffmpeg/ff_video_decoder.c:347 +#: src/combined/ffmpeg/ff_video_decoder.c:348 #, c-format msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "ffmpeg_video_dec: kod çözücüyü açamıyor\n" -#: src/combined/ffmpeg/ff_video_decoder.c:362 +#: src/combined/ffmpeg/ff_video_decoder.c:363 #, fuzzy, c-format msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" msgstr "ffmpeg_video_dec: kod çözücüyü açamıyor\n" -#: src/combined/ffmpeg/ff_video_decoder.c:410 +#: src/combined/ffmpeg/ff_video_decoder.c:411 #, c-format msgid "ffmpeg_video_dec: direct rendering enabled\n" msgstr "ffmpeg_video_dec: doğrudan işleme etkin\n" -#: src/combined/ffmpeg/ff_video_decoder.c:848 +#: src/combined/ffmpeg/ff_video_decoder.c:852 #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" "ffmpeg_video_dec: taşmayı önlemek için tampon belleği %d seviyesine " "yükseltiyor.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1835 +#: src/combined/ffmpeg/ff_video_decoder.c:1857 msgid "MPEG-4 postprocessing quality" msgstr "MPEG 4 işleme kalitesi" -#: src/combined/ffmpeg/ff_video_decoder.c:1836 +#: src/combined/ffmpeg/ff_video_decoder.c:1858 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 " @@ -912,11 +912,11 @@ "kalite içeriği için, ağır işleme işlemleri doğal olarak onun netliğinin " "bozulmasına neden olabilir ve görüntünün kötüleşmesi sonucunu doğurabilir." -#: src/combined/ffmpeg/ff_video_decoder.c:1844 +#: src/combined/ffmpeg/ff_video_decoder.c:1866 msgid "FFmpeg video decoding thread count" msgstr "FFmpeg görüntü kodlaması iş sayısı" -#: src/combined/ffmpeg/ff_video_decoder.c:1845 +#: src/combined/ffmpeg/ff_video_decoder.c:1867 #, fuzzy msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" @@ -932,11 +932,11 @@ "göre mantıksal işlemci başına bir adet kodlama işlemi yapılmalıdır (tipik " "olarak 1den14'e kadar). Bu değişim sonraki yayın akışında etkili olacaktır." -#: src/combined/ffmpeg/ff_video_decoder.c:1854 +#: src/combined/ffmpeg/ff_video_decoder.c:1876 msgid "Skip loop filter" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1855 +#: src/combined/ffmpeg/ff_video_decoder.c:1877 msgid "" "You can control for which frames the loop filter shall be skipped after " "decoding.\n" @@ -946,11 +946,11 @@ "A change of this setting will take effect with playing the next stream." msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1864 +#: src/combined/ffmpeg/ff_video_decoder.c:1886 msgid "Choose speed over specification compliance" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1865 +#: src/combined/ffmpeg/ff_video_decoder.c:1887 msgid "" "You may want to allow speed cheats which violate codec specification.\n" "Cheating may speed up decoding but can also lead to decoding artefacts.\n" @@ -1708,15 +1708,15 @@ msgstr "" "input_cdda: cddb sunucusuna '%s:%d' (%s) bağlanma işlemi başarısız oldu.\n" -#: src/input/input_cdda.c:2766 +#: src/input/input_cdda.c:2772 msgid "CD Digital Audio (aka. CDDA)" msgstr "CD Dijital Ses (CDDA olarak da bilinir)" -#: src/input/input_cdda.c:2818 +#: src/input/input_cdda.c:2831 msgid "device used for CD audio" msgstr "CD sesi için kullanılan aygıt" -#: src/input/input_cdda.c:2819 +#: src/input/input_cdda.c:2832 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." @@ -1724,11 +1724,11 @@ "Aygıta giden yol, ses CDlerini çalmak amacıyla kullandığınız CD yada DVD " "sürücüsü." -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "query CDDB" msgstr "CDDB sorgusu" -#: src/input/input_cdda.c:2825 +#: src/input/input_cdda.c:2838 msgid "" "Enables CDDB queries, which will give you convenient title and track names " "for your audio CDs.\n" @@ -1743,11 +1743,11 @@ "paralelinde bir ağ sunucusundan ilgili bilgilerin toplandığını aklınızdan " "çıkarmayınız." -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "CDDB server name" msgstr "CDDB sunucu adı" -#: src/input/input_cdda.c:2833 +#: src/input/input_cdda.c:2846 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1759,19 +1759,19 @@ "alışkanlıklarınız hakkında bilgiler toplayacak ve kötü niyetli sorguları " "cevaplandıracaktır. Güvenilir sunucuları kullanmayı deneyin." -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "CDDB server port" msgstr "CDDB sunucu portu" -#: src/input/input_cdda.c:2841 +#: src/input/input_cdda.c:2854 msgid "The server port used to retrieve the title and track information from." msgstr "Sunucu portu başlık ve iz bilgisini almak için kullanıldı." -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "CDDB cache directory" msgstr "CDDB önbellek dizini" -#: src/input/input_cdda.c:2847 +#: src/input/input_cdda.c:2860 msgid "" "The replies from the CDDB server will be cached in this directory.\n" "This setting is security critical, because files with uncontrollable names " @@ -1783,11 +1783,11 @@ "isimler denetlenemeyecektir. Bu dizini CDDB depolanması dışında başka amaçla " "kullanmamaya özen gösterin." -#: src/input/input_cdda.c:2855 +#: src/input/input_cdda.c:2868 msgid "slow down disc drive to this speed factor" msgstr "disk sürücüsünün hızını seviyesine düşür" -#: src/input/input_cdda.c:2856 +#: src/input/input_cdda.c:2869 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 " @@ -2223,19 +2223,19 @@ msgid "file input plugin" msgstr "dosya girdi eklentisi" -#: src/input/input_file.c:991 +#: src/input/input_file.c:996 msgid "file browsing start location" msgstr "dosya açma başlangıç konumu" -#: src/input/input_file.c:992 +#: src/input/input_file.c:997 msgid "The browser to select the file to play will start at this location." msgstr "Çalınması istenen dosyanın bu konumdan bağlayacağını seçen tarayıcı." -#: src/input/input_file.c:999 +#: src/input/input_file.c:1004 msgid "list hidden files" msgstr "gizli dosyaları listele" -#: src/input/input_file.c:1000 +#: src/input/input_file.c:1005 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." @@ -2398,47 +2398,47 @@ msgid "pnm streaming input plugin" msgstr "pnm yayın girdi eklentisi" -#: src/input/input_pvr.c:581 +#: src/input/input_pvr.c:587 #, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "input_pvr: pvr dosyası oluşturma hatası (%s)\n" -#: src/input/input_pvr.c:738 +#: src/input/input_pvr.c:744 #, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "input_pvr: pvr dosyası açma hatası (%s)\n" -#: src/input/input_pvr.c:814 +#: src/input/input_pvr.c:820 #, c-format msgid "input_pvr: read error (%s)\n" msgstr "input_pvr: okuma hatası (%s)\n" -#: src/input/input_pvr.c:1153 src/input/input_pvr.c:1413 +#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "input_pvr: %s aygıtı açılamadı\n" -#: src/input/input_pvr.c:1159 src/input/input_pvr.c:1419 +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1425 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_G_CODEC başarısız oldu, API değişmiş olabilir mi?\n" -#: src/input/input_pvr.c:1167 src/input/input_pvr.c:1428 +#: src/input/input_pvr.c:1173 src/input/input_pvr.c:1434 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" "input_pvr: IVTV_IOC_S_CODEC başarısız oldu, API değişmiş olabilir mi?\n" -#: src/input/input_pvr.c:1536 +#: src/input/input_pvr.c:1542 msgid "WinTV-PVR 250/350 input plugin" msgstr "WinTV-PVR 250/350 girdi eklentisi" -#: src/input/input_pvr.c:1562 +#: src/input/input_pvr.c:1568 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "WinTV-PVR 250/350 (pvr eklentisi) için kullanılan aygıt" -#: src/input/input_pvr.c:1563 +#: src/input/input_pvr.c:1569 msgid "The path to the device of your WinTV card." msgstr "WinTV kartınızın aygıt yolu." @@ -2972,16 +2972,16 @@ "1024: Donmuş kare\n" "2048: VCDINFO'dan hata ayıklama\n" -#: src/liba52/xine_a52_decoder.c:757 src/libdts/xine_dts_decoder.c:560 +#: src/liba52/xine_a52_decoder.c:751 src/libdts/xine_dts_decoder.c:560 #, c-format msgid "HELP! a mono-only audio driver?!\n" msgstr "YARDIM! sadece mono olan bir ses sürücüsü mü?!\n" -#: src/liba52/xine_a52_decoder.c:820 +#: src/liba52/xine_a52_decoder.c:814 msgid "A/52 volume" msgstr "A/52 sesi" -#: src/liba52/xine_a52_decoder.c:821 +#: src/liba52/xine_a52_decoder.c:815 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, " @@ -2993,11 +2993,11 @@ "böylece daha sonra yapacağınız kanalın ses yayın akışlarının ses " "dengelerinin ayarlanması sırasında bu işinize yarayacaktır." -#: src/liba52/xine_a52_decoder.c:829 +#: src/liba52/xine_a52_decoder.c:823 msgid "use A/52 dynamic range compression" msgstr "dinamik alan sıkıştırılması için A/52 kullan" -#: src/liba52/xine_a52_decoder.c:830 +#: src/liba52/xine_a52_decoder.c:824 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 " @@ -3007,11 +3007,11 @@ "yumuşak ve yumuşak seslerin yüksek olması demektir ki, bu sayede müziği " "kimseyi rahatsız etmeden gürültülü bir ortamda rahatlıkla dinleyebilirsiniz." -#: src/liba52/xine_a52_decoder.c:837 +#: src/liba52/xine_a52_decoder.c:831 msgid "downmix audio to 2 channel surround stereo" msgstr "sesi 2 kanal surround stereo'ya indirge" -#: src/liba52/xine_a52_decoder.c:838 +#: src/liba52/xine_a52_decoder.c:832 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 " @@ -4390,39 +4390,39 @@ msgstr "" "video_out_syncfb: hata. (YV12 ekran kartınız tarafından desteklenmiyor)\n" -#: src/video_out/video_out_syncfb.c:950 +#: src/video_out/video_out_syncfb.c:947 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" msgstr "" "video_out_syncfb: bilgi. (SyncFB modülü YUV 4:2:0 (3 plane)) parametresini " "destekler\n" -#: src/video_out/video_out_syncfb.c:955 +#: src/video_out/video_out_syncfb.c:952 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" msgstr "" "video_out_syncfb: bilgi. (SyncFB modülü YUV 4:2:0 (2 plane)) parametresini " "destekler\n" -#: src/video_out/video_out_syncfb.c:960 +#: src/video_out/video_out_syncfb.c:957 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" msgstr "" "video_out_syncfb: bilgi. (SyncFB modülü YUV 4:2:2) parametresini destekler\n" -#: src/video_out/video_out_syncfb.c:966 +#: src/video_out/video_out_syncfb.c:963 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" msgstr "" "video_out_syncfb: bilgi. (SyncFB modülü YUY2) parametresini destekler\n" -#: src/video_out/video_out_syncfb.c:973 +#: src/video_out/video_out_syncfb.c:970 #, c-format msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" msgstr "" "video_out_syncfb: bilgi. (SyncFB modülü RGB565) parametresini destekler\n" -#: src/video_out/video_out_syncfb.c:978 +#: src/video_out/video_out_syncfb.c:975 #, c-format msgid "" "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor " @@ -4431,7 +4431,7 @@ "video_out_syncfb: durduruyor. (SyncFB modülü, ne YV12 ve YUY2 " "parametrelerini, ne de RGB565) parametresini destekler\n" -#: src/video_out/video_out_syncfb.c:997 +#: src/video_out/video_out_syncfb.c:994 #, fuzzy, c-format msgid "" "video_out_syncfb: info. (brightness/contrast control won't be available " @@ -4442,11 +4442,11 @@ "SyncFB çekirdek modülünüz güncelliğini yitirmiş gözüküyor. Onu nasıl " "güncelleyeceğinizi öğrenmek için README.syncfb belgesine bakınız.)\n" -#: src/video_out/video_out_syncfb.c:1021 +#: src/video_out/video_out_syncfb.c:1018 msgid "default number of frame repetitions" msgstr "çerçeve tekrarlarının öntanımlı numarası" -#: src/video_out/video_out_syncfb.c:1022 +#: src/video_out/video_out_syncfb.c:1019 msgid "" "This specifies how many times a single video frame will be displayed " "consecutively." @@ -4454,18 +4454,18 @@ "Bu, tek video çerçevenizin ardışık olarak kaç defa görüntülenebileceğini " "belirler." -#: src/video_out/video_out_syncfb.c:1070 +#: src/video_out/video_out_syncfb.c:1067 msgid "" "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" msgstr "" "Matrox G200/G400 kartları için SyncFB modülünü kullanan xine görüntü çıkışı " "eklentisi" -#: src/video_out/video_out_syncfb.c:1088 +#: src/video_out/video_out_syncfb.c:1085 msgid "SyncFB device name" msgstr "SyncFB aygıt ismi" -#: src/video_out/video_out_syncfb.c:1089 +#: src/video_out/video_out_syncfb.c:1086 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, " @@ -4651,7 +4651,7 @@ msgid "video_out_xcbxv: Xv extension not present.\n" msgstr "video_out_xcbxv: Xv uzantısı şu anda hazır değil.\n" -#: src/video_out/video_out_xcbxv.c:1385 src/video_out/video_out_xxmc.c:2461 +#: src/video_out/video_out_xcbxv.c:1385 #, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "" @@ -4712,12 +4712,12 @@ msgstr "video_out_xcbxv: bu çevirici yuy2 kipini destekler.\n" #: src/video_out/video_out_xcbxv.c:1606 src/video_out/video_out_xv.c:1670 -#: src/video_out/video_out_xvmc.c:1539 +#: src/video_out/video_out_xvmc.c:1541 msgid "deinterlace method (deprecated)" msgstr "dönüştürme yöntemi (arındırılmış)" #: src/video_out/video_out_xcbxv.c:1607 src/video_out/video_out_xv.c:1671 -#: src/video_out/video_out_xvmc.c:1540 +#: src/video_out/video_out_xvmc.c:1542 msgid "" "This config setting is deprecated. You should use the new deinterlacing post " "processing settings instead.\n" @@ -4885,9 +4885,9 @@ msgid "video_out_xv: Xv extension not present.\n" msgstr "video_out_xv: Xv uzantısı hazır değil.\n" -#: src/video_out/video_out_xv.c:1432 +#: src/video_out/video_out_xv.c:1432 src/video_out/video_out_xxmc.c:2461 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: could not open Xv port %lu - autodetecting\n" msgstr "" #: src/video_out/video_out_xv.c:1451 @@ -4920,16 +4920,16 @@ msgid "video_out_xv: this adaptor supports the yuy2 format.\n" msgstr "video_out_xv: bu çevirici yuy2 kipini destekler.\n" -#: src/video_out/video_out_xvmc.c:1608 +#: src/video_out/video_out_xvmc.c:1610 msgid "xine video output plugin using the XvMC X video extension" msgstr "XvMC X görüntü uzantısını kullanması için xine görüntü eklentisi" -#: src/video_out/video_out_xvmc.c:1650 +#: src/video_out/video_out_xvmc.c:1656 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "video_out_xvmc: XvMC uzantısı şu an hazır değil.\n" -#: src/video_out/video_out_xvmc.c:1748 +#: src/video_out/video_out_xvmc.c:1754 #, c-format msgid "" "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " @@ -4938,7 +4938,7 @@ "video_out_xvmc: Xv uzantısı hazır fakat kullanılabilir durumda bir yuv12 " "portu bulamıyorum.\n" -#: src/video_out/video_out_xvmc.c:1757 +#: src/video_out/video_out_xvmc.c:1763 #, fuzzy, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" @@ -4947,22 +4947,22 @@ "video_out_xvmc: Xv portunu %ld çeviriciden %s kullanıyor\n" " donanım renk modeli çevrimi ve yükselmesi için\n" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1768 #, c-format msgid " idct and motion compensation acceleration \n" msgstr " idct ve hareket bedeli hızlandırılması \n" -#: src/video_out/video_out_xvmc.c:1764 +#: src/video_out/video_out_xvmc.c:1770 #, c-format msgid " motion compensation acceleration only\n" msgstr " sadece hareket bedeli hızlandırılması\n" -#: src/video_out/video_out_xvmc.c:1766 +#: src/video_out/video_out_xvmc.c:1772 #, c-format msgid " no XvMC support \n" msgstr " hiçbir XvMC desteği yok \n" -#: src/video_out/video_out_xvmc.c:1767 +#: src/video_out/video_out_xvmc.c:1773 #, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr " Üstyazımlı = %d; İmzalanmamış Intra = %d.\n" @@ -5447,36 +5447,36 @@ msgid "Failed to load configuration from file '%s': %s\n" msgstr "input_dvb: dvb kanal dosyası açılamadı '%s': %s\n" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1054 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" "configfile: UYARI: configfile dosyasının şuraya %s yedeklenmesi " "başarılamadı\n" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1055 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "configfile: UYARI: yapılandırmanız kaydedilmeyecektir\n" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1155 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "configfile: UYARI: yapılandırmanın şuraya %s yazılması başarılamadı\n" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1156 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" "configfile: UYARI: büyük ihtimaller bozulmuş olan yapılandırma dosyasını " "kaldırıyor %s\n" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1157 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "configfile: UYARI: yedekleme dosyasını denetlemelisiniz %s\n" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1292 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "configfile: girdi '%s' MRL tarafından değiştirilmiş olmamalı\n" @@ -5585,31 +5585,31 @@ msgid "input_rip: error opening file %s: %s\n" msgstr "input_rip: %s dosyası açılırken hata oluştu: %s\n" -#: src/xine-engine/io_helper.c:252 +#: src/xine-engine/io_helper.c:254 #, c-format msgid "io_helper: waiting abandoned\n" msgstr "io_helper: bekleme bırakıldı\n" -#: src/xine-engine/io_helper.c:259 +#: src/xine-engine/io_helper.c:261 #, c-format msgid "io_helper: waiting failed: %s\n" msgstr "io_helper: bekleme başarısız oldu: %s\n" -#: src/xine-engine/io_helper.c:314 +#: src/xine-engine/io_helper.c:316 msgid "failed to get status of socket" msgstr "soket durumu alınamadı" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:390 #, c-format msgid "io_helper: Permission denied\n" msgstr "io_helper: İzin verilmedi\n" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:394 #, c-format msgid "io_helper: File not found\n" msgstr "io_helper: Dosya bulunamadı\n" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:398 #, c-format msgid "io_helper: Connection Refused\n" msgstr "io_helper: Bağlantı Reddedildi\n" @@ -5757,12 +5757,12 @@ msgid "load_plugins: using demuxer '%s'\n" msgstr "load_plugins: demuxer eklentisini kullanıyor '%s'\n" -#: src/xine-engine/load_plugins.c:1798 src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1793 src/xine-engine/load_plugins.c:1840 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "load_plugins: ses çıkış eklentisini yüklemede hata <%s>\n" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1843 #, c-format msgid "" "load_plugins: audio output auto-probing didn't find any usable audio " @@ -5771,7 +5771,7 @@ "load_plugins: ses çıktısı otomatik bulma işlemi kullanılabilir bir sürücü " "bulamadı.\n" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2147 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/audio_out/audio_file_out.c ^ |
| @@ -30,6 +30,7 @@ #include <math.h> #include <unistd.h> #include <inttypes.h> +#include <sys/stat.h> #include "xine_internal.h" #include "xineutils.h" @@ -40,6 +41,18 @@ #define GAP_TOLERANCE INT_MAX +#ifdef WIN32 +#ifndef S_IWUSR +#define S_IWUSR 0x0000 +#endif +#ifndef S_IRGRP +#define S_IRGRP 0x0000 +#endif +#ifndef S_IROTH +#define S_IROTH 0x0000 +#endif +#endif + /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */ struct wavhdr { | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/combined/decoder_flac.c ^ |
| @@ -72,9 +72,9 @@ int channels; unsigned char *buf; - int buf_size; - int buf_pos; - int min_size; + size_t buf_size; + size_t buf_pos; + size_t min_size; } flac_decoder_t; @@ -82,23 +82,31 @@ * FLAC callback functions */ +#ifdef LEGACY_FLAC static FLAC__StreamDecoderReadStatus flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) +#else +static FLAC__StreamDecoderReadStatus +flac_read_callback (const FLAC__StreamDecoder *decoder, + FLAC__byte buffer[], + size_t *bytes, + void *client_data) +#endif { flac_decoder_t *this = (flac_decoder_t *)client_data; - int number_of_bytes_to_copy; + size_t number_of_bytes_to_copy; - lprintf("flac_read_callback: %d\n", *bytes); + lprintf("flac_read_callback: %zd\n", (size_t)*bytes); if (this->buf_pos > *bytes) number_of_bytes_to_copy = *bytes; else number_of_bytes_to_copy = this->buf_pos; - lprintf("number_of_bytes_to_copy: %d\n", number_of_bytes_to_copy); + lprintf("number_of_bytes_to_copy: %zd\n", number_of_bytes_to_copy); *bytes = number_of_bytes_to_copy; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/combined/demux_flac.c ^ |
| @@ -103,13 +103,17 @@ static #ifdef LEGACY_FLAC FLAC__SeekableStreamDecoderReadStatus +flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, + FLAC__byte buffer[], + unsigned *bytes, + void *client_data) #else FLAC__StreamDecoderReadStatus -#endif flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], - unsigned *bytes, + size_t *bytes, void *client_data) +#endif { demux_flac_t *this = (demux_flac_t *)client_data; input_plugin_t *input = this->input; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/combined/ffmpeg/ff_audio_decoder.c ^ |
| @@ -173,6 +173,7 @@ * - DVB streams where multiple AAC LATM frames are packed to single PES * - DVB streams where MPEG audio frames do not follow PES packet boundaries */ +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (codec_type == BUF_AUDIO_AAC_LATM || codec_type == BUF_AUDIO_MPEG) { @@ -185,6 +186,7 @@ "ffmpeg_audio_dec: couldn't init parser\n"); } } +#endif } static int ff_audio_open_codec(ff_audio_decoder_t *this, unsigned int codec_type) { @@ -354,6 +356,7 @@ int consumed; int parser_consumed = 0; +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (parser_ctx) { uint8_t *outbuf; int outsize; @@ -380,6 +383,7 @@ buf = outbuf; size = outsize; } +#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) */ #if AVAUDIO > 2 AVPacket avpkt; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/combined/ffmpeg/ff_video_decoder.c ^ |
| @@ -96,6 +96,7 @@ xine_stream_t *stream; int64_t pts; + int64_t last_pts; #ifdef AVCODEC_HAS_REORDERED_OPAQUE uint64_t pts_tag_mask; uint64_t pts_tag; @@ -433,6 +434,9 @@ break; } + /* dont want initial AV_NOPTS_VALUE here */ + this->context->reordered_opaque = 0; + } static void choose_speed_over_accuracy_cb(void *user_data, xine_cfg_entry_t *entry) { @@ -1081,6 +1085,54 @@ } } +#ifdef AVCODEC_HAS_REORDERED_OPAQUE +static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts) +{ + return pts | this->pts_tag; +} + +static uint64_t ff_untag_pts(ff_video_decoder_t *this, uint64_t pts) +{ + if (this->pts_tag_mask == 0) + return pts; /* pts tagging inactive */ + + if (this->pts_tag != 0 && (pts & this->pts_tag_mask) != this->pts_tag) + return 0; /* reset pts if outdated while waiting for first pass (see below) */ + + return pts & ~this->pts_tag_mask; +} + +static void ff_check_pts_tagging(ff_video_decoder_t *this, uint64_t pts) +{ + if (this->pts_tag_mask == 0) + return; /* pts tagging inactive */ + if ((pts & this->pts_tag_mask) != this->pts_tag) { + this->pts_tag_stable_counter = 0; + return; /* pts still outdated */ + } + + /* the tag should be stable for 100 frames */ + this->pts_tag_stable_counter++; + + if (this->pts_tag != 0) { + if (this->pts_tag_stable_counter >= 100) { + /* first pass: reset pts_tag */ + this->pts_tag = 0; + this->pts_tag_stable_counter = 0; + } + } else if (pts == 0) + return; /* cannot detect second pass */ + else { + if (this->pts_tag_stable_counter >= 100) { + /* second pass: reset pts_tag_mask and pts_tag_counter */ + this->pts_tag_mask = 0; + this->pts_tag_counter = 0; + this->pts_tag_stable_counter = 0; + } + } +} +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ + static void ff_handle_mpeg12_buffer (ff_video_decoder_t *this, buf_element_t *buf) { vo_frame_t *img; @@ -1102,6 +1154,15 @@ uint8_t *current; int next_flush; +#ifdef AVCODEC_HAS_REORDERED_OPAQUE + /* apply valid pts to first frame _starting_ thereafter only */ + if (this->pts && !this->context->reordered_opaque) { + this->context->reordered_opaque = + this->av_frame->reordered_opaque = ff_tag_pts (this, this->pts); + this->pts = 0; + } +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ + got_picture = 0; if (!flush) { current = mpeg_parser_decode_data(this->mpeg_parser, @@ -1183,8 +1244,16 @@ free_img = 0; } +#ifdef AVCODEC_HAS_REORDERED_OPAQUE + /* get back reordered pts */ + img->pts = ff_untag_pts (this, this->av_frame->reordered_opaque); + ff_check_pts_tagging (this, this->av_frame->reordered_opaque); + this->av_frame->reordered_opaque = 0; + this->context->reordered_opaque = 0; +#else img->pts = this->pts; this->pts = 0; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ if (this->av_frame->repeat_pict) img->duration = this->video_step * 3 / 2; @@ -1225,54 +1294,6 @@ } } -#ifdef AVCODEC_HAS_REORDERED_OPAQUE -static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts) -{ - return pts | this->pts_tag; -} - -static uint64_t ff_untag_pts(ff_video_decoder_t *this, uint64_t pts) -{ - if (this->pts_tag_mask == 0) - return pts; /* pts tagging inactive */ - - if (this->pts_tag != 0 && (pts & this->pts_tag_mask) != this->pts_tag) - return 0; /* reset pts if outdated while waiting for first pass (see below) */ - - return pts & ~this->pts_tag_mask; -} - -static void ff_check_pts_tagging(ff_video_decoder_t *this, uint64_t pts) -{ - if (this->pts_tag_mask == 0) - return; /* pts tagging inactive */ - if ((pts & this->pts_tag_mask) != this->pts_tag) { - this->pts_tag_stable_counter = 0; - return; /* pts still outdated */ - } - - /* the tag should be stable for 100 frames */ - this->pts_tag_stable_counter++; - - if (this->pts_tag != 0) { - if (this->pts_tag_stable_counter >= 100) { - /* first pass: reset pts_tag */ - this->pts_tag = 0; - this->pts_tag_stable_counter = 0; - } - } else if (pts == 0) - return; /* cannot detect second pass */ - else { - if (this->pts_tag_stable_counter >= 100) { - /* second pass: reset pts_tag_mask and pts_tag_counter */ - this->pts_tag_mask = 0; - this->pts_tag_counter = 0; - this->pts_tag_stable_counter = 0; - } - } -} -#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ - static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { uint8_t *chunk_buf = this->buf; AVRational avr00 = {0, 1}; @@ -1616,8 +1637,9 @@ } else { /* decode */ - if (buf->pts) - this->pts = buf->pts; + /* PES: each valid pts shall be used only once */ + if (buf->pts && (buf->pts != this->last_pts)) + this->last_pts = this->pts = buf->pts; if ((buf->type & 0xFFFF0000) == BUF_VIDEO_MPEG) { ff_handle_mpeg12_buffer(this, buf); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/demuxers/demux_ts.c ^ |
| @@ -2348,23 +2348,36 @@ { case DEMUX_OPTIONAL_DATA_AUDIOLANG: if ((channel >= 0) && (channel < this->audio_tracks_count)) { - if(this->audio_tracks[channel].lang) + if (this->audio_tracks[channel].lang[0]) { strcpy(str, this->audio_tracks[channel].lang); - else - sprintf(str, "%3i", _x_get_audio_channel(this->stream)); + } else { + /* input plugin may know the language */ + if (this->input->get_capabilities(this->input) & INPUT_CAP_AUDIOLANG) + return DEMUX_OPTIONAL_UNSUPPORTED; + sprintf(str, "%3i", channel); + } + return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_MAX, "%3i", _x_get_audio_channel(this->stream)); + strcpy(str, "none"); } - return DEMUX_OPTIONAL_SUCCESS; + return DEMUX_OPTIONAL_UNSUPPORTED; case DEMUX_OPTIONAL_DATA_SPULANG: if (channel>=0 && channel<this->spu_langs_count) { - memcpy(str, this->spu_langs[channel].desc.lang, 3); - str[3] = 0;} - else + if (this->spu_langs[channel].desc.lang[0]) { + strcpy(str, this->spu_langs[channel].desc.lang); + } else { + /* input plugin may know the language */ + if (this->input->get_capabilities(this->input) & INPUT_CAP_SPULANG) + return DEMUX_OPTIONAL_UNSUPPORTED; + sprintf(str, "%3i", channel); + } + return DEMUX_OPTIONAL_SUCCESS; + } else { strcpy(str, "none"); - return DEMUX_OPTIONAL_SUCCESS; + } + return DEMUX_OPTIONAL_UNSUPPORTED; default: return DEMUX_OPTIONAL_UNSUPPORTED; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/dxr3/video_out_dxr3.h ^ |
| @@ -131,7 +131,7 @@ vo_frame_t vo_frame; uint32_t oheight; int aspect, pan_scan; - uint8_t *mem; /* allocated for YV12 or YUY2 buffers */ + void *mem; /* allocated for YV12 or YUY2 buffers */ uint8_t *real_base[3]; /* yuv/yuy2 buffers in mem aligned on 16 */ int swap_fields; /* shifts Y buffer one line to exchange odd/even lines */ } dxr3_frame_t; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/Makefile.am ^ |
| @@ -21,11 +21,11 @@ if HAVE_V4L in_v4l = xineplug_inp_v4l.la -in_pvr = xineplug_inp_pvr.la endif if HAVE_V4L2 in_v4l2 = xineplug_inp_v4l2.la +in_pvr = xineplug_inp_pvr.la endif if HAVE_GNOME_VFS @@ -164,5 +164,5 @@ xineplug_inp_pvr_la_LDFLAGS = $(xineplug_ldflags) xineinclude_HEADERS = input_plugin.h -noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h +noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/Makefile.in ^ |
| @@ -187,7 +187,7 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xineplug_inp_pvr_la_CFLAGS) $(CFLAGS) \ $(xineplug_inp_pvr_la_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_V4L_TRUE@am_xineplug_inp_pvr_la_rpath = -rpath $(xineplugdir) +@HAVE_V4L2_TRUE@am_xineplug_inp_pvr_la_rpath = -rpath $(xineplugdir) xineplug_inp_rtp_la_DEPENDENCIES = $(XINE_LIB) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_xineplug_inp_rtp_la_OBJECTS = xineplug_inp_rtp_la-input_rtp.lo \ @@ -671,8 +671,8 @@ # @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_V4L2_TRUE@in_v4l2 = xineplug_inp_v4l2.la +@HAVE_V4L2_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 @@ -775,7 +775,7 @@ xineplug_inp_pvr_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_inp_pvr_la_LDFLAGS = $(xineplug_ldflags) xineinclude_HEADERS = input_plugin.h -noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h +noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h all: all-recursive .SUFFIXES: | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/input_cdda.c ^ |
| @@ -187,7 +187,7 @@ int mrls_allocated_entries; xine_mrl_t **mrls; - char *autoplaylist[MAX_TRACKS]; + char **autoplaylist; } cdda_input_class_t; @@ -2545,14 +2545,7 @@ } for (i = 0 ; i < num_tracks ; i++) { if (i < this->mrls_allocated_entries) { - if (this->mrls[i]->origin) - free(this->mrls[i]->origin); - if (this->mrls[i]->mrl) - free(this->mrls[i]->mrl); - if (this->mrls[i]->link) { - free(this->mrls[i]->link); - this->mrls[i]->link = NULL; - } + MRL_ZERO(this->mrls[i]); } else { this->mrls[i] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t)); @@ -2578,6 +2571,21 @@ return this->mrls; } +static void free_autoplay_list(cdda_input_class_t *this) +{ + /* free old playlist */ + if (this->autoplaylist) { + unsigned int i; + for( i = 0; this->autoplaylist[i]; i++ ) { + free( this->autoplaylist[i] ); + this->autoplaylist[i] = NULL; + } + + free(this->autoplaylist); + this->autoplaylist = NULL; + } +} + static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, int *num_files) { @@ -2589,11 +2597,7 @@ lprintf("cdda_class_get_autoplay_list for >%s<\n", this->cdda_device); - /* free old playlist */ - for( i = 0; this->autoplaylist[i]; i++ ) { - free( this->autoplaylist[i] ); - this->autoplaylist[i] = NULL; - } + free_autoplay_list(this); /* get the CD TOC */ toc = init_cdrom_toc(); @@ -2651,6 +2655,8 @@ num_tracks--; if (num_tracks >= MAX_TRACKS-1) num_tracks = MAX_TRACKS - 2; + + this->autoplaylist = calloc(num_tracks + 2, sizeof(char *)); for ( i = 0; i <= num_tracks; i++ ) this->autoplaylist[i] = _x_asprintf("cdda:/%d",i+toc->first_track); @@ -2779,7 +2785,14 @@ config->unregister_callback(config, "media.audio_cd.drive_slowdown"); #endif + free_autoplay_list(this); + + while (this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } free (this->mrls); + free (this); } | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/input_file.c ^ |
| @@ -850,7 +850,7 @@ this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&dir_files[i], this->mrls[num_files]); @@ -868,7 +868,7 @@ this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&hide_files[i], this->mrls[num_files]); @@ -886,7 +886,7 @@ this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&norm_files[i], this->mrls[num_files]); @@ -954,7 +954,12 @@ config->unregister_callback(config, "media.files.origin_path"); + while(this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } free (this->mrls); + free (this); } | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/input_pvr.c ^ |
| @@ -98,7 +98,13 @@ #include <time.h> #include <pthread.h> #include <sys/ioctl.h> -#include "videodev2.h" +#ifdef HAVE_SYS_VIDEOIO_H +# include <sys/videoio.h> +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include <sys/videodev2.h> +#else +# include <linux/videodev2.h> +#endif #define XINE_ENABLE_EXPERIMENTAL_FEATURES | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/input/input_smb.c ^ |
| @@ -356,7 +356,7 @@ (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*)); this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); }else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&dir_files[i], this->mrls[num_files]); @@ -373,7 +373,7 @@ (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*)); this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); }else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&norm_files[i], this->mrls[num_files]); @@ -456,6 +456,12 @@ { smb_input_class_t *this = (smb_input_class_t *) this_gen; + while(this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } + free(this->mrls); + free (this); } | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/liba52/xine_a52_decoder.c ^ |
| @@ -53,12 +53,6 @@ # include "a52.h" #endif -#ifdef HAVE_A52DEC_A52_INTERNAL_H -# include <a52dec/a52_internal.h> -#else -# include "a52_internal.h" -#endif - #include "buffer.h" #include "xineutils.h" | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/libdts/xine_dts_decoder.c ^ |
| @@ -21,10 +21,6 @@ * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifndef __sun /* required for swab() */ #define _XOPEN_SOURCE 500 @@ -32,6 +28,10 @@ /* avoid compiler warnings */ #define _BSD_SOURCE 1 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <string.h> | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/libsputext/xine_sputext_decoder.c ^ |
| @@ -551,7 +551,7 @@ static void draw_subtitle(sputext_decoder_t *this, int64_t sub_start, int64_t sub_end ) { int y; - int sub_x, sub_y, max_width; + int sub_x, sub_y, max_width = this->width; int alignment; _x_assert(this->renderer != NULL); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/libxineadec/xine_lpcm_decoder.c ^ |
| @@ -21,16 +21,16 @@ * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifndef __sun #define _XOPEN_SOURCE 500 #endif /* avoid compiler warnings */ #define _BSD_SOURCE 1 +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <string.h> | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/libxinevdec/image.c ^ |
| @@ -54,6 +54,17 @@ #include "xineutils.h" #include "bswap.h" +#ifdef HAVE_GRAPHICSMAGICK +# define MAGICK_VERSION 0x670 +#else +# if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +# define MAGICK_VERSION 0x670 +#else +# define MAGICK_VERSION MagickLibVersion +# endif +#endif + + typedef struct { video_decoder_class_t decoder_class; @@ -101,14 +112,23 @@ /* * this->image -> rgb data */ +#if MAGICK_VERSION < 0x671 InitializeMagick(NULL); +#else + MagickWandGenesis(); +#endif wand = NewMagickWand(); status = MagickReadImageBlob(wand, this->image, this->index); + this->index = 0; if (!status) { DestroyMagickWand(wand); +#if MAGICK_VERSION < 0x671 DestroyMagick(); +#else + MagickWandTerminus(); +#endif lprintf("error loading image\n"); return; } @@ -116,9 +136,15 @@ width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ height = MagickGetImageHeight(wand); img_buf = malloc(width * height * 3); +#if MAGICK_VERSION < 0x671 MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); DestroyMagickWand(wand); DestroyMagick(); +#else + MagickExportImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); + DestroyMagickWand(wand); + MagickWandTerminus(); +#endif _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width); _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, height); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/Makefile.am ^ |
| @@ -114,11 +114,11 @@ xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = $(YUV_LIBS) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) -xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) +xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xcbxv_la_SOURCES = deinterlace.c video_out_xcbxv.c $(XCBOSD) xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) -xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) +xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD) xineplug_vo_out_xshm_la_LIBADD = $(YUV_LIBS) $(X_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/Makefile.in ^ |
| @@ -891,10 +891,10 @@ xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = $(YUV_LIBS) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) -xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) +xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xcbxv_la_SOURCES = deinterlace.c video_out_xcbxv.c $(XCBOSD) xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) -xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) +xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD) xineplug_vo_out_xshm_la_LIBADD = $(YUV_LIBS) $(X_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/video_out_syncfb.c ^ |
| @@ -874,14 +874,11 @@ syncfb_class_t *class = (syncfb_class_t *) class_gen; config_values_t *config = class->config; syncfb_driver_t* this; - Display* display = NULL; unsigned int i; x11_visual_t* visual = (x11_visual_t *) visual_gen; XColor dummy; XWindowAttributes attr; - display = visual->display; - if(!(this = calloc(1, sizeof (syncfb_driver_t)))) return NULL; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/video_out_xcbxv.c ^ |
| @@ -1011,7 +1011,7 @@ return 0; } -static void xv_store_port_attribute(xv_driver_t *this, char *name) { +static void xv_store_port_attribute(xv_driver_t *this, const char * const name) { xcb_intern_atom_cookie_t atom_cookie; xcb_intern_atom_reply_t *atom_reply; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/video_out_xv.c ^ |
| @@ -1429,8 +1429,8 @@ if (xv_port != 0) { if (! xv_open_port(this, xv_port)) { xprintf(class->xine, XINE_VERBOSITY_NONE, - _("%s: could not open Xv port %"PRId32" - autodetecting\n"), - LOG_MODULE, xv_port); + _("%s: could not open Xv port %lu - autodetecting\n"), + LOG_MODULE, (unsigned long)xv_port); xv_port = xv_autodetect_port(this, adaptors, adaptor_info, &adaptor_num, xv_port, prefer_type); } else adaptor_num = xv_find_adaptor_by_port (xv_port, adaptors, adaptor_info); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/video_out_xvmc.c ^ |
| @@ -226,6 +226,8 @@ Display *display; config_values_t *config; XvPortID xv_port; + XvAdaptorInfo *adaptor_info; + unsigned int adaptor_num; int surface_type_id; unsigned int max_surface_width; @@ -1345,8 +1347,8 @@ int nattr; x11_visual_t *visual = (x11_visual_t *) visual_gen; XColor dummy; - XvAdaptorInfo *adaptor_info; - unsigned int adaptor_num; + XvAdaptorInfo *adaptor_info = class->adaptor_info; + unsigned int adaptor_num = class->adaptor_num; /* XvImage *myimage; */ lprintf ("open_plugin\n"); @@ -1611,6 +1613,10 @@ static void dispose_class (video_driver_class_t *this_gen) { xvmc_class_t *this = (xvmc_class_t *) this_gen; + XLockDisplay(this->display); + XvFreeAdaptorInfo (this->adaptor_info); + XUnlockDisplay(this->display); + free (this); } @@ -1783,6 +1789,8 @@ this->display = display; this->config = xine->config; this->xv_port = xv_port; + this->adaptor_info = adaptor_info; + this->adaptor_num = adaptor_num; this->surface_type_id = surface_type; this->max_surface_width = max_width; this->max_surface_height = max_height; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/video_out/video_out_xxmc.c ^ |
| @@ -2458,8 +2458,8 @@ if (xv_port != 0) { if (! xxmc_open_port(this, xv_port)) { xprintf(class->xine, XINE_VERBOSITY_NONE, - _("%s: could not open Xv port %d - autodetecting\n"), - LOG_MODULE, xv_port); + _("%s: could not open Xv port %lu - autodetecting\n"), + LOG_MODULE, (unsigned long)xv_port); xv_port = xxmc_autodetect_port(this, adaptors, adaptor_info, &adaptor_num, xv_port, prefer_type); } else adaptor_num = xxmc_find_adaptor_by_port (xv_port, adaptors, adaptor_info); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-engine/buffer_types.c ^ |
| @@ -1187,6 +1187,8 @@ }, { { + ME_FOURCC('E', 'A', 'C', '3'), + ME_FOURCC('e', 'c', '-', '3'), 0 }, BUF_AUDIO_EAC3, | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-engine/configfile.c ^ |
| @@ -1021,7 +1021,9 @@ buf = (char *) malloc(config_stat.st_size + 1); if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && ((off_t)rlen == config_stat.st_size)) { - (void) fwrite(buf, 1, rlen, f_backup); + if (rlen != fwrite(buf, 1, rlen, f_backup)) { + lprintf("backing up configfile to %s failed\n", temp); + } } free(buf); | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-engine/io_helper.c ^ |
| @@ -87,17 +87,19 @@ for (i = 0; h->h_addr_list[i]; i++) { struct in_addr ia; - struct sockaddr_in sin; - + union { + struct sockaddr sa; + struct sockaddr_in in; + } saddr; memcpy (&ia, h->h_addr_list[i], 4); - sin.sin_family = AF_INET; - sin.sin_addr = ia; - sin.sin_port = htons(port); + saddr.in.sin_family = AF_INET; + saddr.in.sin_addr = ia; + saddr.in.sin_port = htons(port); #ifndef WIN32 - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && errno != EINPROGRESS) { + if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && errno != EINPROGRESS) { #else - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) { + if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) { if (stream) xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "io_helper: WSAGetLastError() = %d\n", WSAGetLastError()); #endif /* WIN32 */ | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-engine/load_plugins.c ^ |
| @@ -1662,7 +1662,6 @@ plugin_node_t *node; vo_driver_t *driver; xine_video_port_t *port; - vo_info_t *vo_info; plugin_catalog_t *catalog = this->plugin_catalog; char *id; int list_id, list_size; @@ -1677,7 +1676,6 @@ node = xine_sarray_get (catalog->plugin_lists[PLUGIN_VIDEO_OUT - 1], list_id); - vo_info = (vo_info_t *)node->info->special_info; if (!strcasecmp (node->info->id, id)) { driver = _load_video_driver (this, node, NULL); break; @@ -1772,7 +1770,6 @@ { plugin_node_t *node; ao_driver_t *driver = NULL; - ao_info_t *ao_info; plugin_catalog_t *catalog = this->plugin_catalog; int list_id, list_size; @@ -1783,8 +1780,6 @@ node = xine_sarray_get (this->plugin_catalog->plugin_lists[PLUGIN_AUDIO_OUT - 1], list_id); - ao_info = (ao_info_t *)node->info->special_info; - if (!strcasecmp(node->info->id, id)) { driver = _load_audio_driver (this, node, NULL); break; | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-engine/osd.c ^ |
| @@ -374,7 +374,7 @@ this->stream->xine->port_ticket->release(this->stream->xine->port_ticket, 1); - return 1; + return ret; } | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-utils/color.c ^ |
| @@ -658,16 +658,31 @@ } -#define C_YUV420_YUYV( ) \ - *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ - *p_line1++ = *p_u; *p_line2++ = (*p_u++ + *p_u2++)>>1; \ - *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ - *p_line1++ = *p_v; *p_line2++ = (*p_v++ + *p_v2++)>>1; +#define C_YUV420_YUYV_PROGRESSIVE( ) \ + utmp = 3 * *p_u++; \ + vtmp = 3 * *p_v++; \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_ut++ + utmp) >> 2; *p_line2++ = (utmp + *p_ub++) >> 2; \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_vt++ + vtmp) >> 2; *p_line2++ = (vtmp + *p_vb++) >> 2; \ + +#define C_YUV420_YUYV_INTERLACED_ODD( ) \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_ut++ + *p_u * 7) >> 3; *p_line2++ = (*p_u++ * 5 + *p_ub++ * 3) >> 3; \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_vt++ + *p_v * 7) >> 3; *p_line2++ = (*p_v++ * 5 + *p_vb++ * 3) >> 3; \ + +#define C_YUV420_YUYV_INTERLACED_EVEN( ) \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_ut++ * 3 + *p_u * 5) >> 3; *p_line2++ = (*p_u++ * 7 + *p_ub++) >> 3; \ + *p_line1++ = *p_y1++; *p_line2++ = *p_y2++; \ + *p_line1++ = (*p_vt++ * 3 + *p_v * 5) >> 3; *p_line2++ = (*p_v++ * 7 + *p_vb++) >> 3; \ /***************************************************************************** * I420_YUY2: planar YUV 4:2:0 to packed YUYV 4:2:2 * original conversion routine from Videolan project - * changed to support interlaced frames and use simple mean interpolation [MF] + * changed to support interlaced frames and do correct chroma upsampling with + * correct weighting factors and no chroma shift. *****************************************************************************/ static void yv12_to_yuy2_c (const unsigned char *y_src, int y_src_pitch, @@ -680,10 +695,12 @@ const uint8_t *p_y1, *p_y2 = y_src; const uint8_t *p_u = u_src; const uint8_t *p_v = v_src; - const uint8_t *p_u2 = u_src + u_src_pitch; - const uint8_t *p_v2 = v_src + v_src_pitch; + const uint8_t *p_ub, *p_vb; + const uint8_t *p_ut = u_src; + const uint8_t *p_vt = v_src; int i_x, i_y; + int utmp, vtmp; const int i_source_margin = y_src_pitch - width; const int i_source_u_margin = u_src_pitch - width/2; @@ -701,28 +718,29 @@ p_y1 = p_y2; p_y2 += y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + u_src_pitch; + p_vb = p_v + v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_PROGRESSIVE( ); } p_y2 += i_source_margin; p_u += i_source_u_margin; p_v += i_source_v_margin; - if( i_y > 1 ) { - p_u2 += i_source_u_margin; - p_v2 += i_source_v_margin; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - u_src_pitch; + p_vt = p_v - v_src_pitch; p_line2 += i_dest_margin; } } else { - p_u2 = u_src + 2*u_src_pitch; - p_v2 = v_src + 2*v_src_pitch; for( i_y = height / 4 ; i_y-- ; ) { p_line1 = p_line2; @@ -731,21 +749,24 @@ p_y1 = p_y2; p_y2 += 2 * y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + 2 * u_src_pitch; + p_vb = p_v + 2 * v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_INTERLACED_ODD( ); } p_y2 += i_source_margin + y_src_pitch; p_u += i_source_u_margin + u_src_pitch; p_v += i_source_v_margin + v_src_pitch; - if( i_y > 1 ) { - p_u2 += i_source_u_margin + u_src_pitch; - p_v2 += i_source_v_margin + v_src_pitch; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - 2 * u_src_pitch; + p_vt = p_v - 2 * v_src_pitch; p_line2 += i_dest_margin + yuy2_pitch; } @@ -753,8 +774,8 @@ p_y2 = y_src + y_src_pitch; p_u = u_src + u_src_pitch; p_v = v_src + v_src_pitch; - p_u2 = u_src + 3*u_src_pitch; - p_v2 = v_src + 3*v_src_pitch; + p_ut = p_u; + p_vt = p_v; for( i_y = height / 4 ; i_y-- ; ) { @@ -764,21 +785,24 @@ p_y1 = p_y2; p_y2 += 2 * y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + 2 * u_src_pitch; + p_vb = p_v + 2 * v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_INTERLACED_EVEN( ); } p_y2 += i_source_margin + y_src_pitch; p_u += i_source_u_margin + u_src_pitch; p_v += i_source_v_margin + v_src_pitch; - if( i_y > 1 ) { - p_u2 += i_source_u_margin + u_src_pitch; - p_v2 += i_source_v_margin + v_src_pitch; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - 2 * u_src_pitch; + p_vt = p_v - 2 * v_src_pitch; p_line2 += i_dest_margin + yuy2_pitch; } @@ -788,38 +812,204 @@ #if defined(ARCH_X86) || defined(ARCH_X86_64) -#define MMXEXT_YUV420_YUYV( ) \ +#define MMXEXT_YUV420_YUYV_PROGRESSIVE( ) \ do { \ __asm__ __volatile__(".align 8 \n\t" \ "movq (%0), %%mm0 \n\t" /* Load 8 Y y7 y6 y5 y4 y3 y2 y1 y0 */ \ "movd (%1), %%mm1 \n\t" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */ \ "movd (%2), %%mm2 \n\t" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */ \ - "punpcklbw %%mm2, %%mm1 \n\t" /* v3 u3 v2 u2 v1 u1 v0 u0 */ \ - "movq %%mm0, %%mm2 \n\t" /* y7 y6 y5 y4 y3 y2 y1 y0 */ \ - "punpcklbw %%mm1, %%mm2 \n\t" /* v1 y3 u1 y2 v0 y1 u0 y0 */ \ + "pxor %%mm7, %%mm7 \n\t" /* 00 00 00 00 00 00 00 00 */ \ + "punpcklbw %%mm7, %%mm1 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm2 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "movq %%mm1, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "movq %%mm2, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "psllw $1, %%mm3 \n\t" /* Cb * 2 */ \ + "psllw $1, %%mm4 \n\t" /* Cr * 2 */ \ + "paddw %%mm3, %%mm1 \n\t" /* Cb * 3 */ \ + "paddw %%mm4, %%mm2 \n\t" /* Cr * 3 */ \ : \ : "r" (p_y1), "r" (p_u), "r" (p_v) ); \ __asm__ __volatile__( \ - "movd (%0), %%mm3 \n\t" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */ \ - "movd (%1), %%mm4 \n\t" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */ \ - "punpcklbw %%mm4, %%mm3 \n\t" /* v3 u3 v2 u2 v1 u1 v0 u0 */ \ - "pavgb %%mm1, %%mm3 \n\t" /* (mean) v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movd (%0), %%mm3 \n\t" /* Load 4 Cbt 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%1), %%mm4 \n\t" /* Load 4 Crt 00 00 00 00 v3 v2 v1 v0 */ \ + "movd (%2), %%mm5 \n\t" /* Load 4 Cbb 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%3), %%mm6 \n\t" /* Load 4 Crb 00 00 00 00 v3 v2 v1 v0 */ \ + "punpcklbw %%mm7, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "punpcklbw %%mm7, %%mm5 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm6 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "paddw %%mm1, %%mm3 \n\t" /* Cb1 = Cbt + 3*Cb */ \ + "paddw %%mm2, %%mm4 \n\t" /* Cr1 = Crt + 3*Cr */ \ + "paddw %%mm5, %%mm1 \n\t" /* Cb2 = Cbb + 3*Cb */ \ + "paddw %%mm6, %%mm2 \n\t" /* Cr2 = Crb + 3*Cr */ \ + "psrlw $2, %%mm3 \n\t" /* Cb1 = (Cbt + 3*Cb) / 4 */ \ + /* either the shifts by 2 and 8 or mask off bits and shift by 6 */ \ + "psrlw $2, %%mm4 \n\t" /* Cr1 = (Crt + 3*Cr) / 4 */ \ + "psllw $8, %%mm4 \n\t" \ + "por %%mm4, %%mm3 \n\t" /* Cr1 Cb1 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "psrlw $2, %%mm1 \n\t" /* Cb2 = (Cbb + 3*Cb) / 4 */ \ + "psrlw $2, %%mm2 \n\t" /* Cr2 = (Cbb + 3*Cb) / 4 */ \ + "psllw $8, %%mm2 \n\t" \ + "por %%mm1, %%mm2 \n\t" /* Cr2 Cb2 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movq %%mm0, %%mm1 \n\t" /* y7 y6 y5 y4 y3 y2 y1 y0 */ \ + "punpcklbw %%mm3, %%mm1 \n\t" /* v1 y3 u1 y2 v0 y1 u0 y0 */ \ : \ - : "r" (p_u2), "r" (p_v2) ); \ + : "r" (p_ut), "r" (p_vt), "r" (p_ub), "r" (p_vb) ); \ __asm__ __volatile__( \ - "movntq %%mm2, (%0) \n\t" /* Store low YUYV */ \ - "punpckhbw %%mm1, %%mm0 \n\t" /* v3 y7 u3 y6 v2 y5 u2 y4 */ \ - "movntq %%mm0, 8(%0) \n\t" /* Store high YUYV */ \ + "movntq %%mm1, (%0) \n\t" /* Store low YUYV1 */ \ + "punpckhbw %%mm3, %%mm0 \n\t" /* v3 y7 u3 y6 v2 y5 u2 y4 */ \ + "movntq %%mm0, 8(%0) \n\t" /* Store high YUYV1 */ \ "movq (%2), %%mm0 \n\t" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ - "movq %%mm0, %%mm2 \n\t" /* Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ - "punpcklbw %%mm3, %%mm2 \n\t" /* v1 Y3 u1 Y2 v0 Y1 u0 Y0 */ \ - "movntq %%mm2, (%1) \n\t" /* Store low YUYV */ \ - "punpckhbw %%mm3, %%mm0 \n\t" /* v3 Y7 u3 Y6 v2 Y5 u2 Y4 */ \ - "movntq %%mm0, 8(%1) \n\t" /* Store high YUYV */ \ + "movq %%mm0, %%mm1 \n\t" /* Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ + "punpcklbw %%mm2, %%mm1 \n\t" /* v1 Y3 u1 Y2 v0 Y1 u0 Y0 */ \ + "movntq %%mm1, (%1) \n\t" /* Store low YUYV2 */ \ + "punpckhbw %%mm2, %%mm0 \n\t" /* v3 Y7 u3 Y6 v2 Y5 u2 Y4 */ \ + "movntq %%mm0, 8(%1) \n\t" /* Store high YUYV2 */ \ : \ : "r" (p_line1), "r" (p_line2), "r" (p_y2) ); \ p_line1 += 16; p_line2 += 16; p_y1 += 8; p_y2 += 8; p_u += 4; p_v += 4; \ - p_u2 += 4; p_v2 += 4; \ + p_ub += 4; p_vb += 4; p_ut += 4; p_vt += 4; \ +} while(0) + +#define MMXEXT_YUV420_YUYV_INTERLACED_ODD( ) \ +do { \ + __asm__ __volatile__(".align 8 \n\t" \ + "movd (%0), %%mm1 \n\t" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%1), %%mm2 \n\t" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */ \ + "pxor %%mm7, %%mm7 \n\t" /* 00 00 00 00 00 00 00 00 */ \ + "punpcklbw %%mm7, %%mm1 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm2 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "movq %%mm1, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "movq %%mm2, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "psllw $2, %%mm3 \n\t" /* Cb * 4 */ \ + "psllw $2, %%mm4 \n\t" /* Cr * 4 */ \ + "paddw %%mm3, %%mm1 \n\t" /* Cb * 5 */ \ + "paddw %%mm4, %%mm2 \n\t" /* Cr * 5 */ \ + "psrlw $1, %%mm3 \n\t" /* Cb * 2 */ \ + "psrlw $1, %%mm4 \n\t" /* Cr * 2 */ \ + "paddw %%mm1, %%mm3 \n\t" /* Cb * 7 */ \ + "paddw %%mm2, %%mm4 \n\t" /* Cr * 7 */ \ + : \ + : "r" (p_u), "r" (p_v) ); \ + __asm__ __volatile__( \ + "movd (%1), %%mm5 \n\t" /* Load 4 Cbt 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%2), %%mm6 \n\t" /* Load 4 Crt 00 00 00 00 v3 v2 v1 v0 */ \ + "movq (%0), %%mm0 \n\t" /* Load 8 Y y7 y6 y5 y4 y3 y2 y1 y0 */ \ + "punpcklbw %%mm7, %%mm5 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm6 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "paddw %%mm3, %%mm5 \n\t" /* Cb1 = Cbt + 7*Cb */ \ + "paddw %%mm4, %%mm6 \n\t" /* Cr1 = Crt + 7*Cr */ \ + "psrlw $3, %%mm5 \n\t" /* Cb1 = (Cbt + 7*Cb) / 8 */ \ + /* either the shifts by 3 and 8 or mask off bits and shift by 5 */ \ + "psrlw $3, %%mm6 \n\t" /* Cr1 = (Crt + 7*Cr) / 8 */ \ + "psllw $8, %%mm6 \n\t" \ + "por %%mm5, %%mm6 \n\t" /* Cr1 Cb1 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movq %%mm0, %%mm3 \n\t" /* y7 y6 y5 y4 y3 y2 y1 y0 */ \ + "punpcklbw %%mm6, %%mm3 \n\t" /* v1 y3 u1 y2 v0 y1 u0 y0 */ \ + "movntq %%mm3, (%3) \n\t" /* Store low YUYV1 */ \ + "punpckhbw %%mm6, %%mm0 \n\t" /* v3 y7 u3 y6 v2 y5 u2 y4 */ \ + "movntq %%mm0, 8(%3) \n\t" /* Store high YUYV1 */ \ + : \ + : "r" (p_y1), "r" (p_ut), "r" (p_vt), "r" (p_line1) ); \ + __asm__ __volatile__( \ + "movd (%1), %%mm3 \n\t" /* Load 4 Cbb 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%2), %%mm4 \n\t" /* Load 4 Crb 00 00 00 00 v3 v2 v1 v0 */ \ + "movq (%0), %%mm0 \n\t" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ + "punpcklbw %%mm7, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "movq %%mm3, %%mm5 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "movq %%mm4, %%mm6 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "psllw $1, %%mm5 \n\t" /* Cbb * 2 */ \ + "psllw $1, %%mm6 \n\t" /* Crb * 2 */ \ + "paddw %%mm5, %%mm3 \n\t" /* Cbb * 3 */ \ + "paddw %%mm6, %%mm4 \n\t" /* Crb * 3 */ \ + "paddw %%mm3, %%mm1 \n\t" /* Cb2 = 3*Cbb + 5*Cb */ \ + "paddw %%mm4, %%mm2 \n\t" /* Cr2 = 3*Crb + 5*Cr */ \ + "psrlw $3, %%mm1 \n\t" /* Cb2 = (3*Cbb + 5*Cb) / 8 */ \ + /* either the shifts by 3 and 8 or mask off bits and shift by 5 */ \ + "psrlw $3, %%mm2 \n\t" /* Cr2 = (3*Crb + 5*Cr) / 8 */ \ + "psllw $8, %%mm2 \n\t" \ + "por %%mm1, %%mm2 \n\t" /* Cr2 Cb2 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movq %%mm0, %%mm1 \n\t" /* Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ + "punpcklbw %%mm2, %%mm1 \n\t" /* v1 Y3 u1 Y2 v0 Y1 u0 Y0 */ \ + "movntq %%mm1, (%3) \n\t" /* Store low YUYV2 */ \ + "punpckhbw %%mm2, %%mm0 \n\t" /* v3 Y7 u3 Y6 v2 Y5 u2 Y4 */ \ + "movntq %%mm0, 8(%3) \n\t" /* Store high YUYV2 */ \ + : \ + : "r" (p_y2), "r" (p_ub), "r" (p_vb), "r" (p_line2) ); \ + p_line1 += 16; p_line2 += 16; p_y1 += 8; p_y2 += 8; p_u += 4; p_v += 4; \ + p_ub += 4; p_vb += 4; p_ut += 4; p_vt += 4; \ +} while(0) + +#define MMXEXT_YUV420_YUYV_INTERLACED_EVEN( ) \ +/* same as above, except the assembly input arguments are switched */ \ +do { \ + __asm__ __volatile__(".align 8 \n\t" \ + "movd (%0), %%mm1 \n\t" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%1), %%mm2 \n\t" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */ \ + "pxor %%mm7, %%mm7 \n\t" /* 00 00 00 00 00 00 00 00 */ \ + "punpcklbw %%mm7, %%mm1 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm2 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "movq %%mm1, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "movq %%mm2, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "psllw $2, %%mm3 \n\t" /* Cb * 4 */ \ + "psllw $2, %%mm4 \n\t" /* Cr * 4 */ \ + "paddw %%mm3, %%mm1 \n\t" /* Cb * 5 */ \ + "paddw %%mm4, %%mm2 \n\t" /* Cr * 5 */ \ + "psrlw $1, %%mm3 \n\t" /* Cb * 2 */ \ + "psrlw $1, %%mm4 \n\t" /* Cr * 2 */ \ + "paddw %%mm1, %%mm3 \n\t" /* Cb * 7 */ \ + "paddw %%mm2, %%mm4 \n\t" /* Cr * 7 */ \ + : \ + : "r" (p_u), "r" (p_v) ); \ + __asm__ __volatile__( \ + "movd (%1), %%mm5 \n\t" /* Load 4 Cbt 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%2), %%mm6 \n\t" /* Load 4 Crt 00 00 00 00 v3 v2 v1 v0 */ \ + "movq (%0), %%mm0 \n\t" /* Load 8 Y y7 y6 y5 y4 y3 y2 y1 y0 */ \ + "punpcklbw %%mm7, %%mm5 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm6 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "paddw %%mm3, %%mm5 \n\t" /* Cb1 = Cbt + 7*Cb */ \ + "paddw %%mm4, %%mm6 \n\t" /* Cr1 = Crt + 7*Cr */ \ + "psrlw $3, %%mm5 \n\t" /* Cb1 = (Cbt + 7*Cb) / 8 */ \ + /* either the shifts by 3 and 8 or mask off bits and shift by 5 */ \ + "psrlw $3, %%mm6 \n\t" /* Cr1 = (Crt + 7*Cr) / 8 */ \ + "psllw $8, %%mm6 \n\t" \ + "por %%mm5, %%mm6 \n\t" /* Cr1 Cb1 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movq %%mm0, %%mm3 \n\t" /* y7 y6 y5 y4 y3 y2 y1 y0 */ \ + "punpcklbw %%mm6, %%mm3 \n\t" /* v1 y3 u1 y2 v0 y1 u0 y0 */ \ + "movntq %%mm3, (%3) \n\t" /* Store low YUYV1 */ \ + "punpckhbw %%mm6, %%mm0 \n\t" /* v3 y7 u3 y6 v2 y5 u2 y4 */ \ + "movntq %%mm0, 8(%3) \n\t" /* Store high YUYV1 */ \ + : \ + : "r" (p_y2), "r" (p_ub), "r" (p_vb), "r" (p_line2) ); \ + __asm__ __volatile__( \ + "movd (%1), %%mm3 \n\t" /* Load 4 Cbb 00 00 00 00 u3 u2 u1 u0 */ \ + "movd (%2), %%mm4 \n\t" /* Load 4 Crb 00 00 00 00 v3 v2 v1 v0 */ \ + "movq (%0), %%mm0 \n\t" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ + "punpcklbw %%mm7, %%mm3 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "punpcklbw %%mm7, %%mm4 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "movq %%mm3, %%mm5 \n\t" /* 00 u3 00 u2 00 u1 00 u0 */ \ + "movq %%mm4, %%mm6 \n\t" /* 00 v3 00 v2 00 v1 00 v0 */ \ + "psllw $1, %%mm5 \n\t" /* Cbb * 2 */ \ + "psllw $1, %%mm6 \n\t" /* Crb * 2 */ \ + "paddw %%mm5, %%mm3 \n\t" /* Cbb * 3 */ \ + "paddw %%mm6, %%mm4 \n\t" /* Crb * 3 */ \ + "paddw %%mm3, %%mm1 \n\t" /* Cb2 = 3*Cbb + 5*Cb */ \ + "paddw %%mm4, %%mm2 \n\t" /* Cr2 = 3*Crb + 5*Cr */ \ + "psrlw $3, %%mm1 \n\t" /* Cb2 = (3*Cbb + 5*Cb) / 8 */ \ + /* either the shifts by 3 and 8 or mask off bits and shift by 5 */ \ + "psrlw $3, %%mm2 \n\t" /* Cr2 = (3*Crb + 5*Cr) / 8 */ \ + "psllw $8, %%mm2 \n\t" \ + "por %%mm1, %%mm2 \n\t" /* Cr2 Cb2 interl v3 u3 v2 u2 v1 u1 v0 u0 */ \ + "movq %%mm0, %%mm1 \n\t" /* Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */ \ + "punpcklbw %%mm2, %%mm1 \n\t" /* v1 Y3 u1 Y2 v0 Y1 u0 Y0 */ \ + "movntq %%mm1, (%3) \n\t" /* Store low YUYV2 */ \ + "punpckhbw %%mm2, %%mm0 \n\t" /* v3 Y7 u3 Y6 v2 Y5 u2 Y4 */ \ + "movntq %%mm0, 8(%3) \n\t" /* Store high YUYV2 */ \ + : \ + : "r" (p_y1), "r" (p_ut), "r" (p_vt), "r" (p_line1) ); \ + p_line1 += 16; p_line2 += 16; p_y1 += 8; p_y2 += 8; p_u += 4; p_v += 4; \ + p_ub += 4; p_vb += 4; p_ut += 4; p_vt += 4; \ } while(0) #endif @@ -835,10 +1025,12 @@ const uint8_t *p_y1, *p_y2 = y_src; const uint8_t *p_u = u_src; const uint8_t *p_v = v_src; - const uint8_t *p_u2 = u_src + u_src_pitch; - const uint8_t *p_v2 = v_src + v_src_pitch; + const uint8_t *p_ub, *p_vb; + const uint8_t *p_ut = u_src; + const uint8_t *p_vt = v_src; int i_x, i_y; + int utmp, vtmp; const int i_source_margin = y_src_pitch - width; const int i_source_u_margin = u_src_pitch - width/2; @@ -855,32 +1047,33 @@ p_y1 = p_y2; p_y2 += y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + u_src_pitch; + p_vb = p_v + v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 8 ; i_x-- ; ) { - MMXEXT_YUV420_YUYV( ); + MMXEXT_YUV420_YUYV_PROGRESSIVE( ); } for( i_x = (width % 8) / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_PROGRESSIVE( ); } p_y2 += i_source_margin; p_u += i_source_u_margin; p_v += i_source_v_margin; - if( i_y > 1 ) { - p_u2 += i_source_u_margin; - p_v2 += i_source_v_margin; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - u_src_pitch; + p_vt = p_v - v_src_pitch; p_line2 += i_dest_margin; } } else { - p_u2 = u_src + 2*u_src_pitch; - p_v2 = v_src + 2*v_src_pitch; for( i_y = height / 4 ; i_y-- ; ) { p_line1 = p_line2; @@ -889,25 +1082,28 @@ p_y1 = p_y2; p_y2 += 2 * y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + 2 * u_src_pitch; + p_vb = p_v + 2 * v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 8 ; i_x-- ; ) { - MMXEXT_YUV420_YUYV( ); + MMXEXT_YUV420_YUYV_INTERLACED_ODD( ); } for( i_x = (width % 8) / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_INTERLACED_ODD( ); } p_y2 += i_source_margin + y_src_pitch; p_u += i_source_u_margin + u_src_pitch; p_v += i_source_v_margin + v_src_pitch; - if( i_y > 1 ) { - p_u2 += i_source_u_margin + u_src_pitch; - p_v2 += i_source_v_margin + v_src_pitch; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - 2 * u_src_pitch; + p_vt = p_v - 2 * v_src_pitch; p_line2 += i_dest_margin + yuy2_pitch; } @@ -915,9 +1111,9 @@ p_y2 = y_src + y_src_pitch; p_u = u_src + u_src_pitch; p_v = v_src + v_src_pitch; - p_u2 = u_src + 3*u_src_pitch; - p_v2 = v_src + 3*v_src_pitch; - + p_ut = p_u; + p_vt = p_v; + for( i_y = height / 4 ; i_y-- ; ) { p_line1 = p_line2; @@ -926,25 +1122,28 @@ p_y1 = p_y2; p_y2 += 2 * y_src_pitch; + if( i_y > 1 ) { + p_ub = p_u + 2 * u_src_pitch; + p_vb = p_v + 2 * v_src_pitch; + } else { + p_ub = p_u; + p_vb = p_v; + } + for( i_x = width / 8 ; i_x-- ; ) { - MMXEXT_YUV420_YUYV( ); + MMXEXT_YUV420_YUYV_INTERLACED_EVEN( ); } for( i_x = (width % 8) / 2 ; i_x-- ; ) { - C_YUV420_YUYV( ); + C_YUV420_YUYV_INTERLACED_EVEN( ); } p_y2 += i_source_margin + y_src_pitch; p_u += i_source_u_margin + u_src_pitch; p_v += i_source_v_margin + v_src_pitch; - if( i_y > 1 ) { - p_u2 += i_source_u_margin + u_src_pitch; - p_v2 += i_source_v_margin + v_src_pitch; - } else { - p_u2 = p_u; - p_v2 = p_v; - } + p_ut = p_u - 2 * u_src_pitch; + p_vt = p_v - 2 * v_src_pitch; p_line2 += i_dest_margin + yuy2_pitch; } @@ -1143,7 +1342,7 @@ else yv12_to_yuy2 = yv12_to_yuy2_c; - /* determine best YV12 -> YUY2 converter to use */ + /* determine best YUY2 -> YV12 converter to use */ if (xine_mm_accel() & MM_ACCEL_X86_MMXEXT) yuy2_to_yv12 = yuy2_to_yv12_mmxext; else | ||
| [+] | Changed | xine-lib-1.1.20.1.tar.bz2/src/xine-utils/cpu_accel.c ^ |
| @@ -46,11 +46,13 @@ #if defined(ARCH_X86) || defined(ARCH_X86_64) +#ifndef __x86_64__ static jmp_buf sigill_return; static void sigill_handler (int n) { longjmp(sigill_return, 1); } +#endif static uint32_t arch_accel (void) { | ||
| [+] | Deleted | xine-lib-1.1.20.tar.bz2/src/input/videodev2.h ^ |
| @@ -1,1408 +0,0 @@ -/* - * Video for Linux Two header file - * - * Copyright (C) 1999-2007 the contributors - * - * 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. - * - * Alternatively you can redistribute this file under the terms of the - * BSD license as stated below: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. The names of its contributors may not 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. - * - * Header file for v4l or V4L2 drivers and applications - * with public API. - * All kernel-specific stuff were moved to media/v4l2-dev.h, so - * no #if __KERNEL tests are allowed here - * - * See http://linuxtv.org for more info - * - * Author: Bill Dirks <bill@thedirks.org> - * Justin Schoeman - * Hans Verkuil <hverkuil@xs4all.nl> - * et al. - */ -#ifndef __LINUX_VIDEODEV2_H -#define __LINUX_VIDEODEV2_H -#define __user -#include <sys/time.h> -#include <linux/types.h> - -/* - * Common stuff for both V4L1 and V4L2 - * Moved from videodev.h - */ -#define VIDEO_MAX_FRAME 32 - -#define VID_TYPE_CAPTURE 1 /* Can capture */ -#define VID_TYPE_TUNER 2 /* Can tune */ -#define VID_TYPE_TELETEXT 4 /* Does teletext */ -#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -#define VID_TYPE_CLIPPING 32 /* Can clip */ -#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -#define VID_TYPE_SCALES 128 /* Scalable */ -#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ - -/* - * M I S C E L L A N E O U S - */ - -/* Four-character-code (FOURCC) */ -#define v4l2_fourcc(a,b,c,d)\ - (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24)) - -/* - * E N U M S - */ -enum v4l2_field { - V4L2_FIELD_ANY = 0, /* driver can choose from none, - top, bottom, interlaced - depending on whatever it thinks - is approximate ... */ - V4L2_FIELD_NONE = 1, /* this device has no fields ... */ - V4L2_FIELD_TOP = 2, /* top field only */ - V4L2_FIELD_BOTTOM = 3, /* bottom field only */ - V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */ - V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one - buffer, top-bottom order */ - V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */ - V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into - separate buffers */ - V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field - first and the top field is - transmitted first */ - V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field - first and the bottom field is - transmitted first */ -}; -#define V4L2_FIELD_HAS_TOP(field) \ - ((field) == V4L2_FIELD_TOP ||\ - (field) == V4L2_FIELD_INTERLACED ||\ - (field) == V4L2_FIELD_INTERLACED_TB ||\ - (field) == V4L2_FIELD_INTERLACED_BT ||\ - (field) == V4L2_FIELD_SEQ_TB ||\ - (field) == V4L2_FIELD_SEQ_BT) -#define V4L2_FIELD_HAS_BOTTOM(field) \ - ((field) == V4L2_FIELD_BOTTOM ||\ - (field) == V4L2_FIELD_INTERLACED ||\ - (field) == V4L2_FIELD_INTERLACED_TB ||\ - (field) == V4L2_FIELD_INTERLACED_BT ||\ - (field) == V4L2_FIELD_SEQ_TB ||\ - (field) == V4L2_FIELD_SEQ_BT) -#define V4L2_FIELD_HAS_BOTH(field) \ - ((field) == V4L2_FIELD_INTERLACED ||\ - (field) == V4L2_FIELD_INTERLACED_TB ||\ - (field) == V4L2_FIELD_INTERLACED_BT ||\ - (field) == V4L2_FIELD_SEQ_TB ||\ - (field) == V4L2_FIELD_SEQ_BT) - -enum v4l2_buf_type { - V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, - V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, - V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, - V4L2_BUF_TYPE_VBI_CAPTURE = 4, - V4L2_BUF_TYPE_VBI_OUTPUT = 5, - V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6, - V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7, -#if 1 - /* Experimental */ - V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8, -#endif - V4L2_BUF_TYPE_PRIVATE = 0x80, -}; - -enum v4l2_ctrl_type { - V4L2_CTRL_TYPE_INTEGER = 1, - V4L2_CTRL_TYPE_BOOLEAN = 2, - V4L2_CTRL_TYPE_MENU = 3, - V4L2_CTRL_TYPE_BUTTON = 4, - V4L2_CTRL_TYPE_INTEGER64 = 5, - V4L2_CTRL_TYPE_CTRL_CLASS = 6, -}; - -enum v4l2_tuner_type { - V4L2_TUNER_RADIO = 1, - V4L2_TUNER_ANALOG_TV = 2, - V4L2_TUNER_DIGITAL_TV = 3, -}; - -enum v4l2_memory { - V4L2_MEMORY_MMAP = 1, - V4L2_MEMORY_USERPTR = 2, - V4L2_MEMORY_OVERLAY = 3, -}; - -/* see also http://vektor.theorem.ca/graphics/ycbcr/ */ -enum v4l2_colorspace { - /* ITU-R 601 -- broadcast NTSC/PAL */ - V4L2_COLORSPACE_SMPTE170M = 1, - - /* 1125-Line (US) HDTV */ - V4L2_COLORSPACE_SMPTE240M = 2, - - /* HD and modern captures. */ - V4L2_COLORSPACE_REC709 = 3, - - /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */ - V4L2_COLORSPACE_BT878 = 4, - - /* These should be useful. Assume 601 extents. */ - V4L2_COLORSPACE_470_SYSTEM_M = 5, - V4L2_COLORSPACE_470_SYSTEM_BG = 6, - - /* I know there will be cameras that send this. So, this is - * unspecified chromaticities and full 0-255 on each of the - * Y'CbCr components - */ - V4L2_COLORSPACE_JPEG = 7, - - /* For RGB colourspaces, this is probably a good start. */ - V4L2_COLORSPACE_SRGB = 8, -}; - -enum v4l2_priority { - V4L2_PRIORITY_UNSET = 0, /* not initialized */ - V4L2_PRIORITY_BACKGROUND = 1, - V4L2_PRIORITY_INTERACTIVE = 2, - V4L2_PRIORITY_RECORD = 3, - V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE, -}; - -struct v4l2_rect { - __s32 left; - __s32 top; - __s32 width; - __s32 height; -}; - -struct v4l2_fract { - __u32 numerator; - __u32 denominator; -}; - -/* - * D R I V E R C A P A B I L I T I E S - */ -struct v4l2_capability -{ - __u8 driver[16]; /* i.e. "bttv" */ - __u8 card[32]; /* i.e. "Hauppauge WinTV" */ - __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ - __u32 version; /* should use KERNEL_VERSION() */ - __u32 capabilities; /* Device capabilities */ - __u32 reserved[4]; -}; - -/* Values for 'capabilities' field */ -#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */ -#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */ -#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */ -#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a raw VBI capture device */ -#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a raw VBI output device */ -#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 /* Is a sliced VBI capture device */ -#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 /* Is a sliced VBI output device */ -#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ -#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output overlay */ - -#define V4L2_CAP_TUNER 0x00010000 /* has a tuner */ -#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ -#define V4L2_CAP_RADIO 0x00040000 /* is a radio device */ - -#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ -#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ -#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ - -/* - * V I D E O I M A G E F O R M A T - */ -struct v4l2_pix_format -{ - __u32 width; - __u32 height; - __u32 pixelformat; - enum v4l2_field field; - __u32 bytesperline; /* for padding, zero if unused */ - __u32 sizeimage; - enum v4l2_colorspace colorspace; - __u32 priv; /* private data, depends on pixelformat */ -}; - -/* Pixel format FOURCC depth Description */ -#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */ -#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */ -#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */ -#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') /* 16 RGB-5-5-5 BE */ -#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R') /* 16 RGB-5-6-5 BE */ -#define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B','G','R','3') /* 24 BGR-8-8-8 */ -#define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R','G','B','3') /* 24 RGB-8-8-8 */ -#define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B','G','R','4') /* 32 BGR-8-8-8-8 */ -#define V4L2_PIX_FMT_RGB32 v4l2_fourcc('R','G','B','4') /* 32 RGB-8-8-8-8 */ -#define V4L2_PIX_FMT_GREY v4l2_fourcc('G','R','E','Y') /* 8 Greyscale */ -#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y','V','U','9') /* 9 YVU 4:1:0 */ -#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y','V','1','2') /* 12 YVU 4:2:0 */ -#define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y','U','Y','V') /* 16 YUV 4:2:2 */ -#define V4L2_PIX_FMT_UYVY v4l2_fourcc('U','Y','V','Y') /* 16 YUV 4:2:2 */ -#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') /* 16 YVU422 planar */ -#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') /* 16 YVU411 planar */ -#define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y','4','1','P') /* 12 YUV 4:1:1 */ - -/* two planes -- one Y, one Cr + Cb interleaved */ -#define V4L2_PIX_FMT_NV12 v4l2_fourcc('N','V','1','2') /* 12 Y/CbCr 4:2:0 */ -#define V4L2_PIX_FMT_NV21 v4l2_fourcc('N','V','2','1') /* 12 Y/CrCb 4:2:0 */ - -/* The following formats are not defined in the V4L2 specification */ -#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y','U','V','9') /* 9 YUV 4:1:0 */ -#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y','U','1','2') /* 12 YUV 4:2:0 */ -#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ -#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ -#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */ -#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R','4','4','4') /* 16 xxxxrrrr ggggbbbb */ - -/* see http://www.siliconimaging.com/RGB%20Bayer.htm */ -#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ - -/* compressed formats */ -#define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M','J','P','G') /* Motion-JPEG */ -#define V4L2_PIX_FMT_JPEG v4l2_fourcc('J','P','E','G') /* JFIF JPEG */ -#define V4L2_PIX_FMT_DV v4l2_fourcc('d','v','s','d') /* 1394 */ -#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') /* MPEG-1/2/4 */ - -/* Vendor-specific formats */ -#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compress */ -#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ -#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ -#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ -#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */ - -/* - * F O R M A T E N U M E R A T I O N - */ -struct v4l2_fmtdesc -{ - __u32 index; /* Format number */ - enum v4l2_buf_type type; /* buffer type */ - __u32 flags; - __u8 description[32]; /* Description string */ - __u32 pixelformat; /* Format fourcc */ - __u32 reserved[4]; -}; - -#define V4L2_FMT_FLAG_COMPRESSED 0x0001 - -#if 1 - /* Experimental Frame Size and frame rate enumeration */ -/* - * F R A M E S I Z E E N U M E R A T I O N - */ -enum v4l2_frmsizetypes -{ - V4L2_FRMSIZE_TYPE_DISCRETE = 1, - V4L2_FRMSIZE_TYPE_CONTINUOUS = 2, - V4L2_FRMSIZE_TYPE_STEPWISE = 3, -}; - -struct v4l2_frmsize_discrete -{ - __u32 width; /* Frame width [pixel] */ - __u32 height; /* Frame height [pixel] */ -}; - -struct v4l2_frmsize_stepwise -{ - __u32 min_width; /* Minimum frame width [pixel] */ - __u32 max_width; /* Maximum frame width [pixel] */ - __u32 step_width; /* Frame width step size [pixel] */ - __u32 min_height; /* Minimum frame height [pixel] */ - __u32 max_height; /* Maximum frame height [pixel] */ - __u32 step_height; /* Frame height step size [pixel] */ -}; - -struct v4l2_frmsizeenum -{ - __u32 index; /* Frame size number */ - __u32 pixel_format; /* Pixel format */ - __u32 type; /* Frame size type the device supports. */ - - union { /* Frame size */ - struct v4l2_frmsize_discrete discrete; - struct v4l2_frmsize_stepwise stepwise; - }; - - __u32 reserved[2]; /* Reserved space for future use */ -}; - -/* - * F R A M E R A T E E N U M E R A T I O N - */ -enum v4l2_frmivaltypes -{ - V4L2_FRMIVAL_TYPE_DISCRETE = 1, - V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, - V4L2_FRMIVAL_TYPE_STEPWISE = 3, -}; - -struct v4l2_frmival_stepwise -{ - struct v4l2_fract min; /* Minimum frame interval [s] */ - struct v4l2_fract max; /* Maximum frame interval [s] */ - struct v4l2_fract step; /* Frame interval step size [s] */ -}; - -struct v4l2_frmivalenum -{ - __u32 index; /* Frame format index */ - __u32 pixel_format; /* Pixel format */ - __u32 width; /* Frame width */ - __u32 height; /* Frame height */ - __u32 type; /* Frame interval type the device supports. */ - - union { /* Frame interval */ - struct v4l2_fract discrete; - struct v4l2_frmival_stepwise stepwise; - }; - - __u32 reserved[2]; /* Reserved space for future use */ -}; -#endif - -/* - * T I M E C O D E - */ -struct v4l2_timecode -{ - __u32 type; - __u32 flags; - __u8 frames; - __u8 seconds; - __u8 minutes; - __u8 hours; - __u8 userbits[4]; -}; - -/* Type */ -#define V4L2_TC_TYPE_24FPS 1 -#define V4L2_TC_TYPE_25FPS 2 -#define V4L2_TC_TYPE_30FPS 3 -#define V4L2_TC_TYPE_50FPS 4 -#define V4L2_TC_TYPE_60FPS 5 - -/* Flags */ -#define V4L2_TC_FLAG_DROPFRAME 0x0001 /* "drop-frame" mode */ -#define V4L2_TC_FLAG_COLORFRAME 0x0002 -#define V4L2_TC_USERBITS_field 0x000C -#define V4L2_TC_USERBITS_USERDEFINED 0x0000 -#define V4L2_TC_USERBITS_8BITCHARS 0x0008 -/* The above is based on SMPTE timecodes */ - - -struct v4l2_jpegcompression -{ - int quality; - - int APPn; /* Number of APP segment to be written, - * must be 0..15 */ - int APP_len; /* Length of data in JPEG APPn segment */ - char APP_data[60]; /* Data in the JPEG APPn segment. */ - - int COM_len; /* Length of data in JPEG COM segment */ - char COM_data[60]; /* Data in JPEG COM segment */ - - __u32 jpeg_markers; /* Which markers should go into the JPEG - * output. Unless you exactly know what - * you do, leave them untouched. - * Inluding less markers will make the - * resulting code smaller, but there will - * be fewer aplications which can read it. - * The presence of the APP and COM marker - * is influenced by APP_len and COM_len - * ONLY, not by this property! */ - -#define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */ -#define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */ -#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ -#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ -#define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will - * allways use APP0 */ -}; - -/* - * M E M O R Y - M A P P I N G B U F F E R S - */ -struct v4l2_requestbuffers -{ - __u32 count; - enum v4l2_buf_type type; - enum v4l2_memory memory; - __u32 reserved[2]; -}; - -struct v4l2_buffer -{ - __u32 index; - enum v4l2_buf_type type; - __u32 bytesused; - __u32 flags; - enum v4l2_field field; - struct timeval timestamp; - struct v4l2_timecode timecode; - __u32 sequence; - - /* memory location */ - enum v4l2_memory memory; - union { - __u32 offset; - unsigned long userptr; - } m; - __u32 length; - __u32 input; - __u32 reserved; -}; - -/* Flags for 'flags' field */ -#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ -#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ -#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ -#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ -#define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */ -#define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */ -#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */ - -/* - * O V E R L A Y P R E V I E W - */ -struct v4l2_framebuffer -{ - __u32 capability; - __u32 flags; -/* FIXME: in theory we should pass something like PCI device + memory - * region + offset instead of some physical address */ - void* base; - struct v4l2_pix_format fmt; -}; -/* Flags for the 'capability' field. Read only */ -#define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001 -#define V4L2_FBUF_CAP_CHROMAKEY 0x0002 -#define V4L2_FBUF_CAP_LIST_CLIPPING 0x0004 -#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008 -#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 -#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 -#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 -/* Flags for the 'flags' field. */ -#define V4L2_FBUF_FLAG_PRIMARY 0x0001 -#define V4L2_FBUF_FLAG_OVERLAY 0x0002 -#define V4L2_FBUF_FLAG_CHROMAKEY 0x0004 -#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 -#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 -#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 - -struct v4l2_clip -{ - struct v4l2_rect c; - struct v4l2_clip *next; -}; - -struct v4l2_window -{ - struct v4l2_rect w; - enum v4l2_field field; - __u32 chromakey; - struct v4l2_clip *clips; - __u32 clipcount; - void *bitmap; - __u8 global_alpha; -}; - -/* - * C A P T U R E P A R A M E T E R S - */ -struct v4l2_captureparm -{ - __u32 capability; /* Supported modes */ - __u32 capturemode; /* Current mode */ - struct v4l2_fract timeperframe; /* Time per frame in .1us units */ - __u32 extendedmode; /* Driver-specific extensions */ - __u32 readbuffers; /* # of buffers for read */ - __u32 reserved[4]; -}; - -/* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ -#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ - -struct v4l2_outputparm -{ - __u32 capability; /* Supported modes */ - __u32 outputmode; /* Current mode */ - struct v4l2_fract timeperframe; /* Time per frame in seconds */ - __u32 extendedmode; /* Driver-specific extensions */ - __u32 writebuffers; /* # of buffers for write */ - __u32 reserved[4]; -}; - -/* - * I N P U T I M A G E C R O P P I N G - */ -struct v4l2_cropcap { - enum v4l2_buf_type type; - struct v4l2_rect bounds; - struct v4l2_rect defrect; - struct v4l2_fract pixelaspect; -}; - -struct v4l2_crop { - enum v4l2_buf_type type; - struct v4l2_rect c; -}; - -/* - * A N A L O G V I D E O S T A N D A R D - */ - -typedef __u64 v4l2_std_id; - -/* one bit for each */ -#define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001) -#define V4L2_STD_PAL_B1 ((v4l2_std_id)0x00000002) -#define V4L2_STD_PAL_G ((v4l2_std_id)0x00000004) -#define V4L2_STD_PAL_H ((v4l2_std_id)0x00000008) -#define V4L2_STD_PAL_I ((v4l2_std_id)0x00000010) -#define V4L2_STD_PAL_D ((v4l2_std_id)0x00000020) -#define V4L2_STD_PAL_D1 ((v4l2_std_id)0x00000040) -#define V4L2_STD_PAL_K ((v4l2_std_id)0x00000080) - -#define V4L2_STD_PAL_M ((v4l2_std_id)0x00000100) -#define V4L2_STD_PAL_N ((v4l2_std_id)0x00000200) -#define V4L2_STD_PAL_Nc ((v4l2_std_id)0x00000400) -#define V4L2_STD_PAL_60 ((v4l2_std_id)0x00000800) - -#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) -#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) -#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) -#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) - -#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) -#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) -#define V4L2_STD_SECAM_G ((v4l2_std_id)0x00040000) -#define V4L2_STD_SECAM_H ((v4l2_std_id)0x00080000) -#define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000) -#define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000) -#define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000) -#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000) - -/* ATSC/HDTV */ -#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) -#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) - -/* FIXME: - Although std_id is 64 bits, there is an issue on PPC32 architecture that - makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding - this value to 32 bits. - As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide), - it should work fine. However, if needed to add more than two standards, - v4l2-common.c should be fixed. - */ - -/* some merged standards */ -#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) -#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) -#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) -#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) - -/* some common needed stuff */ -#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ - V4L2_STD_PAL_B1 |\ - V4L2_STD_PAL_G) -#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D |\ - V4L2_STD_PAL_D1 |\ - V4L2_STD_PAL_K) -#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\ - V4L2_STD_PAL_DK |\ - V4L2_STD_PAL_H |\ - V4L2_STD_PAL_I) -#define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ - V4L2_STD_NTSC_M_JP |\ - V4L2_STD_NTSC_M_KR) -#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ - V4L2_STD_SECAM_K |\ - V4L2_STD_SECAM_K1) -#define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\ - V4L2_STD_SECAM_G |\ - V4L2_STD_SECAM_H |\ - V4L2_STD_SECAM_DK |\ - V4L2_STD_SECAM_L |\ - V4L2_STD_SECAM_LC) - -#define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ - V4L2_STD_PAL_60 |\ - V4L2_STD_NTSC |\ - V4L2_STD_NTSC_443) -#define V4L2_STD_625_50 (V4L2_STD_PAL |\ - V4L2_STD_PAL_N |\ - V4L2_STD_PAL_Nc |\ - V4L2_STD_SECAM) -#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\ - V4L2_STD_ATSC_16_VSB) - -#define V4L2_STD_UNKNOWN 0 -#define V4L2_STD_ALL (V4L2_STD_525_60 |\ - V4L2_STD_625_50) - -struct v4l2_standard -{ - __u32 index; - v4l2_std_id id; - __u8 name[24]; - struct v4l2_fract frameperiod; /* Frames, not fields */ - __u32 framelines; - __u32 reserved[4]; -}; - -/* - * V I D E O I N P U T S - */ -struct v4l2_input -{ - __u32 index; /* Which input */ - __u8 name[32]; /* Label */ - __u32 type; /* Type of input */ - __u32 audioset; /* Associated audios (bitfield) */ - __u32 tuner; /* Associated tuner */ - v4l2_std_id std; - __u32 status; - __u32 reserved[4]; -}; - -/* Values for the 'type' field */ -#define V4L2_INPUT_TYPE_TUNER 1 -#define V4L2_INPUT_TYPE_CAMERA 2 - -/* field 'status' - general */ -#define V4L2_IN_ST_NO_POWER 0x00000001 /* Attached device is off */ -#define V4L2_IN_ST_NO_SIGNAL 0x00000002 -#define V4L2_IN_ST_NO_COLOR 0x00000004 - -/* field 'status' - analog */ -#define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */ -#define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */ - -/* field 'status' - digital */ -#define V4L2_IN_ST_NO_SYNC 0x00010000 /* No synchronization lock */ -#define V4L2_IN_ST_NO_EQU 0x00020000 /* No equalizer lock */ -#define V4L2_IN_ST_NO_CARRIER 0x00040000 /* Carrier recovery failed */ - -/* field 'status' - VCR and set-top box */ -#define V4L2_IN_ST_MACROVISION 0x01000000 /* Macrovision detected */ -#define V4L2_IN_ST_NO_ACCESS 0x02000000 /* Conditional access denied */ -#define V4L2_IN_ST_VTR 0x04000000 /* VTR time constant */ - -/* - * V I D E O O U T P U T S - */ -struct v4l2_output -{ - __u32 index; /* Which output */ - __u8 name[32]; /* Label */ - __u32 type; /* Type of output */ - __u32 audioset; /* Associated audios (bitfield) */ - __u32 modulator; /* Associated modulator */ - v4l2_std_id std; - __u32 reserved[4]; -}; -/* Values for the 'type' field */ -#define V4L2_OUTPUT_TYPE_MODULATOR 1 -#define V4L2_OUTPUT_TYPE_ANALOG 2 -#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3 - -/* - * C O N T R O L S - */ -struct v4l2_control -{ - __u32 id; - __s32 value; -}; - -struct v4l2_ext_control -{ - __u32 id; - __u32 reserved2[2]; - union { - __s32 value; - __s64 value64; - void *reserved; - }; -} __attribute__ ((packed)); - -struct v4l2_ext_controls -{ - __u32 ctrl_class; - __u32 count; - __u32 error_idx; - __u32 reserved[2]; - struct v4l2_ext_control *controls; -}; - -/* Values for ctrl_class field */ -#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ -#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ - -#define V4L2_CTRL_ID_MASK (0x0fffffff) -#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) -#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) - -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -struct v4l2_queryctrl -{ - __u32 id; - enum v4l2_ctrl_type type; - __u8 name[32]; /* Whatever */ - __s32 minimum; /* Note signedness */ - __s32 maximum; - __s32 step; - __s32 default_value; - __u32 flags; - __u32 reserved[2]; -}; - -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ -struct v4l2_querymenu -{ - __u32 id; - __u32 index; - __u8 name[32]; /* Whatever */ - __u32 reserved; -}; - -/* Control flags */ -#define V4L2_CTRL_FLAG_DISABLED 0x0001 -#define V4L2_CTRL_FLAG_GRABBED 0x0002 -#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 -#define V4L2_CTRL_FLAG_UPDATE 0x0008 -#define V4L2_CTRL_FLAG_INACTIVE 0x0010 -#define V4L2_CTRL_FLAG_SLIDER 0x0020 - -/* Query flag, to be ORed with the control ID */ -#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 - -/* User-class control IDs defined by V4L2 */ -#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) -#define V4L2_CID_USER_BASE V4L2_CID_BASE -/* IDs reserved for driver specific controls */ -#define V4L2_CID_PRIVATE_BASE 0x08000000 - -#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) -#define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) -#define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) -#define V4L2_CID_SATURATION (V4L2_CID_BASE+2) -#define V4L2_CID_HUE (V4L2_CID_BASE+3) -#define V4L2_CID_AUDIO_VOLUME (V4L2_CID_BASE+5) -#define V4L2_CID_AUDIO_BALANCE (V4L2_CID_BASE+6) -#define V4L2_CID_AUDIO_BASS (V4L2_CID_BASE+7) -#define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8) -#define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9) -#define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10) -#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) -#define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12) -#define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13) -#define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14) -#define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15) -#define V4L2_CID_GAMMA (V4L2_CID_BASE+16) -#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* ? Not sure */ -#define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17) -#define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18) -#define V4L2_CID_GAIN (V4L2_CID_BASE+19) -#define V4L2_CID_HFLIP (V4L2_CID_BASE+20) -#define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) -#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /* last CID + 1 */ - -/* MPEG-class control IDs defined by V4L2 */ -#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) -#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) - -/* MPEG streams */ -#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) -enum v4l2_mpeg_stream_type { - V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */ - V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */ - V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */ - V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */ - V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ - V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ -}; -#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) -#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) -#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) -#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) -#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) -#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) -#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) -enum v4l2_mpeg_stream_vbi_fmt { - V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ - V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ -}; - -/* MPEG audio */ -#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) -enum v4l2_mpeg_audio_sampling_freq { - V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, - V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, - V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) -enum v4l2_mpeg_audio_encoding { - V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, - V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, - V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) -enum v4l2_mpeg_audio_l1_bitrate { - V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, - V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2, - V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3, - V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4, - V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5, - V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6, - V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7, - V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8, - V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9, - V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10, - V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11, - V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, - V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) -enum v4l2_mpeg_audio_l2_bitrate { - V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, - V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2, - V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3, - V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4, - V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5, - V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6, - V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7, - V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8, - V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9, - V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10, - V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11, - V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, - V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) -enum v4l2_mpeg_audio_l3_bitrate { - V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, - V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2, - V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3, - V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4, - V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5, - V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6, - V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7, - V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8, - V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9, - V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10, - V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11, - V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, - V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) -enum v4l2_mpeg_audio_mode { - V4L2_MPEG_AUDIO_MODE_STEREO = 0, - V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, - V4L2_MPEG_AUDIO_MODE_DUAL = 2, - V4L2_MPEG_AUDIO_MODE_MONO = 3, -}; -#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) -enum v4l2_mpeg_audio_mode_extension { - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, -}; -#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) -enum v4l2_mpeg_audio_emphasis { - V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, - V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, - V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) -enum v4l2_mpeg_audio_crc { - V4L2_MPEG_AUDIO_CRC_NONE = 0, - V4L2_MPEG_AUDIO_CRC_CRC16 = 1, -}; -#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) - -/* MPEG video */ -#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) -enum v4l2_mpeg_video_encoding { - V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, - V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, -}; -#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) -enum v4l2_mpeg_video_aspect { - V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, - V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, - V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, - V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, -}; -#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) -#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) -#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) -#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) -#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) -enum v4l2_mpeg_video_bitrate_mode { - V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, - V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, -}; -#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) -#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) -#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) -#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) -#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) - -/* MPEG-class control IDs specific to the CX2584x driver as defined by V4L2 */ -#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) -#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) -enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { - V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, - V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) -enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) -enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { - V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) -enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { - V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, - V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) -#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) -enum v4l2_mpeg_cx2341x_video_median_filter_type { - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) -#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) - -/* - * T U N I N G - */ -struct v4l2_tuner -{ - __u32 index; - __u8 name[32]; - enum v4l2_tuner_type type; - __u32 capability; - __u32 rangelow; - __u32 rangehigh; - __u32 rxsubchans; - __u32 audmode; - __s32 signal; - __s32 afc; - __u32 reserved[4]; -}; - -struct v4l2_modulator -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 rangelow; - __u32 rangehigh; - __u32 txsubchans; - __u32 reserved[4]; -}; - -/* Flags for the 'capability' field */ -#define V4L2_TUNER_CAP_LOW 0x0001 -#define V4L2_TUNER_CAP_NORM 0x0002 -#define V4L2_TUNER_CAP_STEREO 0x0010 -#define V4L2_TUNER_CAP_LANG2 0x0020 -#define V4L2_TUNER_CAP_SAP 0x0020 -#define V4L2_TUNER_CAP_LANG1 0x0040 - -/* Flags for the 'rxsubchans' field */ -#define V4L2_TUNER_SUB_MONO 0x0001 -#define V4L2_TUNER_SUB_STEREO 0x0002 -#define V4L2_TUNER_SUB_LANG2 0x0004 -#define V4L2_TUNER_SUB_SAP 0x0004 -#define V4L2_TUNER_SUB_LANG1 0x0008 - -/* Values for the 'audmode' field */ -#define V4L2_TUNER_MODE_MONO 0x0000 -#define V4L2_TUNER_MODE_STEREO 0x0001 -#define V4L2_TUNER_MODE_LANG2 0x0002 -#define V4L2_TUNER_MODE_SAP 0x0002 -#define V4L2_TUNER_MODE_LANG1 0x0003 -#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 - -struct v4l2_frequency -{ - __u32 tuner; - enum v4l2_tuner_type type; - __u32 frequency; - __u32 reserved[8]; -}; - -/* - * A U D I O - */ -struct v4l2_audio -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 mode; - __u32 reserved[2]; -}; - -/* Flags for the 'capability' field */ -#define V4L2_AUDCAP_STEREO 0x00001 -#define V4L2_AUDCAP_AVL 0x00002 - -/* Flags for the 'mode' field */ -#define V4L2_AUDMODE_AVL 0x00001 - -struct v4l2_audioout -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 mode; - __u32 reserved[2]; -}; - -/* - * M P E G S E R V I C E S - * - * NOTE: EXPERIMENTAL API - */ -#if 1 -#define V4L2_ENC_IDX_FRAME_I (0) -#define V4L2_ENC_IDX_FRAME_P (1) -#define V4L2_ENC_IDX_FRAME_B (2) -#define V4L2_ENC_IDX_FRAME_MASK (0xf) - -struct v4l2_enc_idx_entry { - __u64 offset; - __u64 pts; - __u32 length; - __u32 flags; - __u32 reserved[2]; -}; - -#define V4L2_ENC_IDX_ENTRIES (64) -struct v4l2_enc_idx { - __u32 entries; - __u32 entries_cap; - __u32 reserved[4]; - struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES]; -}; - - -#define V4L2_ENC_CMD_START (0) -#define V4L2_ENC_CMD_STOP (1) -#define V4L2_ENC_CMD_PAUSE (2) -#define V4L2_ENC_CMD_RESUME (3) - -/* Flags for V4L2_ENC_CMD_STOP */ -#define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0) - -struct v4l2_encoder_cmd { - __u32 cmd; - __u32 flags; - union { - struct { - __u32 data[8]; - } raw; - }; -}; - -#endif - - -/* - * D A T A S E R V I C E S ( V B I ) - * - * Data services API by Michael Schimek - */ - -/* Raw VBI */ -struct v4l2_vbi_format -{ - __u32 sampling_rate; /* in 1 Hz */ - __u32 offset; - __u32 samples_per_line; - __u32 sample_format; /* V4L2_PIX_FMT_* */ - __s32 start[2]; - __u32 count[2]; - __u32 flags; /* V4L2_VBI_* */ - __u32 reserved[2]; /* must be zero */ -}; - -/* VBI flags */ -#define V4L2_VBI_UNSYNC (1<< 0) -#define V4L2_VBI_INTERLACED (1<< 1) - -/* Sliced VBI - * - * This implements is a proposal V4L2 API to allow SLICED VBI - * required for some hardware encoders. It should change without - * notice in the definitive implementation. - */ - -struct v4l2_sliced_vbi_format -{ - __u16 service_set; - /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field - service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field - (equals frame lines 313-336 for 625 line video - standards, 263-286 for 525 line standards) */ - __u16 service_lines[2][24]; - __u32 io_size; - __u32 reserved[2]; /* must be zero */ -}; - -/* Teletext World System Teletext - (WST), defined on ITU-R BT.653-2 */ -#define V4L2_SLICED_TELETEXT_B (0x0001) -/* Video Program System, defined on ETS 300 231*/ -#define V4L2_SLICED_VPS (0x0400) -/* Closed Caption, defined on EIA-608 */ -#define V4L2_SLICED_CAPTION_525 (0x1000) -/* Wide Screen System, defined on ITU-R BT1119.1 */ -#define V4L2_SLICED_WSS_625 (0x4000) - -#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) -#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) - -struct v4l2_sliced_vbi_cap -{ - __u16 service_set; - /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field - service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field - (equals frame lines 313-336 for 625 line video - standards, 263-286 for 525 line standards) */ - __u16 service_lines[2][24]; - enum v4l2_buf_type type; - __u32 reserved[3]; /* must be 0 */ -}; - -struct v4l2_sliced_vbi_data -{ - __u32 id; - __u32 field; /* 0: first field, 1: second field */ - __u32 line; /* 1-23 */ - __u32 reserved; /* must be 0 */ - __u8 data[48]; -}; - -/* - * A G G R E G A T E S T R U C T U R E S - */ - -/* Stream data format - */ -struct v4l2_format -{ - enum v4l2_buf_type type; - union - { - struct v4l2_pix_format pix; // V4L2_BUF_TYPE_VIDEO_CAPTURE - struct v4l2_window win; // V4L2_BUF_TYPE_VIDEO_OVERLAY - struct v4l2_vbi_format vbi; // V4L2_BUF_TYPE_VBI_CAPTURE - struct v4l2_sliced_vbi_format sliced; // V4L2_BUF_TYPE_SLICED_VBI_CAPTURE - __u8 raw_data[200]; // user-defined - } fmt; -}; - - -/* Stream type-dependent parameters - */ -struct v4l2_streamparm -{ - enum v4l2_buf_type type; - union - { - struct v4l2_captureparm capture; - struct v4l2_outputparm output; - __u8 raw_data[200]; /* user-defined */ - } parm; -}; - -/* - * A D V A N C E D D E B U G G I N G - * - * NOTE: EXPERIMENTAL API - */ - -/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ - -#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for the host) */ -#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver ID */ -#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ - -struct v4l2_register { - __u32 match_type; /* Match type */ - __u32 match_chip; /* Match this chip, meaning determined by match_type */ - __u64 reg; - __u64 val; -}; - -/* VIDIOC_G_CHIP_IDENT */ -struct v4l2_chip_ident { - __u32 match_type; /* Match type */ - __u32 match_chip; /* Match this chip, meaning determined by match_type */ - __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */ - __u32 revision; /* chip revision, chip specific */ -}; - -/* - * I O C T L C O D E S F O R V I D E O D E V I C E S - * - */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) -#define VIDIOC_RESERVED _IO ('V', 1) -#define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) -#define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) -#define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format) -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) -#define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) -#define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) -#define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) -#define VIDIOC_STREAMON _IOW ('V', 18, int) -#define VIDIOC_STREAMOFF _IOW ('V', 19, int) -#define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) -#define VIDIOC_S_PARM _IOWR ('V', 22, struct v4l2_streamparm) -#define VIDIOC_G_STD _IOR ('V', 23, v4l2_std_id) -#define VIDIOC_S_STD _IOW ('V', 24, v4l2_std_id) -#define VIDIOC_ENUMSTD _IOWR ('V', 25, struct v4l2_standard) -#define VIDIOC_ENUMINPUT _IOWR ('V', 26, struct v4l2_input) -#define VIDIOC_G_CTRL _IOWR ('V', 27, struct v4l2_control) -#define VIDIOC_S_CTRL _IOWR ('V', 28, struct v4l2_control) -#define VIDIOC_G_TUNER _IOWR ('V', 29, struct v4l2_tuner) -#define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) -#define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) -#define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) -#define VIDIOC_G_INPUT _IOR ('V', 38, int) -#define VIDIOC_S_INPUT _IOWR ('V', 39, int) -#define VIDIOC_G_OUTPUT _IOR ('V', 46, int) -#define VIDIOC_S_OUTPUT _IOWR ('V', 47, int) -#define VIDIOC_ENUMOUTPUT _IOWR ('V', 48, struct v4l2_output) -#define VIDIOC_G_AUDOUT _IOR ('V', 49, struct v4l2_audioout) -#define VIDIOC_S_AUDOUT _IOW ('V', 50, struct v4l2_audioout) -#define VIDIOC_G_MODULATOR _IOWR ('V', 54, struct v4l2_modulator) -#define VIDIOC_S_MODULATOR _IOW ('V', 55, struct v4l2_modulator) -#define VIDIOC_G_FREQUENCY _IOWR ('V', 56, struct v4l2_frequency) -#define VIDIOC_S_FREQUENCY _IOW ('V', 57, struct v4l2_frequency) -#define VIDIOC_CROPCAP _IOWR ('V', 58, struct v4l2_cropcap) -#define VIDIOC_G_CROP _IOWR ('V', 59, struct v4l2_crop) -#define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) -#define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) -#define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) -#define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) -#define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) -#define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) -#define VIDIOC_G_PRIORITY _IOR ('V', 67, enum v4l2_priority) -#define VIDIOC_S_PRIORITY _IOW ('V', 68, enum v4l2_priority) -#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap) -#define VIDIOC_LOG_STATUS _IO ('V', 70) -#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) -#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) -#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) -#if 1 -#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum) -#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum) -#define VIDIOC_G_ENC_INDEX _IOR ('V', 76, struct v4l2_enc_idx) -#define VIDIOC_ENCODER_CMD _IOWR ('V', 77, struct v4l2_encoder_cmd) -#define VIDIOC_TRY_ENCODER_CMD _IOWR ('V', 78, struct v4l2_encoder_cmd) - -/* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ -#define VIDIOC_DBG_S_REGISTER _IOW ('V', 79, struct v4l2_register) -#define VIDIOC_DBG_G_REGISTER _IOWR ('V', 80, struct v4l2_register) - -#define VIDIOC_G_CHIP_IDENT _IOWR ('V', 81, struct v4l2_chip_ident) -#endif - -#ifdef __OLD_VIDIOC_ -/* for compatibility, will go away some day */ -#define VIDIOC_OVERLAY_OLD _IOWR ('V', 14, int) -#define VIDIOC_S_PARM_OLD _IOW ('V', 22, struct v4l2_streamparm) -#define VIDIOC_S_CTRL_OLD _IOW ('V', 28, struct v4l2_control) -#define VIDIOC_G_AUDIO_OLD _IOWR ('V', 33, struct v4l2_audio) -#define VIDIOC_G_AUDOUT_OLD _IOWR ('V', 49, struct v4l2_audioout) -#define VIDIOC_CROPCAP_OLD _IOR ('V', 58, struct v4l2_cropcap) -#endif - -#define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ - -#endif /* __LINUX_VIDEODEV2_H */ - -/* - * Local variables: - * c-basic-offset: 8 - * End: - */ | ||