October 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpcodecs Makefile,1.65,1.66 vd.c,1.56,1.57 vd_lzo.c,1.1,1.2
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv5532 Modified Files: Makefile vd.c vd_lzo.c Log Message: support to use minilzo lib alternatively Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- Makefile 16 Oct 2002 18:40:03 -0000 1.65 +++ Makefile 19 Oct 2002 18:56:48 -0000 1.66 @@ -5,7 +5,7 @@ LIBNAME2 = libmpencoders.a AUDIO_SRCS=dec_audio.c ad.c ad_liba52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3lib.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c -VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c +VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c vd_lzo.c VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c @@ -20,10 +20,6 @@ ifeq ($(JPEG),yes) VIDEO_SRCS += vd_ijpg.c -endif - -ifeq ($(LZO),yes) -VIDEO_SRCS += vd_lzo.c endif SRCS=$(AUDIO_SRCS) $(VIDEO_SRCS) $(VFILTER_SRCS) $(NATIVE_SRCS) img_format.c Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- vd.c 13 Oct 2002 21:40:10 -0000 1.56 +++ vd.c 19 Oct 2002 18:56:48 -0000 1.57 @@ -77,9 +77,7 @@ &mpcodecs_vd_divx4, #endif #endif -#ifdef USE_LZO &mpcodecs_vd_lzo, -#endif &mpcodecs_vd_raw, &mpcodecs_vd_msrle, &mpcodecs_vd_msvidc, Index: vd_lzo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_lzo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vd_lzo.c 13 Oct 2002 21:40:10 -0000 1.1 +++ vd_lzo.c 19 Oct 2002 18:56:48 -0000 1.2 @@ -6,7 +6,13 @@ #include "vd_internal.h" +#ifdef USE_LZO #include <lzo1x.h> +#else +#include "native/minilzo.h" +#define lzo_malloc malloc +#define lzo_free free +#endif #define MOD_NAME "DecLZO"

1 0

CVS: main/help help_mp-de.h,1.53,1.54
by Johannes Feigl 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv9191 Modified Files: help_mp-de.h Log Message: sync Index: help_mp-de.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-de.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- help_mp-de.h 12 Oct 2002 15:49:19 -0000 1.53 +++ help_mp-de.h 19 Oct 2002 17:48:53 -0000 1.54 @@ -95,11 +95,13 @@ "!!! Mögliche Gründe, Probleme, Abhilfen: \n"\ "- Meistens: defekter/fehlerhafter _Audio_ Treiber. Abhilfe: versuche -ao sdl,\n"\ " verwende ALSA 0.5 oder die OSS Emulation von ALSA 0.9. Lese DOCS/sound.html!\n"\ +" Du kannst esauch mit -autosync 30 oder anderen Werten probieren.\n"\ "- Langsame Videoausgabe. Versuche einen anderen -vo Treiber (Liste: -vo help)\n"\ " oder versuche es mit -framedrop ! Lese DOCS/video.html für Tipps.\n"\ "- Langsame CPU. Keine DVD/DIVX auf einer langsamen CPU. Versuche -hardframedrop\n"\ "- Defekte Datei. Versuche verschiede Kombinationen: -nobps -ni -mc 0 -forceidx\n"\ -"- Wird -cache verwendet, um eine nicht-interleaved Datei abzuspielen? Versuche -nocache\n"\ +"- Für Wiedergabe von langsamen Medium (NFS/SMB, DVD, VCD usw) versuche -cache 8192\n"\ +"- -cache verwendet, um eine nicht-interleaved AVI-Datei abzuspielen? Versuche -nocache\n"\ "Wenn nichts davon hilft, lies DOCS/bugreports.html !\n\n" #define MSGTR_NoGui "MPlayer wurde OHNE GUI-Unterstützung kompiliert!\n"

1 0

CVS: main Makefile,1.222,1.223
by Arpi of Ize 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv2743 Modified Files: Makefile Log Message: some cleanup fixed order of internal and external libs Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- Makefile 13 Oct 2002 21:40:06 -0000 1.222 +++ Makefile 19 Oct 2002 17:31:36 -0000 1.223 @@ -37,19 +37,12 @@ OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -VO_LIBS = libvo/libvo.a -VO_INC = -Ilibvo -V_LIBS = $(SDL_LIB) $(GGI_LIB) $(AA_LIB) $(X_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(DIRECTX_LIB) +VO_LIBS = $(SDL_LIB) $(GGI_LIB) $(AA_LIB) $(X_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(DIRECTX_LIB) $(GIF_LIB) +AO_LIBS = $(ARTS_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) +CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LZO_LIB) $(XVID_LIB) $(DECORE_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) +COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libpostproc.a linux/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) -AO_LIBS = libao2/libao2.a -A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB) - -CODEC_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(AV_LIB) $(FAME_LIB) -COMMON_LIBS = $(CODEC_LIBS) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libpostproc.a linux/libosdep.a $(LIB_LOADER) $(FREETYPE_LIB) $(A_LIBS) $(CSS_LIB) $(XVID_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(LZO_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) $(ARCH_LIB) -lm -ifeq ($(VIDIX),yes) -MISC_LIBS += -Llibdha -ldha vidix/libvidix.a -endif -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(FREETYPE_INC) $(SDL_INC) # -Wall +CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(CDPARANOIA_INC) $(FREETYPE_INC) $(SDL_INC) # -Wall PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers linux postproc input libvo libaf ifeq ($(VIDIX),yes) @@ -72,10 +65,6 @@ PARTS += loader loader/dshow endif - -LOADER_DEP = $(W32_DEP) $(DS_DEP) -LIB_LOADER = $(W32_LIB) $(DS_LIB) - ALL_PRG = $(PRG) ifeq ($(MENCODER),yes) ALL_PRG += $(PRG_MENCODER) @@ -84,7 +73,7 @@ ALL_PRG += $(PRG_FIBMAP) endif -COMMON_DEPS = $(LOADER_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a libaf/libaf.a +COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a libaf/libaf.a ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a @@ -178,14 +167,15 @@ MPLAYER_DEP = $(OBJS_MPLAYER) $(COMMON_DEPS) MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) -VIDIX_LIBS = ifeq ($(VIDIX),yes) -VIDIX_LIBS += vidix/libvidix.a +VIDIX_LIBS = vidix/libvidix.a +else +VIDIX_LIBS = endif $(PRG): $(MPLAYER_DEP) ./darwinfixlib.sh $(MPLAYER_DEP) - $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(VO_LIBS) $(AO_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(V_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) + $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lm $(PRG_FIBMAP): fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o @@ -193,7 +183,7 @@ ifeq ($(MENCODER),yes) $(PRG_MENCODER): $(MENCODER_DEP) ./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a - $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB) + $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) -lm endif # Every mplayer dependency depends on version.h, to force building version.h

1 0

Assistance
by Tony Silas 19 Oct '02

19 Oct '02

From: Tony Silas Law Chambers Plot 73, Raymond Njokus Crescent, Victoria Island Lagos-Nigeria. Dear Sir, I do not mean to embarras you by this proposal, but to confide to you a very sensitive issue, of a very pathetic situation, and also to seek your utmost assistance for the issue I am about to explain to you. My name is Tony Silas, and I am the principal consultant of the above mentioned law firm here in Lagos Nigeria. You see, one of my clients, and ofcourse, my most valued client by name Hamza Al-Mustapha just called me and confide a very sensitive issue to me. My client happens to be the then chief security officer {CSO} to the former military dictator, Late General Sani Abacha, who died july 1998 in active service as the then head of state of the federal republic of Nigeria. My client, Al-Mustapha is presently being detained in the prison custody, awaiting trial for charges of acute human right violations, and mismanagement of government fund leveled against him and Mohammed Abacha, son of the late General {His late Chief in Chief}. A first class information has revealed that the duo are likely to face life imprisonment for the charges against them and may be convicted soon. My client Al-Mustapha got this information somehow and called to brief me of a security trunk which he deposited with a trust company here in London before his arrest, and subsequent detention. According to him, the trunk contains the cash sum of US$35,000,000 which the trust company does not know about yet, as the content was declared as family jewelries and security documents. Also according to him, some security application was made on the bills to prevent it from being stolen or spent by another person, until the application is cleared. Now that his chances of being set free from the allegations against him are rare, he called me to assist him to secure the the fund, which of course is the only hope of the family,{His two wives, and seven children}. After much deliberation however, I managed to convince him to endorse a change of beneficiary for the deposited trunk. This will enable the new beneficiary to put an application for withdrawal of the trunk as the new legal beneficiary to the deposited trunk. In the light of this, I decided to contact you to assist us in this transaction since the plan is to have the change of beneficiary done in favour of a foreigner, who also will be our foreign contact and assistance to to claim this money and keep it in a safe account for my client's family. The arrangement is to change the beneficiary of the consignment into your name, forward you with all the necessary deposit documents to this effect and have you contact the trust company for withdrawal of the trunk as the new/legal beneficiary. My client lost almost a hundred million US dollars, frozen in swiss banks and in different personal accounts on the instruction of the present democratic government of the fedral republic of Nigeria. The plan to seek your assistance was informed by a joint decision by the family of my client to invest this money abroad, probably into commercial real estate, at least to shelter their money. You may also have the privilege of brokering the purchase of valuable properties for my client, since they have all agreed to invest the money into commercial real estate as I told you. Having gone through this explanation, and considering the fate of my client and the dependants he is about to leave behind as the sole bread winner of the family, should he not be lucky on this case, I ask a simple question: Should my client suffer for offences allegedly committed by him master?, should even his family be left, abandoned and even refused to be heard, by a government which is prosecuting their sole bread winner for human right violations? To freeze an account of a fulltime house wife who never knew anything in the government, yet they are denied the basic requirements of life, is a crime to humanity, and human rights violation at its peak. Yet my client's family is presently denied of telephone access etc, hence dening them the freedom of communication and association. It is for this reason that I sincerely solicit your utmost assitance to move this fund out of the trust Company and into your care abroad, on behalf of the family for safe keeping, subject to when they are ready to manage the fund. It is also expected that you will represent this family in brokering the purchase of valuable/profitable proprties in your country or the neighbouring, so they can always fall back to these properties when the heat on the family reduces. My client has also resolved to reward you hansomely with 5% of the total amount on the sucessful conclussion of this transaction. I shall also be 100% available to provide you with all the necessary assistance and guidelines you may require in the course of this transaction. I have just entrusted the details of this fund and the fate of this helpless family into your conscience for safe keeping. I also hope to have offerred you a great opportunity to make yourself some good money, I believe I have. Should the above transaction appeal to you therefore, I hereby urge you to mail me your response immediately for further details and immediate commencement of this transaction. You will also be doing us a lot of good to guide this information with immense confidentiality, should this transaction does not appeal to you. Hoping to hear from you soon on this issue. Regards, Tony Silas,ESQ.

1 0

CVS: main/debian rules,1.36,1.37
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/debian In directory mail:/var/tmp.root/cvs-serv27971/debian Modified Files: rules Log Message: Do not install CVS directories. Index: rules =================================================================== RCS file: /cvsroot/mplayer/main/debian/rules,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- rules 3 Sep 2002 23:31:11 -0000 1.36 +++ rules 19 Oct 2002 13:47:10 -0000 1.37 @@ -60,7 +60,7 @@ dh_installdebconf - dh_installdocs DOCS/* + dh_installdocs --exclude=CVS DOCS/* dh_installexamples etc/example.conf dh_installmenu # dh_installmime

1 0

CVS: main/DOCS cd-dvd.html,1.44,1.45
by Bohdan 'Nexus' Horst 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv18429 Modified Files: cd-dvd.html Log Message: FreeBSD info Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/cd-dvd.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- cd-dvd.html 6 Oct 2002 20:55:37 -0000 1.44 +++ cd-dvd.html 19 Oct 2002 13:29:25 -0000 1.45 @@ -52,6 +52,11 @@ <P>Please refer to "<CODE>/proc/ide/[cdrom device]/settings</CODE>" for fine-tuning your CD-ROM.</P> +<P>FreeBSD:</P> + +<P>    Speed: <CODE>cdcontrol [-f device] speed [speed]</CODE></P> +<P>    DMA: <CODE>sysctl hw.ata.atapi_dma=1</CODE></P> + <H2><A NAME="dvd">4.2 DVD playback</A></H2>

1 0

CVS: main/DOCS mplayer.1,1.249,1.250
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv13060 Modified Files: mplayer.1 Log Message: Documented "j" key, small fixes, rewording, spell checking. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- mplayer.1 17 Oct 2002 22:51:35 -0000 1.249 +++ mplayer.1 19 Oct 2002 04:28:52 -0000 1.250 @@ -38,7 +38,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2002-10-14" +.TH MPlayer 1 "2002-10-19" . .SH NAME mplayer \- Movie Player for Linux @@ -77,7 +77,7 @@ .in .B mplayer 'in +\n[.k]u -.RI [ mms[t] | http | http_proxy | rt[s]p | smb ] :// [user:passwd@] URL +.RI [ mms[t] | http | http_proxy | rt[s]p ] :// [user:passwd@] URL [:port] [options] .br .in @@ -104,7 +104,7 @@ VIVO, FLI, NuppelVideo, yuv4mpeg, FILM and RoQ files, supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx, DivX\ 3/\:4/\:5 and even WMV movies, -too (without the avifile library). +too (without using the avifile library). .PP Another great feature of MPlayer is the wide range of supported output drivers. @@ -663,6 +663,11 @@ .br See \-vop expand too. .TP +.B \-dumpmicrodvdsub (MPLAYER only) +Convert the given subtitle (specified with the \-sub switch) to the +MicroDVD subtitle format. +Creates a dumpsub.sub file in the current directory. +.TP .B \-dumpmpsub (MPLAYER only) Convert the given subtitle (specified with the \-sub switch) to MPlayer's subtitle format, MPsub. @@ -677,11 +682,6 @@ Dumps the subtitle substream from VOB streams. See -dump*sub and -vobsubout* options too. .TP -.B \-dumpmicrodvdsub (MPLAYER only) -Convert the given subtitle (specified with the \-sub switch) to the -MicroDVD subtitle format. -Creates a dumpsub.sub file in the current directory. -.TP .B \-ifo <vobsub\ ifo\ file> Indicate the file that will be used to load palette and frame size for VOBSUB subtitles. @@ -959,9 +959,9 @@ Enables doublebuffering. Fixes flicker by storing two frames in memory, and displaying one while decoding another. -Can effect OSD. -Needs twice the memory than a single buffer, so it won't work on cards with -very few video memory. +Can affect OSD. +Needs twice the memory of a single buffer, so it won't work on cards with +very little video memory. .TP .B \-dr \ \ \ Turns on direct rendering (not supported by all codecs and video outputs) @@ -1066,12 +1066,12 @@ Available options are: [no]progressiv, [no]baseline, optimize, smooth, quality and outdir. .TP -.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range> (fbdev only) +.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range> (fbdev and vesa only) Look into etc/\:example.conf for further information and in DOCS/\:video.html. .TP -.B \-monitor_hfreq <horizontal frequency range> (fbdev only) +.B \-monitor_hfreq <horizontal frequency range> (fbdev and vesa only) .TP -.B \-monitor_vfreq <vertical frequency range> (fbdev only) +.B \-monitor_vfreq <vertical frequency range> (fbdev and vesa only) .TP .B \-monitoraspect <ratio> Set aspect ratio of your monitor or TV screen. @@ -1316,7 +1316,7 @@ .br 0: disabled .br -1: carefull (should work with broken encoders) +1: careful (should work with broken encoders) .br 2: normal (default) (works with compliant encoders) .br @@ -1666,7 +1666,7 @@ .TP .B \-x <x> (MPLAYER only) Scale image to x width (if sw/\:hw scaling available). -Disables aspect calcs. +Disables aspect calculations. .TP .B \-xvidopts <option1:option2:...> Specify additional parameters when decoding with XviD. @@ -1694,7 +1694,7 @@ .TP .B \-y <y> (MPLAYER only) Scale image to y height (if sw/\:hw scaling available). -Disables aspect calcs. +Disables aspect calculations. .TP .B \-zoom \ Allow software scaling, where available. @@ -2184,7 +2184,7 @@ .REss .IPs lumi_mask=<0.0\-1.0> luminance masking. -Warning: be carefull, too large values can cause disasterous things. +Warning: be careful, too large values can cause disasterous things. Warning2: large values might look good on some monitors but may look horrible on other monitors: .RSss @@ -2194,7 +2194,7 @@ .REss .IPs dark_mask=<0.0\-1.0> darkness masking. -Warning: be carefull, too large values can cause disasterous things. +Warning: be careful, too large values can cause disasterous things. Warning2: large values might look good on some monitors but may look horrible on other monitors / TV / TFT: .RSss @@ -2393,7 +2393,7 @@ .IPs "p / SPACE" pause movie (any key unpauses) .IPs "q / ESC" -stop playing and quit program +stop playing and quit .IPs "+ and \-" adjust audio delay by +/\:\- 0.1 second .IPs "/ and *" @@ -2412,6 +2412,8 @@ toggle frame dropping .IPs v\ \ \ \ toggle subtitle visibility +.IPs j\ \ \ \ +switch subtitle language .IPs "z and x" adjust subtitle delay by +/\:\- 0.1 second .IPs "r and t"

1 0

CVS: main/DOCS video.html,1.105,1.106
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv10317 Modified Files: video.html Log Message: Remove option descriptions that are in the man page, add some missing <CODE> tags. Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/video.html,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- video.html 10 Oct 2002 01:42:27 -0000 1.105 +++ video.html 19 Oct 2002 04:26:36 -0000 1.106 @@ -752,10 +752,11 @@ in vm86 mode).</LI> <LI>You can use Vidix with it, thus getting accelerated video display <B>AND</B> TV output at the same time! (recommended for ATI cards)</LI> - <LI>If you have VESA VBE 3.0+, and you had specified monitor_hfreq, monitor_vfreq, - monitor_dotclock somewhere (config file, or commandline) you will get highest - possible refresh rate. (Using General Timing Formula). To enable this - feature you have to specify <B>ALL</B> monitor's options.</LI> + <LI>If you have VESA VBE 3.0+, and you had specified <CODE>monitor_hfreq</CODE>, + <CODE>monitor_vfreq</CODE>, <CODE>monitor_dotclock</CODE> somewhere (config + file, or commandline) you will get the highest possible refresh rate. (Using + General Timing Formula). To enable this feature you have to specify + <B>all</B> your monitor options.</LI> </UL> <H4>Disadvantages:</H4> @@ -772,16 +773,9 @@ <DL> <DT><CODE>-vo vesa:opts</CODE></DT> <DD>currently recognized: <B>dga</B> to force dga mode and <B>nodga</B> to - disable dga mode. Note: you may omit these parameters to enable <B>autodetect</B> - of dga mode.</DD> - - <DT><CODE>-double</CODE></DT> - <DD>enables double buffering mode. (Available only in DGA mode). Should be - slower of single buffering, but has no flickering effects.</DD> - <DT><CODE>-monitor_hfreq</CODE></DT> - <DT><CODE>-monitor_vfreq</CODE></DT> - <DT><CODE>-monitor_dotclock</CODE></DT> - <DD><STRONG>Important</STRONG> values, see <CODE>example.conf</CODE></DD> + disable dga mode. In dga mode you can enable double buffering via the + <CODE>-double</CODE> option. Note: you may omit these parameters to enable + <B>autodetection</B> of dga mode.</DD> </DL> <H4>Known problems and workaround:</H4>

1 0

CVS: main/DOCS documentation.html,1.316,1.317
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv7335 Modified Files: documentation.html Log Message: Keyboard controls and options are described in the man page, removed the redundant description here, plus small fixes. Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- documentation.html 18 Oct 2002 17:57:05 -0000 1.316 +++ documentation.html 19 Oct 2002 04:22:50 -0000 1.317 @@ -197,9 +197,7 @@ <LI><A HREF="#tv">2.5 TV input</A> <UL> <LI><A HREF="#tv_compilation">2.5.1 Compilation</A></LI> - <LI><A HREF="#tv_options">2.5.2 Available options</A></LI> - <LI><A HREF="#tv_keyboard">2.5.3 Keyboard control</A></LI> - <LI><A HREF="#tv_examples">2.5.4 Examples</A></LI> + <LI><A HREF="#tv_examples">2.5.2 Examples</A></LI> </UL> </LI> </UL> @@ -209,15 +207,14 @@ <LI><A HREF="#command_line">3.1 Command line</A></LI> <LI><A HREF="#control">3.2 Control</A> <UL> - <LI><A HREF="#default_controls">3.2.1 Default controls</A></LI> - <LI><A HREF="#controls_configuration">3.2.2 Controls configuration</A> + <LI><A HREF="#controls_configuration">3.2.1 Controls configuration</A> <UL> - <LI><A HREF="#key_names">3.2.2.1 Key names</A></LI> - <LI><A HREF="#commands">3.2.2.2 Commands</A></LI> + <LI><A HREF="#key_names">3.2.1.1 Key names</A></LI> + <LI><A HREF="#commands">3.2.1.2 Commands</A></LI> </UL> </LI> - <LI><A HREF="#lirc">3.2.3 Control from LIRC</A></LI> - <LI><A HREF="#slave">3.2.4 Slave mode</A></LI> + <LI><A HREF="#lirc">3.2.2 Control from LIRC</A></LI> + <LI><A HREF="#slave">3.2.3 Slave mode</A></LI> </UL> </LI> <LI><A HREF="#streaming">3.3 Streaming from network or pipes</A></LI> @@ -693,7 +690,7 @@ mkdir ~/.mplayer cd ~/.mplayer unzip mp-arial-iso-8859-1.zip - ln -s ~/.mplayer/arial-24 font + ln -s ~/.mplayer/iso-8859-1/arial-24 font </PRE> @@ -936,7 +933,8 @@ <H2><A NAME="tv"><B>2.5 TV input</B></A></H2> <P>This section is about how to enable <B>watching/grabbing from V4L compatible -TV tuner</B>.</P> +TV tuner</B>. See the man page for a description of TV options and keyboard +controls.</P> <P><B>THIS CODE IS CURRENTLY NOT BEING WORKED ON! Do not expect it to work without tweaking/experimenting!</B></P> @@ -962,65 +960,7 @@ </BLOCKQUOTE> -<H3><A NAME="tv_options">2.5.2 Available options</A></H3> - -<DL> - <DT><CODE>on</CODE></DT> - <DD>Use TV input.</DD> - - <DT><CODE>noaudio</CODE></DT> - <DD>No sound, thanks.</DD> - - <DT><CODE>driver</CODE></DT> - <DD><B>dummy</B> - NULL TV input :) Used for testing only, generates dummy - input.<BR> - <B>v4l</B> - Captures images from standard V4L interface (default - <CODE>/dev/video0</CODE>).</DD> - - <DT><CODE>device</CODE></DT> - <DD>Specify a device other than the default <CODE>/dev/video0</CODE>.</DD> - - <DT><CODE>input</CODE></DT> - <DD>Specify from which input of the TV tuner you wish to grab - (e.g. <B>television</B>, <B>s-video</B>, <B>composite</B>, ...)<BR> - Prints the available ones during init.</DD> - - <DT><CODE>freq</CODE></DT> - <DD>Specify the frequency to set the tuner to (e.g. <B>511.250</B>).</DD> - - <DT><CODE>outfmt</CODE></DT> - <DD>Specify the output format the tuner should use to transport images to us - (<B>rgb32</B>, <B>rgb24</B>, <B>yv12</B>, <B>uyvy</B>, <B>i420</B> (for i420 - you have to pass the <CODE>-vc rawi420</CODE> option, because of a fourcc - conflict)).</DD> - - <DT><CODE>width</CODE></DT> - <DD>width of the output window in pixels</DD> - - <DT><CODE>height</CODE></DT> - <DD>height of the output window in pixels</DD> - - <DT><CODE>norm</CODE></DT> - <DD>available: PAL, SECAM, NTSC</DD> - - <DT><CODE>channel</CODE></DT> - <DD>Set the tuner to the given channel.</DD> - - <DT><CODE>chanlist</CODE></DT> - <DD>available: <CODE>us-bcast, us-cable, europe-west, europe-east, etc</CODE></DD> -</DL> - - -<H3><A NAME="tv_keyboard">2.5.3 Keyboard control</A></H3> - -<TABLE BORDER=0> - <TR><TD>  </TD><TD>h / k</TD><TD>  </TD><TD>select previous/next channel</TD></TR> - <TR><TD></TD><TD>n</TD><TD></TD><TD>change norm</TD></TR> - <TR><TD></TD><TD>b</TD><TD></TD><TD>change channel list</TD></TR> -</TABLE> - - -<H3><A NAME="tv_examples">2.5.4 Examples</A></H3> +<H3><A NAME="tv_examples">2.5.2 Examples</A></H3> <P>Dummy output, to AAlib :)<BR> <CODE>    mplayer -tv on:driver=dummy:width=640:height=480 -vo aa</CODE><BR> @@ -1075,67 +1015,11 @@ <P><B>MPlayer</B> has a fully configurable, command driven, control layer which lets you control <B>MPlayer</B> with keyboard, mouse, joystick or remote - control (using LIRC).</P> - - -<H3><A NAME="default_controls">3.2.1 Default controls</A></H3> - -<H4>Keyboard controls from terminal:</H4> - -<TABLE BORDER=0> - <TR><TD>  </TD><TD><- or -></TD><TD>  </TD><TD>seek backward/forward 10 seconds</TD></TR> - <TR><TD></TD><TD>up or down</TD><TD></TD><TD>seek backward/forward 1 minute</TD></TR> - <TR><TD></TD><TD>pgup/pgdown</TD><TD></TD><TD>seek backward/forward 10 minutes</TD></TR> - <TR><TD></TD><TD>< or ></TD><TD></TD><TD>seek backward/forward in playlist</TD></TR> - <TR><TD></TD><TD>p or SPACE</TD><TD></TD><TD>pause movie (press any key)</TD></TR> - <TR><TD></TD><TD>q or ESC</TD><TD></TD><TD>stop playing and quit program</TD></TR> - <TR><TD></TD><TD>+ or -</TD><TD></TD><TD>adjust audio delay by +/- 0.1 second</TD></TR> - <TR><TD></TD><TD>/ or *</TD><TD></TD><TD>decrease/increase volume</TD></TR> - <TR><TD></TD><TD>9 or 0</TD><TD></TD><TD>decrease/increase volume</TD></TR> - <TR><TD></TD><TD>m</TD><TD></TD><TD>mute sound</TD></TR> - <TR><TD></TD><TD>f</TD><TD></TD><TD>toggle fullscreen</TD></TR> - <TR><TD></TD><TD>w or e</TD><TD></TD><TD>decrease/increase panscan range</TD></TR> - <TR><TD></TD><TD>o</TD><TD></TD><TD>toggle OSD: none / seek / seek+timer</TD></TR> - <TR><TD></TD><TD>d</TD><TD></TD><TD>toggle frame dropping</TD></TR> - <TR><TD></TD><TD>v</TD><TD></TD><TD>toggle subtitle visibility</TD></TR> - <TR><TD></TD><TD>z or x</TD><TD></TD><TD>adjust subtitle delay by +/- 0.1 second</TD></TR> - <TR><TD></TD><TD>r or t</TD><TD></TD><TD>adjust subtitle position</TD></TR> - <TR><TD></TD><TD>HOME or END</TD><TD></TD><TD>go to next/previous playtree entry in the parent list</TD></TR> - <TR><TD></TD><TD>INSERT or DELETE</TD><TD></TD><TD>go to next/previous alternative source (only available in asx playlist)</TD></TR> - <TR><TD COLSPAN=4><P><I>(the following keys are valid only when using -vo xv or -vo [vesa|fbdev]:vidix or -vo xvidix -vo (x)mga or -vc divxds (slow).)</I></P></TD></TR> - <TR><TD></TD><TD>1 or 2</TD><TD></TD><TD>adjust contrast</TD></TR> - <TR><TD></TD><TD>3 or 4</TD><TD></TD><TD>adjust brightness</TD></TR> - <TR><TD></TD><TD>5 or 6</TD><TD></TD><TD>adjust hue</TD></TR> - <TR><TD></TD><TD>7 or 8</TD><TD></TD><TD>adjust saturation</TD></TR> -</TABLE> - -<H4>GUI keyboard controls:</H4> - -<TABLE BORDER=0> - <TR><TD>  </TD><TD>, and .</TD><TD>  </TD><TD>previous / next file</TD></TR> - <TR><TD></TD><TD>gray - or +</TD><TD></TD><TD>decrease / increase volume</TD></TR> - <TR><TD></TD><TD>enter</TD><TD></TD><TD>start playing</TD></TR> - <TR><TD></TD><TD>space</TD><TD></TD><TD>pause</TD></TR> - <TR><TD></TD><TD>s</TD><TD></TD><TD>stop</TD></TR> - <TR><TD></TD><TD>a</TD><TD></TD><TD>about</TD></TR> - <TR><TD></TD><TD>l</TD><TD></TD><TD>load file</TD></TR> - <TR><TD></TD><TD>b</TD><TD></TD><TD>skin browser</TD></TR> - <TR><TD></TD><TD>e</TD><TD></TD><TD>toggle equalizer</TD></TR> - <TR><TD></TD><TD>p</TD><TD></TD><TD>toggle playlist</TD></TR> - <TR><TD></TD><TD>f</TD><TD></TD><TD>toggle fullscreen</TD></TR> - <TR><TD></TD><TD>m</TD><TD></TD><TD>toggle mute</TD></TR> -</TABLE> - -<H4>Keyboard controls for TV input:</H4> - -<TABLE BORDER=0> - <TR><TD>  </TD><TD>h or l</TD><TD>  </TD><TD>select previous/next channel</TD></TR> - <TR><TD></TD><TD>n</TD><TD></TD><TD>change norm</TD></TR> - <TR><TD></TD><TD>b</TD><TD></TD><TD>change channel list</TD></TR> -</TABLE> + control (using LIRC). See the man page for the complete list of keyboard + controls.</P> -<H3><A NAME="controls_configuration">3.2.2 Controls configuration</A></H3> +<H3><A NAME="controls_configuration">3.2.1 Controls configuration</A></H3> <P><B>MPlayer</B> allows you bind any key/button to any <B>MPlayer</B> command using a simple config file. The syntax consist of a key name followed by a @@ -1162,7 +1046,7 @@ </PRE> -<H4><A NAME="key_names">3.2.2.1 Key names</A></H4> +<H4><A NAME="key_names">3.2.1.1 Key names</A></H4> <P>You can have a full list by running <CODE>mplayer -input keylist</CODE></P> @@ -1215,7 +1099,7 @@ </UL> -<H4><A NAME="commands">3.2.2.2 Commands</A></H4> +<H4><A NAME="commands">3.2.1.2 Commands</A></H4> <P>You can have a full list of known commands by running "mplayer -input cmdlist"</P> @@ -1280,7 +1164,7 @@ </UL> -<H3><A NAME="lirc">3.2.3 Control from LIRC</A></H3> +<H3><A NAME="lirc">3.2.2 Control from LIRC</A></H3> <P>Linux Infrared Remote Control - use an easy to build home-brewn IR-receiver, an (almost) arbitrary remote control and control your Linux box with it! @@ -1330,7 +1214,7 @@ use the -lircconf <filename> switch to specify another file.</P> -<H3><A NAME="slave">3.2.4 Slave mode</A></H3> +<H3><A NAME="slave">3.2.3 Slave mode</A></H3> <P>The slave mode allow you to build simple frontend to <B>MPlayer</B>. When enabled (with the <CODE>-slave</CODE> switch) <B>MPlayer</B> will read @@ -1575,8 +1459,8 @@ not send messages in other languages or HTML mail! Message size limit is 80k. If you have something bigger put it up for download somewhere. Click the links to subscribe. On the mailing lists, the same rules about writing - and quoting aply as on usenet. Please follow them, it makes the life of - those who read your mails a lot easier. If you dont know them please + and quoting apply as on usenet. Please follow them, it makes the life of + those who read your mails a lot easier. If you do not know them please read <A HREF="http://learn.to/edit_messages">HOWTO edit messages</A> or (if you are in a hurry) <A HREF="http://www.xs4all.nl/~hanb/documents/quotingguide.html">

1 0

CVS: main/help help_mp-zh.h,1.7,1.8
by Diego Biurrun CVS 18 Oct '02

18 Oct '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv30128/help Modified Files: help_mp-zh.h Log Message: Sync with the English version, patch by <hephooey(a)fastmail.fm>. Index: help_mp-zh.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-zh.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- help_mp-zh.h 29 Sep 2002 16:15:19 -0000 1.7 +++ help_mp-zh.h 19 Oct 2002 03:53:06 -0000 1.8 @@ -55,6 +55,7 @@ // mplayer.c: #define MSGTR_Exiting "\nÕýÔÚÍË³ö... (%s)\n" +#define MSGTR_Exit_quit "ÍË³ö" #define MSGTR_Exit_eof "ÎÄŒþœáÊø" #define MSGTR_Exit_error "ÖÂÃüŽíÎó" #define MSGTR_IntBySignal "\nMPlayer±» %s Ä£¿éÖÐµÄ %d ÐÅºÅÖÐ¶Ï\n" @@ -73,21 +74,21 @@ #define MSGTR_CantOpenDumpfile "ÎÞ·šŽò¿ªdumpÎÄŒþ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPSÔÚÎÄŒþÍ·ÖÐÃ»ÓÐÖž¶š(»òÕßÊÇÎÞÐ§ÊýŸÝ)! ÓÃ-fpsÑ¡Ïî!\n" -#define MSGTR_TryForceAudioFmtStr "³¢ÊÔÖž¶šÒôÆµcodecÇý¶¯×å %s ...\n" -#define MSGTR_CantFindAfmtFallback "ÕÒ²»µœÖž¶šÇý¶¯×åµÄÒôÆµcodec, Ö»ÄÜÊ¹ÓÃÆäËûÇý¶¯.\n" -#define MSGTR_CantFindAudioCodec "ÕÒ²»µœÒôÆµžñÊœ 0x%X µÄcodec!\n" +#define MSGTR_TryForceAudioFmtStr "³¢ÊÔÖž¶šÒôÆµœâÂëÆ÷Çý¶¯×å %s ...\n" +#define MSGTR_CantFindAfmtFallback "ÕÒ²»µœÖž¶šÇý¶¯×åµÄÒôÆµœâÂëÆ÷, Ö»ÄÜÊ¹ÓÃÆäËûÇý¶¯.\n" +#define MSGTR_CantFindAudioCodec "ÕÒ²»µœÒôÆµžñÊœ 0x%X µÄœâÂëÆ÷!\n" #define MSGTR_TryUpgradeCodecsConfOrRTFM "*** ³¢ÊÔÓÃ etc/codecs.conf ÉýŒ¶ %s \n*** Èç¹ûÕâÑù»¹²»ÐÐ, ²é¿ŽDOCS/codecs.html!\n" -#define MSGTR_CouldntInitAudioCodec "ÎÞ·š³õÊŒ»¯ÒôÆµcodec! -> nosound\n" -#define MSGTR_TryForceVideoFmtStr "³¢ÊÔÖž¶šÊÓÆµcodecÇý¶¯×å %s ...\n" -#define MSGTR_CantFindVideoCodec "ÕÒ²»µœÊÊºÏËùÑ¡µÄ-voºÍÊÓÆµžñÊœ 0x%X µÄcodec!\n" -#define MSGTR_VOincompCodec "±§Çž, ËùÑ¡µÄÊÓÆµÊä³öÉè±žÓëÕâžöcodec²»ŒæÈÝ.\n" +#define MSGTR_CouldntInitAudioCodec "ÎÞ·š³õÊŒ»¯ÒôÆµœâÂëÆ÷! -> nosound\n" +#define MSGTR_TryForceVideoFmtStr "³¢ÊÔÖž¶šÊÓÆµœâÂëÆ÷Çý¶¯×å %s ...\n" +#define MSGTR_CantFindVideoCodec "ÕÒ²»µœÊÊºÏËùÑ¡µÄ-voºÍÊÓÆµžñÊœ 0x%X µÄœâÂëÆ÷!\n" +#define MSGTR_VOincompCodec "±§Çž, ËùÑ¡µÄÊÓÆµÊä³öÉè±žÓëÕâžöœâÂëÆ÷²»ŒæÈÝ.\n" #define MSGTR_CannotInitVO "ÖÂÃüŽíÎó: ÎÞ·š³õÊŒ»¯ÊÓÆµÇý¶¯!\n" #define MSGTR_CannotInitAO "ÎÞ·šŽò¿ª/³õÊŒ»¯ÒôÆµÉè±ž -> NOSOUND\n" #define MSGTR_StartPlaying "¿ªÊŒ²¥·Å...\n" #define MSGTR_SystemTooSlow "\n\n"\ " ************************************************\n"\ -" **** ÄãµÄÏµÍ³Ì«ÂýÁË£¬·Å²»ÁËÕâžö£¡ ****\n"\ +" **** ÄãµÄÏµÍ³Ì«ÂýÁË£¬·Å²»ÁËÕâžö£¡ ****\n"\ " ************************************************\n"\ "!!! ¿ÉÄÜµÄÔÒò£¬ÎÊÌâ£¬œâŸö°ì·š£º\n"\ "- ×îÆÕ±éµÄÔÒò£º±»Ëð»µµÄ/buggyµÄÒôÆµÇý¶¯¡£œâŸö°ì·š£ºÊÔÊÔ-ao sdl»òÊ¹ÓÃ\n"\ @@ -109,16 +110,17 @@ #define MSGTR_AvailableVideoOutputPlugins "¿ÉÓÃµÄÊÓÆµÊä³ö²åŒþ:\n" #define MSGTR_AvailableVideoOutputDrivers "¿ÉÓÃµÄÊÓÆµÊä³öÇý¶¯:\n" #define MSGTR_AvailableAudioOutputDrivers "¿ÉÓÃµÄÒôÆµÊä³öÇý¶¯:\n" -#define MSGTR_AvailableAudioCodecs "¿ÉÓÃµÄÒôÆµcodecs:\n" -#define MSGTR_AvailableVideoCodecs "¿ÉÓÃµÄÊÓÆµcodecs:\n" +#define MSGTR_AvailableAudioCodecs "¿ÉÓÃµÄÒôÆµœâÂëÆ÷:\n" +#define MSGTR_AvailableVideoCodecs "¿ÉÓÃµÄÊÓÆµœâÂëÆ÷:\n" #define MSGTR_AvailableAudioFm "\n¿ÉÓÃµÄ(±àÒëÁËµÄ)ÒôÆµœâÂëÆ÷×å/Çý¶¯:\n" #define MSGTR_AvailableVideoFm "\n¿ÉÓÃµÄ(±àÒëÁËµÄ)ÊÓÆµœâÂëÆ÷×å/Çý¶¯:\n" #define MSGTR_UsingRTCTiming "Ê¹ÓÃLinuxµÄÓ²ŒþRTCŒÆÊ±(%ldHz)\n" #define MSGTR_CannotReadVideoPropertiers "ÊÓÆµ: ÎÞ·š¶ÁÈ¡ÊôÐÔ\n" #define MSGTR_NoStreamFound "ÕÒ²»µœÁ÷ÃœÌå\n" -#define MSGTR_InitializingAudioCodec "³õÊŒ»¯ÒôÆµcodec...\n" +#define MSGTR_InitializingAudioCodec "³õÊŒ»¯ÒôÆµœâÂëÆ÷...\n" #define MSGTR_ErrorInitializingVODevice "Žò¿ª/³õÊŒ»¯ËùÑ¡µÄÊÓÆµÊä³ö(-vo)Éè±žÊÇ³öŽí!\n" -#define MSGTR_ForcedVideoCodec "Öž¶šµÄÊÓÆµcodec: %s\n" +#define MSGTR_ForcedVideoCodec "Öž¶šµÄÊÓÆµœâÂëÆ÷: %s\n" +#define MSGTR_ForcedAudioCodec "Öž¶šµÄÒôÆµœâÂëÆ÷: %s\n" #define MSGTR_AODescription_AOAuthor "AO: ÃèÊö: %s\nAO: ×÷Õß: %s\n" #define MSGTR_AOComment "AO: ±ž×¢: %s\n" #define MSGTR_Video_NoVideo "ÊÓÆµ: no video!!!\n" @@ -136,7 +138,7 @@ #define MSGTR_CannotOpenDemuxer "ÎÞ·šŽò¿ªdemuxer\n" #define MSGTR_NoAudioEncoderSelected "\nÃ»ÓÐÑ¡ÔñÒôÆµ±àÂëÆ÷(-oac)! Ñ¡ÔñÒ»žö»òÕßÊ¹ÓÃ-nosound. Ê¹ÓÃ-oac help !\n" #define MSGTR_NoVideoEncoderSelected "\nNo video encoder (-ovc) selected! Select one, use -ovc help !\n" -#define MSGTR_InitializingAudioCodec "³õÊŒ»¯ÒôÆµcodec...\n" +#define MSGTR_InitializingAudioCodec "³õÊŒ»¯ÒôÆµœâÂëÆ÷...\n" #define MSGTR_CannotOpenOutputFile "ÎÞ·šŽò¿ªÊä³öÎÄŒþ '%s'\n" #define MSGTR_EncoderOpenFailed "ÎÞ·šŽò¿ª±àÂëÆ÷\n" #define MSGTR_ForcingOutputFourcc "Öž¶šÊä³öµÄfourccÎª %x [%.4s]\n" @@ -145,7 +147,7 @@ #define MSGTR_SkipFrame "\nÌø¹ýÕâÒ»Ö¡!!! \n" #define MSGTR_ErrorWritingFile "%s: ÐŽÈëÎÄŒþŽíÎó.\n" #define MSGTR_WritingAVIIndex "\nÕýÔÚÐŽAVIË÷Òý...\n" -#define MSGTR_FixupAVIHeader "ÐÞÕýAVI1€7ÄŒþÍ1€7...\n" +#define MSGTR_FixupAVIHeader "ÐÞžŽAVIÎÄŒþÍ·...\n" #define MSGTR_RecommendedVideoBitrate "%s CDÍÆŒöµÄÊÓÆµ±ÈÌØÂÊÎª: %d\n" #define MSGTR_VideoStreamResult "\nÊÓÆµÁ÷: %8.3f kbit/s (%d bps) ŽóÐ¡: %d bytes %5.3f secs %d frames\n" #define MSGTR_AudioStreamResult "\nÒôÆµÁ÷: %8.3f kbit/s (%d bps) ŽóÐ¡: %d bytes %5.3f secs\n" @@ -158,6 +160,10 @@ #define MSGTR_ConnToServer "Á¬œÓµœ·þÎñÆ÷: %s\n" #define MSGTR_FileNotFound "ÕÒ²»µœÎÄŒþ: '%s'\n" +#define MSGTR_SMBInitError "ÎÞ·š³õÊŒ»¯libsmbclient¿â: %d\n" +#define MSGTR_SMBFileNotFound "ÎÞ·šŽò¿ªŸÖÓòÍøÄÚµÄ: '%s'\n" +#define MSGTR_SMBNotCompiled "MPlayerÃ»ÓÐ±àÒëSMB¶ÁÈ¡µÄÖ§³Ö\n" + #define MSGTR_CantOpenDVD "ÎÞ·šŽò¿ªDVD Éè±ž: %s\n" #define MSGTR_DVDwait "¶ÁÈ¡¹âÅÌœá¹¹, ÇëµÈŽý...\n" #define MSGTR_DVDnumTitles "ÕâÕÅDVDÓÐ %d žötitles.\n" @@ -220,12 +226,12 @@ #define MSGTR_ClipInfo "Clip info: \n" // dec_video.c & dec_audio.c: -#define MSGTR_CantOpenCodec "ÎÞ·šŽò¿ªcodec\n" -#define MSGTR_CantCloseCodec "ÎÞ·š¹Ø±Õcodec\n" +#define MSGTR_CantOpenCodec "ÎÞ·šŽò¿ªœâÂëÆ÷\n" +#define MSGTR_CantCloseCodec "ÎÞ·š¹Ø±ÕœâÂëÆ÷\n" -#define MSGTR_MissingDLLcodec "ŽíÎó: ÎÞ·šŽò¿ªÒªÇóµÄDirectShow codec: %s\n" -#define MSGTR_ACMiniterror "ÎÞ·šŒÓÔØ/³õÊŒ»¯Win32/ACMÒôÆµcodec (È±ÉÙDLLÎÄŒþ?)\n" -#define MSGTR_MissingLAVCcodec "ÔÚlibavcodecÖÐÕÒ²»µœcodec '%s'...\n" +#define MSGTR_MissingDLLcodec "ŽíÎó: ÎÞ·šŽò¿ªÒªÇóµÄDirectShowœâÂëÆ÷: %s\n" +#define MSGTR_ACMiniterror "ÎÞ·šŒÓÔØ/³õÊŒ»¯Win32/ACMÒôÆµœâÂëÆ÷(È±ÉÙDLLÎÄŒþ?)\n" +#define MSGTR_MissingLAVCcodec "ÔÚlibavcodecÖÐÕÒ²»µœœâÂëÆ÷ '%s'...\n" #define MSGTR_MpegNoSequHdr "MPEG: ÖÂÃüŽíÎó: ËÑË÷ÐòÁÐÍ·Ê±ÓöµœEOF\n" #define MSGTR_CannotReadMpegSequHdr "ÖÂÃüŽíÎó: ÎÞ·š¶ÁÈ¡ÐòÁÐÍ·!\n" @@ -432,6 +438,8 @@ #define MSGTR_PREFERENCES_FRAME_Font "×ÖÌå" #define MSGTR_PREFERENCES_FRAME_PostProcess "ºóÆÚŽŠÀí" #define MSGTR_PREFERENCES_FRAME_CodecDemuxer "Codec & demuxer" +#define MSGTR_PREFERENCES_FRAME_Cache "»ºŽæ" +#define MSGTR_PREFERENCES_FRAME_Misc "ÆäËû" #define MSGTR_PREFERENCES_OSS_Device "Éè±ž:" #define MSGTR_PREFERENCES_OSS_Mixer "»ìÒôÆ÷:" #define MSGTR_PREFERENCES_Message "ÇëŒÇ×¡, ÓÐÐ©¹ŠÄÜÖ»ÓÐÖØÐÂ²¥·Åºó²ÅÓÐÐ§¹û." @@ -458,6 +466,7 @@ #define MSGTR_PREFERENCES_FontEncoding18 "ÈÕÓï(SHIFT-JIS)" #define MSGTR_PREFERENCES_FontEncoding19 "º«Óï(CP949)" #define MSGTR_PREFERENCES_FontEncoding20 "Ì©Óï(CP874)" +#define MSGTR_PREFERENCES_FontEncoding21 "WindowsµÄÎ÷Àï¶ûÓï(CP1251)" #define MSGTR_PREFERENCES_FontNoAutoScale "²»×Ô¶¯Ëõ·Å" #define MSGTR_PREFERENCES_FontPropWidth "¿í¶È³É±ÈÀý" #define MSGTR_PREFERENCES_FontPropHeight "žß¶È³É±ÈÀý" @@ -468,6 +477,8 @@ #define MSGTR_PREFERENCES_FontTextScale "ÎÄ×ÖËõ·Å:" #define MSGTR_PREFERENCES_FontOSDScale "OSDËõ·Å:" #define MSGTR_PREFERENCES_SubtitleOSD "×ÖÄ»ºÍOSD" +#define MSGTR_PREFERENCES_Cache "Žò¿ª/¹Ø±Õ»ºŽæ" +#define MSGTR_PREFERENCES_LoadFullscreen "ÒÔÈ«ÆÁ·œÊœ¿ªÊŒ" // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "ÖÂÃüŽíÎó ..."

1 0