[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[174] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[174] mplayerxp
|
From: <nic...@us...> - 2012-10-19 14:22:28
|
Revision: 174
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=174&view=rev
Author: nickols_k
Date: 2012-10-19 14:22:17 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
remove obsolete libcss support
Modified Paths:
--------------
DOCS/mplayerxp.1
mplayerxp/cfg-mplayer.h
mplayerxp/configure
mplayerxp/input/input.h
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/mplayer.c
mplayerxp/nls/help_mp-cz.h
mplayerxp/nls/help_mp-de.h
mplayerxp/nls/help_mp-dk.h
mplayerxp/nls/help_mp-en.h
mplayerxp/nls/help_mp-es.h
mplayerxp/nls/help_mp-fr.h
mplayerxp/nls/help_mp-hu.h
mplayerxp/nls/help_mp-it.h
mplayerxp/nls/help_mp-ko.h
mplayerxp/nls/help_mp-nl.h
mplayerxp/nls/help_mp-no.h
mplayerxp/nls/help_mp-pl.h
mplayerxp/nls/help_mp-ro.h
mplayerxp/nls/help_mp-ru.h
mplayerxp/nls/help_mp-sk.h
Removed Paths:
-------------
mplayerxp/libmpdemux/dvdauth.c
mplayerxp/libmpdemux/dvdauth.h
Modified: DOCS/mplayerxp.1
===================================================================
--- DOCS/mplayerxp.1 2012-10-19 13:51:44 UTC (rev 173)
+++ DOCS/mplayerxp.1 2012-10-19 14:22:17 UTC (rev 174)
@@ -587,16 +587,6 @@
some DVD discs contain scenes that can be viewed from multiple angles.
Examples can be found below.
.TP
-.B \-dvdauth\ <device>
-provides authentification of encrypted DVD disk with using of libcss
-.TP
-.B \-dvdkey key
-key to decrypt stream encrypted with CSS. For example : -dvdkey F169072699
-(this is NOT for DVD playing! For DVD use the dvdnav:// option!)
-.TP
-.B \-csslib\ <path to libcss.so>
-This option is useful only if libcss.so can't be autodetected
-.TP
.B \-audio.lang\ <audio\ stream\ language>
Used when playing DVD disks. Expects a two-letter country code(s) as
parameter, and always tries to playback audio streams those language
Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/cfg-mplayer.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -347,11 +347,6 @@
{"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL, "turns MPlayerXP into slave mode as a backend for other programs"},
{"use-stdin", &use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "forces reading of keyboard codes from STDIN instead of terminal's console"},
{"msgfilter", &mp_msg_filter, CONF_TYPE_INT, CONF_RANGE, 0, 0xFFFFFFFF, NULL, "specifies filter for verbosed messages"},
-#ifdef HAVE_LIBCSS
- {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0, NULL,"provides authentification of encrypted DVD disk"},
- {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0, NULL,"specifies key to decrypt stream encrypted with CSS"},
- {"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0, NULL,"specifies path to libcss.so"},
-#endif
{"core", &xpcore_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "XP-core related options" },
{"play", &playback_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Playback specific options" },
Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/configure 2012-10-19 14:22:17 UTC (rev 174)
@@ -77,7 +77,6 @@
"lirc|build with LIRC (remote control) support|http://www.lirc.org",
"lircc|build with LIRCC (remote daemon control) support|http://www.lirc.org",
"joystick|build with joystick support",
- "libcss|build with libcss support|http://download.videolan.org/pub/videolan/libdvdcss",
"libdvdread|build with libdvdread support|http://www.dtek.chalmers.se/groups/dvd/downloads.shtml",
"libdvdnav|build with libdvdnav support|http://dvd.sourceforge.net",
"libdv|build with libdv support|http://libdv.sourceforge.net/",
@@ -670,10 +669,6 @@
print_config HAVE_ mp_config.h mp_config.mak jack
enabled jack && aomodules="jack $aomodules" || noaomodules="jack $noaomodules"
-enabled libcss && require2 libcss css.h CSSisEncrypted -lcss
-print_config HAVE_ mp_config.h mp_config.mak libcss
-enabled libcss && inputmodules="libcss $inputmodules" || noinputmodules="libcss $noinputmodules"
-
enabled libdvdread && require2 libdvdread "stdint.h dvdread/dvd_reader.h dvdread/ifo_types.h dvdread/ifo_read.h dvdread/nav_read.h" DVDOpenFile -ldvdread
dvdread=$libdvdread
print_config USE_ mp_config.h mp_config.mak dvdread
Modified: mplayerxp/input/input.h
===================================================================
--- mplayerxp/input/input.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/input/input.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -1,6 +1,6 @@
// All commands id
#define MP_CMD_SEEK 0
-#define MP_CMD_RESERVED 1
+#define MP_CMD_RESERVED_0 1
#define MP_CMD_QUIT 2
#define MP_CMD_PAUSE 3
#define MP_CMD_SOFT_QUIT 4
Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/libmpdemux/Makefile 2012-10-19 14:22:17 UTC (rev 174)
@@ -29,7 +29,7 @@
ifeq ($(HAVE_LIBDV),yes)
SRCS += demux_dv.c
endif
-SRCS += cache2.c dvdauth.c stream.c tvi_dummy.c tvi_v4l.c
+SRCS += cache2.c stream.c tvi_dummy.c tvi_v4l.c
SRCS += tvi_bsdbt848.c frequencies.c mrl.c
SRCS += demuxer_r.c mp3_hdr.c video.c mpeg_hdr.c aviprint.c demux_asf.c
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/libmpdemux/demux_mpg.c 2012-10-19 14:22:17 UTC (rev 174)
@@ -20,7 +20,6 @@
#include "stheader.h"
#include "mp3_hdr.h"
-#include "dvdauth.h"
#include "../libmpcodecs/dec_audio.h"
#include "demux_msg.h"
//#define MAX_PS_PACKETSIZE 2048
@@ -184,15 +183,12 @@
static int demux_mpg_read_packet(demuxer_t *demux,int id){
int d;
int len;
-#ifdef HAVE_LIBCSS
- int css=0;
-#endif
unsigned char c=0;
int pts=MPGPES_BAD_PTS;
unsigned int dts=0;
demux_stream_t *ds=NULL;
mpg_demuxer_t *priv = (mpg_demuxer_t *) demux->priv;
-
+
MSG_DBG3("demux_read_packet: %X\n",id);
// if(id==0x1F0){
@@ -246,13 +242,8 @@
int pts_flags;
int hdrlen;
// System-2 (.VOB) stream:
- if((c>>4)&3) {
-#ifdef HAVE_LIBCSS
- css=1;
-#else
- MSG_WARN(MSGTR_EncryptedVOB);
-#endif
- }
+ if((c>>4)&3) MSG_WARN("Encrypted VOB found! That should never happens");
+
c=stream_read_char(demux->stream); pts_flags=c>>6;
c=stream_read_char(demux->stream); hdrlen=c;
len-=2;
@@ -389,12 +380,7 @@
if(ds){
MSG_DBG2("DEMUX_MPG: Read %d data bytes from packet %04X\n",len,id);
-#ifdef HAVE_LIBCSS
- if (css) {
- if (descrambling) dvd_css_descramble(demux->stream->buffer,key_title);
- else MSG_WARN(MSGTR_EncryptedVOBauth);
- }
-#endif
+
if(ds==ds->demuxer->sub) {
if (pts == MPGPES_BAD_PTS) {
pts = priv->last_sub_pts;
Deleted: mplayerxp/libmpdemux/dvdauth.c
===================================================================
--- mplayerxp/libmpdemux/dvdauth.c 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/libmpdemux/dvdauth.c 2012-10-19 14:22:17 UTC (rev 174)
@@ -1,283 +0,0 @@
-/* (C)2001,2002 by LGB (Gabor Lenart), based on example programs in libcss
- lg...@lg...
-
- This source is part of MPlayer project. This source is copyrighted by
- the author according to rules declared in GNU/GPL license.
-
- 2001 Inital version (LGB)
- 2001 fibmap_mplayer to avoid uid=0 mplayer need (LGB)
- 2001 Support for libcss with the new API (by ???)
- 2002/Jan/04 Use dlopen to access libcss.so to avoid conflict with
- libdvdread [now with only libcss with old API (LGB)
-
- TODO:
- support for libcss libraries with new API */
-
-/* don't do anything with this source if css support was not requested */
-#include "../mp_config.h"
-#ifdef HAVE_LIBCSS
-
-#warning FIXME: Dynamic loading of libcss.so with newer (ver>0.1) libcss API is not supported in this version!
-
-#include <stdio.h>
-#include <stdlib.h>
-//#include <string.h> // FIXME: conflicts with fs.h
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-// #include <css.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-# include <sys/dvdio.h>
-#elif defined(__OpenBSD__)
-# include <sys/cdio.h>
-# define RTLD_NOW RTLD_LAZY
-#elif defined(__linux__)
-# include <linux/cdrom.h>
-#elif defined(__sun)
-# include <sun/dvdio.h>
-#elif defined(__bsdi__)
-# include <dvd.h>
-#else
-# error "Need the DVD ioctls"
-#endif
-
-#include <dlfcn.h>
-#include "dvdauth.h"
-#include "demux_msg.h"
-
-// #if OLD_CSS_API
-/*
- * provide some backward compatibiliy macros to compile this
- * code using the old libcss-0.1
- */
-#define DVDHandle int
-#define DVDOpenFailed (-1)
-
-#define DVDAuth(hdl, s) ioctl(hdl, DVD_AUTH, s)
-#define DVDOpenDevice(path) open(path, O_RDONLY)
-#define DVDCloseDevice(hdl) close(hdl)
-// #define CSSDVDisEncrypted(hdl) CSSisEncrypted(hdl)
-// #define CSSDVDAuthDisc CSSAuthDisc
-
-
-char *dvd_auth_device=NULL;
-char *dvd_raw_device=NULL;
-char *css_so=NULL;
-unsigned char key_disc[2048];
-unsigned char key_title[5];
-unsigned char *dvdimportkey=NULL;
-int descrambling=0;
-
-static any_t*dlid;
-static int (*dl_CSSisEncrypted)(int);
-static int (*dl_CSSAuthDisc)(int,char *);
-static int (*dl_CSSAuthTitle)(int, char *,int);
-static int (*dl_CSSGetASF)(int);
-static int (*dl_CSSDecryptTitleKey)(char *, char *);
-static void (*dl_CSSDescramble)(u_char *, u_char *);
-
-int dvd_css_descramble ( u_char *sec , u_char *key )
-{
- (*dl_CSSDescramble)(sec,key);
- return 0;
-}
-
-
-#ifdef __linux__
-#include <linux/fs.h>
-
-#ifndef FIBMAP
-#define FIBMAP 1
-#endif
-
-
-static int path_to_lba (char *path)
-{
- int lba = 0;
- char cmd[100];
- FILE *fp;
-
- snprintf(cmd,sizeof(cmd),"fibmap_mplayer %s",path);
- fp=popen(cmd,"r");
- if (fp) {
- int ret;
- memset(cmd,0,sizeof(cmd));
- fgets(cmd,99,fp);
- if ((ret=pclose(fp)))
- MSG_V("DVD: fibmap_mplayer: %s\n",*cmd?cmd:"no error info");
- if (cmd[0]<'0'||cmd[0]>'9') fp=NULL; else {
- if(WIFEXITED(ret) && !WEXITSTATUS(ret)) {
- lba=atoi(cmd);
- MSG_OK("DVD: fibmap_mplayer is being used\n");
- } else
- fp=NULL;
- }
- }
- if (!fp) {
- int fd;
- MSG_ERR("DVD: fibmap_mplayer could not run, trying with ioctl() ...\n");
- if ((fd = open(path, O_RDONLY)) == -1) {
- MSG_ERR( "DVD: Cannot open file %s: %s",
- path ? path : "(NULL)", strerror(errno));
- return -1;
- }
- if (ioctl(fd, FIBMAP, &lba) != 0) {
- perror("DVD: ioctl FIBMAP");
- MSG_HINT(" Hint: run mplayer as root (or better to install fibmap_mplayer as suid root)!\n");
- close(fd);
- return -1;
- }
- close(fd);
- }
- MSG_V("DVD: LBA: %d\n",lba);
- return lba;
-}
-
-#else /*linux*/
-
-static int path_to_lba (char *path)
-{
-#warning translating pathname to iso9660 LBA is not supported on this platform
- MSG_ERR( "DVD: Translating pathname to iso9660 LBA is not supported on this platform\n");
- return -1;
-}
-
-#endif /*linux*/
-
-
-static int CSSDVDAuthTitlePath(DVDHandle hdl,unsigned char *key_title,char *path)
-{
- int lba=path_to_lba(path);
- if (lba==-1) return -1;
- return (*dl_CSSAuthTitle)(hdl,key_title,lba);
-}
-
-
-
-static void reset_agids ( DVDHandle dvd )
-{
-#if !defined(DVD_AUTH) && defined(DVDIOCREPORTKEY)
- struct dvd_authinfo ai;
- int i;
- for (i = 0; i < 4; i++) {
- memset(&ai, 0, sizeof(ai));
- ai.format = DVD_INVALIDATE_AGID;
- ai.agid = i;
- ioctl(dvd, DVDIOCREPORTKEY, &ai);
- }
-#else
-#if defined(__OpenBSD__)
- union
-#endif
- dvd_authinfo ai;
- int i;
- for (i = 0; i < 4; i++) {
- memset(&ai, 0, sizeof(ai));
- ai.type = DVD_INVALIDATE_AGID;
- ai.lsa.agid = i;
- DVDAuth(dvd, &ai);
- }
-#endif
-}
-
-
-int dvd_import_key ( unsigned char *hexkey )
-{
- unsigned char *t=key_title;
- int digit=4,len;
- memset(key_title,0,sizeof(key_title));
- for (len=0;len<10;len++) {
- if (!*hexkey) return 1;
- if (*hexkey>='A'&&*hexkey<='F') *t|=(*hexkey-'A'+10)<<digit;
- else if (*hexkey>='0'&&*hexkey<='9') *t|=(*hexkey-'0')<<digit;
- else return 1;
- if (digit) digit=0; else {
- digit=4;
- t++;
- }
- hexkey++;
- }
- if (*hexkey) return 1;
- MSG_V("DVD: DVD key (requested): %02X%02X%02X%02X%02X\n",key_title[0],key_title[1],key_title[2],key_title[3],key_title[4]);
- descrambling=1;
- return 0;
-}
-
-
-
-int dvd_auth ( char *dev , char *filename )
-{
- DVDHandle dvd; /* DVD device handle */
-
- if (!css_so) css_so=(char *)strdup("libcss"SLIBSUFFIX);
- MSG_V("DVD: opening libcss.so as %s ...\n",css_so);
- dlid=dlopen(css_so,RTLD_NOW);
- if (!dlid) {
- MSG_ERR("DVD: dlopen: %s\n",dlerror());
- return 1;
- } MSG_V("DVD: dlopen OK!\n");
-
-#ifdef __OpenBSD__
-#define CSS_DLSYM(v,s) if (!(v=ld_sym(dlid,"_" s))) {\
-MSG_HINT("DVD: %s\n Hint: use libcss version 0.1!\n",dlerror());\
-return 1; }
-#else
-#define CSS_DLSYM(v,s) if (!(v=ld_sym(dlid,s))) {\
-MSG_HINT("DVD: %s\n Hint: use libcss version 0.1!\n",dlerror());\
-return 1; }
-#endif
-
- CSS_DLSYM(dl_CSSisEncrypted,"CSSisEncrypted");
- CSS_DLSYM(dl_CSSAuthDisc,"CSSAuthDisc");
- CSS_DLSYM(dl_CSSAuthTitle,"CSSAuthTitle");
- CSS_DLSYM(dl_CSSGetASF,"CSSGetASF");
- CSS_DLSYM(dl_CSSDecryptTitleKey,"CSSDecryptTitleKey");
- CSS_DLSYM(dl_CSSDescramble,"CSSDescramble");
-
-#undef CSS_DLSYM
-
- if ((dvd=DVDOpenDevice(dev)) == DVDOpenFailed) {
- MSG_ERR("DVD: cannot open DVD device \"%s\": %s.\n",
- dev, strerror(errno));
- return 1;
- }
-
- if (!(*dl_CSSisEncrypted)(dvd)) {
- MSG_V("DVD: DVD is unencrypted! Skipping authentication!\n(note: you should not use -dvd switch for unencrypted discs!)\n");
- DVDCloseDevice(dvd);
- return 0;
- } else MSG_V("DVD: DVD is encrypted, issuing authentication ...\n");
- /* reset AGIDs */
- reset_agids(dvd);
- /* authenticate disc */
- if ((*dl_CSSAuthDisc)(dvd,key_disc)) {
- MSG_ERR("DVD: CSSDVDAuthDisc() failed.\n");
- DVDCloseDevice(dvd);
- return 1;
- }
- if (CSSDVDAuthTitlePath(dvd,key_title,filename)) {
- MSG_ERR("DVD: CSSDVDAuthTitle() failed.\n");
- DVDCloseDevice(dvd);
- return 1;
- }
-
- /* decrypting title */
- if ((*dl_CSSDecryptTitleKey)(key_title, key_disc) < 0) {
- MSG_ERR("DVD: CSSDecryptTitleKey() failed.\n");
- DVDCloseDevice(dvd);
- return 1;
- }
-
- DVDCloseDevice(dvd);
- MSG_V("DVD: DVD title key is: %02X%02X%02X%02X%02X\n",key_title[0],key_title[1],key_title[2],key_title[3],key_title[4]);
- descrambling=1;
- return 0;
-}
-
-
-#endif
Deleted: mplayerxp/libmpdemux/dvdauth.h
===================================================================
--- mplayerxp/libmpdemux/dvdauth.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/libmpdemux/dvdauth.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -1,17 +0,0 @@
-#ifdef HAVE_LIBCSS
-#ifndef _MPLAYER_CSS_H
-#define _MPLAYER_CSS_H
-
-extern char *dvd_auth_device;
-extern unsigned char key_disc[];
-extern unsigned char key_title[];
-extern unsigned char *dvdimportkey;
-extern int descrambling;
-extern char *css_so;
-
-int dvd_auth ( char *, char * );
-int dvd_import_key ( unsigned char * );
-int dvd_css_descramble ( u_char *, u_char * );
-
-#endif
-#endif
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/mplayer.c 2012-10-19 14:22:17 UTC (rev 174)
@@ -46,7 +46,6 @@
#include "libvo/sub.h"
#include "libao2/audio_out.h"
#include "codec-cfg.h"
-#include "dvdauth.h"
#include "spudec.h"
#include "vobsub.h"
@@ -1875,26 +1874,6 @@
}
}
-#ifdef HAVE_LIBCSS
-static void mpxp_init_dvdkey(void) {
- pinfo[xp_id].current_module="libcss";
- if (dvdimportkey) {
- if (dvd_import_key(dvdimportkey)) {
- MSG_FATAL(MSGTR_ErrorDVDkey);
- exit_player(MSGTR_Exit_error);
- }
- MSG_INFO(MSGTR_CmdlineDVDkey);
- }
- if (dvd_auth_device) {
- if (dvd_auth(dvd_auth_device,filename)) {
- MSG_FATAL("Error in DVD auth...\n");
- exit_player(MSGTR_Exit_error);
- }
- MSG_INFO(MSGTR_DVDauthOk);
- }
-}
-#endif
-
static void mpxp_print_stream_formats(void) {
int fmt;
char *c;
@@ -2627,10 +2606,6 @@
goto goto_next_file;
}
-#ifdef HAVE_LIBCSS
- mpxp_init_dvdkey();
-#endif
-
/* Add NLS support here */
mpxp_init_dvd_nls();
Modified: mplayerxp/nls/help_mp-cz.h
===================================================================
--- mplayerxp/nls/help_mp-cz.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-cz.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -139,9 +139,6 @@
#define MSGTR_CantSeekRawAVI "Nelze se posouvat v surových (raw) .AVI proudech! (Potřebuji index, zkuste použít volbu -idx !) \n"
#define MSGTR_CantSeekFile "Nemohu posouvat v tomto souboru! \n"
-#define MSGTR_EncryptedVOB "Kódovaný VOB soubor (přeloženo bez podpory libcss)! Přečtěte si DOCS/DVD\n"
-#define MSGTR_EncryptedVOBauth "Zakódovaný proud, ale autentikaci jste nepožadoval!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Komprimované hlavičky nejsou (ještě) podporovány!\n"
#define MSGTR_MOVvariableFourCC "MOV: Upozornění! proměnná FOURCC detekována!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Upozornění! Příliš mnoho stop!"
Modified: mplayerxp/nls/help_mp-de.h
===================================================================
--- mplayerxp/nls/help_mp-de.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-de.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -136,9 +136,6 @@
#define MSGTR_CantSeekRawAVI "Kann keine RAW .AVI-Streams durchsuchen! (Index erforderlich, versuche es mit der -idx Option!) \n"
#define MSGTR_CantSeekFile "Kann diese Datei nicht durchsuchen! \n"
-#define MSGTR_EncryptedVOB "Verschlüsselte VOB-Datei (wurde ohne libcss Unterstützung kompiliert)! Lese DOCS\n"
-#define MSGTR_EncryptedVOBauth "Verschlüsselter Stream, jedoch wurde die Authentifizierung nicht von dir gefordert!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Komprimierte Header werden (zur Zeit) nicht unterstützt!\n"
#define MSGTR_MOVvariableFourCC "MOV: Warnung! Variable FOURCC erkannt!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Warnung! Zu viele Tracks!"
Modified: mplayerxp/nls/help_mp-dk.h
===================================================================
--- mplayerxp/nls/help_mp-dk.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-dk.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -136,8 +136,6 @@
#define MSGTR_CouldntDetFNo "Kunne ikke finde antallet af billeder (for en SOF søgning) \n"
#define MSGTR_CantSeekRawAVI "Kan ikke søge i rå .AVI streams! (manglende index, prøv med -idx!) \n"
#define MSGTR_CantSeekFile "Kan ikke søge i denne fil! \n"
-#define MSGTR_EncryptedVOB "Krypteret VOB fil (ikke kompileret med libcss support)! Læs filen DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Krypteret stream men autoriseringen blev ikke påbegyndt af dig!!\n"
#define MSGTR_MOVcomprhdr "MOV: Komprimeret header (endnu) ikke supported!\n"
#define MSGTR_MOVvariableFourCC "MOV: Advarsel! variablen FOURCC detecteret!?\n"
Modified: mplayerxp/nls/help_mp-en.h
===================================================================
--- mplayerxp/nls/help_mp-en.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-en.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -385,13 +385,6 @@
#define MSGTR_CantSeekFile "Can't seek in this file! \n"
#endif
-#ifndef MSGTR_EncryptedVOB
-#define MSGTR_EncryptedVOB "Encrypted VOB file (not compiled with libcss support)! Read file DOCS/cd-dvd.html\n"
-#endif
-#ifndef MSGTR_EncryptedVOBauth
-#define MSGTR_EncryptedVOBauth "Encrypted stream but authentication was not requested by you!!\n"
-#endif
-
#ifndef MSGTR_MOVcomprhdr
#define MSGTR_MOVcomprhdr "MOV: Compressed headers not (yet) supported!\n"
#endif
Modified: mplayerxp/nls/help_mp-es.h
===================================================================
--- mplayerxp/nls/help_mp-es.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-es.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -137,9 +137,6 @@
#define MSGTR_CantSeekRawAVI "No se puede avanzar/retroceder en un stream crudo .AVI! (se requiere índice, pruebe con -idx!) \n"
#define MSGTR_CantSeekFile "No se puede avanzar/retroceder en este archivo! \n"
-#define MSGTR_EncryptedVOB "Archivos VOB encriptados (no se compiló con soporte de libcss)! Lea DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Stream encriptado pero usted no pidió autenticación!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Cabecera comprimida no suportada (por ahora)!\n"
#define MSGTR_MOVvariableFourCC "MOV: Advertencia! FOURCC variable detectada!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Advertencia! demasiadas pistas!"
Modified: mplayerxp/nls/help_mp-fr.h
===================================================================
--- mplayerxp/nls/help_mp-fr.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-fr.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -141,9 +141,6 @@
#define MSGTR_CantSeekRawAVI "Ne peut chercher dans un flux .AVI brut! (index requis, essayez l'option -idx!)\n"
#define MSGTR_CantSeekFile "Ne peut chercher dans ce fichier! \n"
-#define MSGTR_EncryptedVOB "Fichier VOB encrypté (support libcss NON compilé!) Lire DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Flux encrypté mais l'authentification n'a pas été demandée par vous!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Les entêtes compressées ne sont pas (encore) supportés!\n"
#define MSGTR_MOVvariableFourCC "MOV: Attention! Variable FOURCC détectée!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Attention! Trop de pistes!"
Modified: mplayerxp/nls/help_mp-hu.h
===================================================================
--- mplayerxp/nls/help_mp-hu.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-hu.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -135,9 +135,6 @@
#define MSGTR_CantSeekRawAVI "Nem tudok nyers .AVI-kban tekerni! (index kell, próbáld az -idx kapcsolóval!)\n"
#define MSGTR_CantSeekFile "Nem tudok ebben a fileban tekerni! \n"
-#define MSGTR_EncryptedVOB "Kódolt VOB file (libcss támogatás nincs befordítva!) Olvasd el a doksit\n"
-#define MSGTR_EncryptedVOBauth "Kódolt folyam, de nem kértél autentikálást!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Tömörített fejlécek (még) nincsenek támogatva!\n"
#define MSGTR_MOVvariableFourCC "MOV: Vigyázat! változó FOURCC detektálva!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Vigyázat! túl sok sáv!"
Modified: mplayerxp/nls/help_mp-it.h
===================================================================
--- mplayerxp/nls/help_mp-it.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-it.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -139,9 +139,6 @@
#define MSGTR_CantSeekRawAVI "Impossibile spostarsi nei flussi .AVI grezzi! (richiesto un indice, prova con l\'opzione -idx !) \n"
#define MSGTR_CantSeekFile "Impossibile spostarsi in questo file! \n"
-#define MSGTR_EncryptedVOB "File VOB criptato (non compilato con il supporto delle libcss)! Leggi il file DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Flusso criptato di cui non è stata chiesta l\'autenticazione!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Intestazioni compresse non (ancora) supportate!\n"
#define MSGTR_MOVvariableFourCC "MOV: Avvertimento! Rilevata variabile FOURCC !?\n"
#define MSGTR_MOVtooManyTrk "MOV: Avvertimento! troppe tracce!"
Modified: mplayerxp/nls/help_mp-ko.h
===================================================================
--- mplayerxp/nls/help_mp-ko.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-ko.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -139,9 +139,6 @@
#define MSGTR_CantSeekRawAVI "raw .AVI 스트림에서는 탐색할 수 없습니다! (인덱스가 필요합니다, -idx 스위치로 시도해보세요!) \n"
#define MSGTR_CantSeekFile "이 파일에서는 탐색할 수 없습니다! \n"
-#define MSGTR_EncryptedVOB "암호화된 VOB 파일입니다(libcss 지원없이 컴파일되었음)! DOCS/cd-dvd.html을 참조하세요\n"
-#define MSGTR_EncryptedVOBauth "암호화된 스트림인데, 인증 신청을 하지않았습니다!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: 압축된 헤더는 (아직) 지원되지않습니다!\n"
#define MSGTR_MOVvariableFourCC "MOV: 경고! FOURCC 변수 발견!?\n"
#define MSGTR_MOVtooManyTrk "MOV: 경고! 트랙이 너무 많습니다!"
Modified: mplayerxp/nls/help_mp-nl.h
===================================================================
--- mplayerxp/nls/help_mp-nl.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-nl.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -135,9 +135,6 @@
#define MSGTR_CantSeekRawAVI "Kan niet in raw .AVI streams verplaatsen! (index nodig, probeer met de -idx optie!) \n"
#define MSGTR_CantSeekFile "Kan niet verplaatsen in dit bestand! \n"
-#define MSGTR_EncryptedVOB "Geencrypteerd VOB bestand (niet gecompileerd met libcss ondersteuning)! Lees DOCS/cd-dvd.html bestand\n"
-#define MSGTR_EncryptedVOBauth "Geencrypteerde stream maar authenticatie was niet aangevraagd door u!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Gecomprimeerde headers (nog) niet ondersteund!\n"
#define MSGTR_MOVvariableFourCC "MOV: Waarschuwing! variabele FOURCC gedetecteerd!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Waarschuwing! te veel tracks!"
Modified: mplayerxp/nls/help_mp-no.h
===================================================================
--- mplayerxp/nls/help_mp-no.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-no.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -136,9 +136,6 @@
#define MSGTR_CantSeekRawAVI "Kan ikke søke i rå .AVI streams! (index behøves, prøv med -idx valget!) \n"
#define MSGTR_CantSeekFile "Kan ikke søke i denne filen! \n"
-#define MSGTR_EncryptedVOB "Kryptert VOB fil (ikke kompilert med libcss støtte)! Les filen DOCS/DVD\n"
-#define MSGTR_EncryptedVOBauth "Kryptert stream men autentikasjon var ikke forespurt av deg!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Komprimerte headere ikke støttet (enda)!\n"
#define MSGTR_MOVvariableFourCC "MOV: Advarsel! variabel FOURCC detektert!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Advarsel! for mange sport!"
Modified: mplayerxp/nls/help_mp-pl.h
===================================================================
--- mplayerxp/nls/help_mp-pl.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-pl.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -137,9 +137,6 @@
#define MSGTR_CantSeekRawAVI "Nie mogę przeszukiwać nieindeksowanych strumieni .AVI! (sprawdź opcję -idx !)\n"
#define MSGTR_CantSeekFile "Nie mogę przeszukiwać tego pliku! \n"
-#define MSGTR_EncryptedVOB "Zaszyfrowany plik VOB (nie wkompilowano obsługi libcss)! Przeczytaj plik DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Zaszyfrowany strumień, nie zażyczyłeś sobie autentykacji!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Spakowane nagłówki nie są obsługiwane (na razie)!\n"
#define MSGTR_MOVvariableFourCC "MOV: Uwaga! wykryto zmienną FOURCC!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Uwaga! zbyt dużo scieżek!"
Modified: mplayerxp/nls/help_mp-ro.h
===================================================================
--- mplayerxp/nls/help_mp-ro.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-ro.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -134,9 +134,6 @@
#define MSGTR_CantSeekRawAVI "Nu pot căuta în fişiere .AVI neindexate! (am nevoie de index, încercaţi cu -idx!) \n"
#define MSGTR_CantSeekFile "Nu pot căuta în fişier! \n"
-#define MSGTR_EncryptedVOB "Fişier VOB encriptat (necompilat cu suport libcss)! Citiţi fişierul DOCS/DVD\n"
-#define MSGTR_EncryptedVOBauth "Fişier encriptat dar autentificarea nu a fost cerută de dumneavoastră.!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Antetele compresate nu sunt (încă) suportate!\n"
#define MSGTR_MOVvariableFourCC "MOV: Atenţie! variabilă FOURCC detectată!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Atenţie! prea multe piste!"
Modified: mplayerxp/nls/help_mp-ru.h
===================================================================
--- mplayerxp/nls/help_mp-ru.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-ru.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -175,9 +175,6 @@
#define MSGTR_CantSeekRawAVI "Не могу переместиться в сыром потоке .AVI! (требуется индекс, попробуйте с ключом -idx!)\n"
#define MSGTR_CantSeekFile "Не могу перемещаться в этом файле!\n"
-#define MSGTR_EncryptedVOB "Шифрованный VOB файл (не компилили с поддержкой libcss)! См. DOCS/cd-dvd.html\n"
-#define MSGTR_EncryptedVOBauth "Шифрованный поток, но авторизация Вами не была затребована!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Сжатые заголовки (пока) не поддерживаются!\n"
#define MSGTR_MOVvariableFourCC "MOV: Предупреждение! Обнаружен переменный FOURCC!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Предупреждение! слишком много треков!"
Modified: mplayerxp/nls/help_mp-sk.h
===================================================================
--- mplayerxp/nls/help_mp-sk.h 2012-10-19 13:51:44 UTC (rev 173)
+++ mplayerxp/nls/help_mp-sk.h 2012-10-19 14:22:17 UTC (rev 174)
@@ -137,9 +137,6 @@
#define MSGTR_CantSeekRawAVI "Nemôžem sa posúvať v surových (raw) .AVI prúdoch! (Potrebujem index, zkuste použíť voľbu -idx !) \n"
#define MSGTR_CantSeekFile "Nemôžem sa posúvať v tomto súbore! \n"
-#define MSGTR_EncryptedVOB "Kódovaný VOB súbor (preložené bez podpory libcss)! Prečítajte si DOCS/DVD\n"
-#define MSGTR_EncryptedVOBauth "Zakódovaný prúd, ale overenie autenticity ste nepožadovali!!\n"
-
#define MSGTR_MOVcomprhdr "MOV: Komprimované hlavičky nie sú (ešte) podporované!\n"
#define MSGTR_MOVvariableFourCC "MOV: Upozornenie! premenná FOURCC detekovaná!?\n"
#define MSGTR_MOVtooManyTrk "MOV: Upozornenie! Príliš veľa stôp!"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
