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

CVS: main/libmpcodecs vd_ffmpeg.c,1.44,1.45
by Michael Niedermayer 21 Aug '02

21 Aug '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv5662 Modified Files: vd_ffmpeg.c Log Message: asserts to check buffer size and non overlapingness Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- vd_ffmpeg.c 14 Aug 2002 21:43:49 -0000 1.44 +++ vd_ffmpeg.c 21 Aug 2002 19:08:24 -0000 1.45 @@ -351,6 +351,21 @@ if(avctx->dr_uvstride && avctx->dr_uvstride !=mpi->stride[1]){ mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Error: uvstride changed\n"); } + + assert(mpi->width >= ((width +align)&(~align))); + assert(mpi->height >= ((height+align)&(~align))); + assert(mpi->stride[0] >= mpi->width); + if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){ + const int y_size= mpi->stride[0] * mpi->height; + const int c_size= mpi->stride[1] * mpi->chroma_height; + + assert(mpi->planes[0] > mpi->planes[1] || mpi->planes[0] + y_size <= mpi->planes[1]); + assert(mpi->planes[0] > mpi->planes[2] || mpi->planes[0] + y_size <= mpi->planes[2]); + assert(mpi->planes[1] > mpi->planes[0] || mpi->planes[1] + c_size <= mpi->planes[0]); + assert(mpi->planes[1] > mpi->planes[2] || mpi->planes[1] + c_size <= mpi->planes[2]); + assert(mpi->planes[2] > mpi->planes[0] || mpi->planes[2] + c_size <= mpi->planes[0]); + assert(mpi->planes[2] > mpi->planes[1] || mpi->planes[2] + c_size <= mpi->planes[1]); + } avctx->dr_stride = mpi->stride[0]; avctx->dr_uvstride = mpi->stride[1];

1 0

CVS: main/libao2 ao_alsa9.c,1.22,1.23
by joy_ping 20 Aug '02

20 Aug '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv792 Modified Files: ao_alsa9.c Log Message: changed spdif default from "hw:0,2" to general alias "iec958" based on a patch by Benedikt Hunz <hunz(a)hunz.org> corrected typo in ugly spdif-warning message added 32/20bit modes for 'high-end'-soundcards disabled hw-mixer-access for big-endian machines (mplayer seems to screw up hw-mixer on LinuxPPC running ALSA needs more testing, but its safer to disable it for now.) Index: ao_alsa9.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_alsa9.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ao_alsa9.c 18 Jul 2002 16:09:54 -0000 1.22 +++ ao_alsa9.c 20 Aug 2002 14:15:25 -0000 1.23 @@ -140,17 +140,9 @@ } if ((err = snd_ctl_elem_write(ctl_handler, ctl)) < 0) { //fprintf(stderr, "Unable to update the IEC958 control: %s\n", snd_strerror(err)); - printf("alsa-spdif-init: cant set spdif-trough automatically\n"); + printf("alsa-spdif-init: cant set spdif-through automatically\n"); goto __diga_end; } - //test area - /* elem_device = snd_ctl_elem_id_get_device(elem_id); */ - /* elem_name = snd_ctl_elem_value_get_name(ctl); */ - /* snd_ctl_elem_value_get_iec958(ctl, &spdif); */ - /* printf("spdif = %i, device = %i\n", &spdif, elem_device); */ - /* printf("name = %s\n", elem_name); */ - //end test area - snd_ctl_close(ctl_handler); __diga_end: @@ -211,6 +203,8 @@ return CONTROL_TRUE; case AOCONTROL_GET_VOLUME: case AOCONTROL_SET_VOLUME: +#ifndef WORDS_BIGENDIAN +{ //seems to be a problem on macs? { ao_control_vol_t *vol = (ao_control_vol_t *)arg; @@ -303,7 +297,17 @@ snd_mixer_close(handle); return CONTROL_OK; } +}// end big-endian +#endif +#ifdef WORDS_BIGENDIAN +{ + { + return (CONTROL_UNKNOWN); } +} +#endif + + } //end witch return(CONTROL_UNKNOWN); } @@ -344,49 +348,60 @@ //ao_data.buffersize = MAX_OUTBURST; // was 16384 switch (format) - { - case AFMT_S8: - alsa_format = SND_PCM_FORMAT_S8; - break; - case AFMT_U8: - alsa_format = SND_PCM_FORMAT_U8; - break; - case AFMT_U16_LE: - alsa_format = SND_PCM_FORMAT_U16_LE; - break; - case AFMT_U16_BE: - alsa_format = SND_PCM_FORMAT_U16_BE; - break; + { + case AFMT_S8: + alsa_format = SND_PCM_FORMAT_S8; + break; + case AFMT_U8: + alsa_format = SND_PCM_FORMAT_U8; + break; + case AFMT_U16_LE: + alsa_format = SND_PCM_FORMAT_U16_LE; + break; + case AFMT_U16_BE: + alsa_format = SND_PCM_FORMAT_U16_BE; + break; #ifndef WORDS_BIGENDIAN - case AFMT_AC3: + case AFMT_AC3: #endif - case AFMT_S16_LE: - alsa_format = SND_PCM_FORMAT_S16_LE; - break; + case AFMT_S16_LE: + alsa_format = SND_PCM_FORMAT_S16_LE; + break; #ifdef WORDS_BIGENDIAN - case AFMT_AC3: + case AFMT_AC3: #endif - case AFMT_S16_BE: - alsa_format = SND_PCM_FORMAT_S16_BE; - break; - default: - alsa_format = SND_PCM_FORMAT_MPEG; - break; - } + case AFMT_S16_BE: + alsa_format = SND_PCM_FORMAT_S16_BE; + break; + case AFMT_S32_LE: + alsa_format = SND_PCM_FORMAT_S32_LE; + break; + case AFMT_S32_BE: + alsa_format = SND_PCM_FORMAT_S32_BE; + break; + + default: + alsa_format = SND_PCM_FORMAT_MPEG; + break; + } switch(alsa_format) - { - case SND_PCM_FORMAT_S16_LE: - case SND_PCM_FORMAT_U16_LE: - ao_data.bps *= 2; - break; - case -1: - printf("alsa-init: invalid format (%s) requested - output disabled\n", - audio_out_format_name(format)); - return(0); - default: - break; - } + { + case SND_PCM_FORMAT_S16_LE: + case SND_PCM_FORMAT_U16_LE: + ao_data.bps *= 2; + break; + case SND_PCM_FORMAT_S32_LE: + case SND_PCM_FORMAT_S32_BE: + ao_data.bps *= 4; + break; + case -1: + printf("alsa-init: invalid format (%s) requested - output disabled\n", + audio_out_format_name(format)); + return(0); + default: + break; + } if (ao_subdevice) { //start parsing ao_subdevice, ugly and not thread safe! @@ -498,7 +513,7 @@ if (device_set) alsa_handler = spdif_init(alsa_device); else - alsa_handler = spdif_init("hw:0,2"); + alsa_handler = spdif_init("iec958"); } //setting modes for block or nonblock-mode @@ -512,7 +527,7 @@ set_block_mode = 0; str_block_mode = "block-mode"; } - //cvs cosmetics fix + //sets buff/chunksize if its set manually if (ao_data.buffersize) { switch (ao_data.buffersize)

1 0

CVS: main/DOCS/Polish mplayer.1,1.6,1.7
by Diego Biurrun CVS 20 Aug '02

20 Aug '02

Update of /cvsroot/mplayer/main/DOCS/Polish In directory mail:/var/tmp.root/cvs-serv14933/DOCS/Polish Modified Files: mplayer.1 Log Message: -subcc option documented, patch by Robert R. Wal <rrw at hell pl>. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Polish/mplayer.1,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mplayer.1 19 Jul 2002 20:51:44 -0000 1.6 +++ mplayer.1 20 Aug 2002 00:57:13 -0000 1.7 @@ -493,6 +493,12 @@ .B \-sub <plik\ napisów> U¿yj/wy¶wietl ten plik napisów .TP +.B \-subcc +Wy¶wietl napisy Closed Caption (CC) na DVD. Nie chodzi tu o zwyk³e napisy VOB, +tylko o specjalne napisy ASCII dla nies³ysz±cych umieszczone w plikach VOB +w strumieniu userdata na wiêkszo¶ci p³yt R1 DVD. Napisy CC nie wystêpuj± +na p³ytach DVD z regionów innych ni¿ R1. +.TP .B \-subcp\ strona\ kodowa Je¿eli masz w systemie iconv(3), mo¿esz u¿yæ tej opcji do okre¶lenia strony kodowej napisów. Przyk³ad: @@ -1380,4 +1386,4 @@ prosimy zg³aszaæ t³umaczom. -.\" end of file \ No newline at end of file +.\" end of file

1 0

CVS: main/DOCS mplayer.1,1.208,1.209
by Diego Biurrun CVS 20 Aug '02

20 Aug '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv14933/DOCS Modified Files: mplayer.1 Log Message: -subcc option documented, patch by Robert R. Wal <rrw at hell pl>. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- mplayer.1 19 Aug 2002 01:38:59 -0000 1.208 +++ mplayer.1 20 Aug 2002 00:57:12 -0000 1.209 @@ -641,6 +641,12 @@ .B \-sub <subtitle\ file> Use/display this subtitle file. .TP +.B \-subcc +Display DVD Closed Caption (CC) subtitles. These are NOT the VOB subtitles, +these are special ASCII subtitles for the hearing impaired encoded in the VOB +userdata stream on most region 1 DVDs. CC subtitles have not been spotted on +DVDs from other regions so far. +.TP .B \-subcp <codepage> If your system supports iconv(3), you can use this option to specify codepage of the subtitle.

1 0

CVS: main/DOCS cd-dvd.html,1.41,1.42 encoding.html,1.59,1.60 formats.html,1.41,1.42
by Diego Biurrun CVS 20 Aug '02

20 Aug '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv8362 Modified Files: cd-dvd.html encoding.html formats.html Log Message: Fixed typo manpage --> man page. Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/cd-dvd.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- cd-dvd.html 20 Aug 2002 00:33:04 -0000 1.41 +++ cd-dvd.html 20 Aug 2002 00:36:58 -0000 1.42 @@ -78,7 +78,7 @@ install libcss 0.0.1 (not newer) for this (If MPlayer fails to detect it, use the <CODE>-csslib /path/to/libcss.so</CODE> option). -For the complete list of available options, please read the manpage. +For the complete list of available options, please read the man page. <H2><A NAME="vcd">4.3 VCD playback</A></H2> Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- encoding.html 20 Aug 2002 00:33:04 -0000 1.59 +++ encoding.html 20 Aug 2002 00:36:58 -0000 1.60 @@ -346,8 +346,8 @@ <H3><A NAME="options">2.4.4 Options</A></H3> -For the complete list of available MEncoder options and examples, please - see the manpage. +For the complete list of available MEncoder options and examples, please + see the man page. </BODY> </HTML> Index: formats.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/formats.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- formats.html 20 Aug 2002 00:33:04 -0000 1.41 +++ formats.html 20 Aug 2002 00:36:58 -0000 1.42 @@ -229,7 +229,7 @@ misdetect as MPEGs and play incorrectly or not at all. This cannot be fixed without dropping support for certain broken MPEG files and thus will remain like this for the foreseeable future. The <CODE>-demuxer</CODE> flag - described in the manpage may help you in these cases. + described in the man page may help you in these cases. <H4><A NAME="wav">2.1.2.2 WAV files</A></H4>

1 0

CVS: main/DOCS cd-dvd.html,1.39,1.40 documentation.html,1.290,1.291 encoding.html,1.57,1.58
by Winner of tha face compo 19 Aug '02

19 Aug '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv16266 Modified Files: cd-dvd.html documentation.html encoding.html Log Message: begun removing "Available options" and "Examples" sections, which was discussed earlier on the list. Objections? Better solutions? Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/cd-dvd.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- cd-dvd.html 11 Aug 2002 20:38:34 -0000 1.39 +++ cd-dvd.html 18 Aug 2002 20:51:55 -0000 1.40 @@ -78,58 +78,7 @@ install libcss 0.0.1 (not newer) for this (If MPlayer fails to detect it, use the <CODE>-csslib /path/to/libcss.so</CODE> option). -Using MPlayer to play DVDs: - -<TABLE BORDER=0 WIDTH="100%"> - <TR><TD VALIGN=top><CODE>-dvd <title_id> </CODE></TD> - <TD>Enables DVD support and selects title.</TD></TR> - <TR><TD VALIGN=top><CODE>-chapter <chapter_id> </CODE></TD> - <TD>Selects DVD chapter(s) to play (default: 1). - Example: <CODE>-chapter 5-10</CODE> or <CODE>-chapter -9</CODE></TD></TR> - <TR><TD VALIGN=top><CODE>-dvdangle <angle_id> </CODE></TD> - <TD>Selects camera angle (default: 1)</TD></TR> - <TR><TD VALIGN=top><CODE>-alang <country code> </CODE></TD> - <TD>The <CODE>country code</CODE> tells MPlayer which audio - language(s) to prefer. For a list of available languages, add the - <CODE>-v</CODE> option after your DVD options and browse the output. - For example: -   <CODE>-alang hu,en</CODE> - Tries to find Hungarian audio, - falling back to English audio.</TD></TR> - <TR><TD VALIGN=top><CODE>-slang <country code> </CODE></TD> - <TD>Turns on DVD subtitles. The <CODE>country code</CODE> tells - MPlayer which language(s) to prefer. - For the list of available languages, add the <CODE>-v</CODE> option after - your DVD options and browse the output. - For example: -   <CODE>-slang hu,en</CODE> - Tries to display Hungarian - subtitles, falling back to English subtitles.</TD></TR> - <TR><TD VALIGN=top><CODE>-sid <subtitle_id> </CODE></TD> - <TD>Displays a subtitle channel with the given <CODE>id</CODE> (values can - be 0-31). Useful with badly mastered DVDs where the country code - selects the wrong channel.</TD></TR> - <TR><TD VALIGN=top><CODE>-csslib <path/filename></CODE></TD> - <TD>(old-style DVD option) This option is used to override the default - location of <CODE>libcss.so</CODE>. - </TD></TR> - <TR><TD VALIGN=top><CODE>-dvdauth <DVD device> </CODE></TD> - <TD>(old-style DVD option) Turns on DVD authentication using the given - device.</TD></TR> - <TR><TD VALIGN=top><CODE>-dvdkey <CSS key></CODE></TD> - <TD>(old-style DVD option) When decoding a VOB file copied undecrypted from - DVD, this option gives the CSS key needed to decrypt the VOB (the key is - printed when authenticating with the DVD drive using -dvdauth).</TD></TR> -</TABLE> - -The default device is <CODE>/dev/dvd</CODE>, you can change it in - <CODE>config.h</CODE> (compile time option), or you can specify it using the - <CODE>-dvd-device</CODE> option: - -    <CODE>mplayer -dvd 1 -dvd-device /dev/dvd</CODE> -    <CODE>mplayer -dvd 1 -slang en -dvd-device /dev/dvd</CODE> -    <CODE>mplayer -dvd 1 -slang en -dvd-device /dev/dvd -chapter 20-25</CODE> -    <CODE>mplayer -dvd 2 -alang sp -chapter 5 -dvdangle 2</CODE> -    <CODE>mplayer -dvdauth /dev/dvd /mnt/cd/video_ts/vts_03_1.vob</CODE> -    <CODE>mplayer -dvdkey C005D4A16D vts_03_1.vob</CODE> +For the complete list of available options, please read the manpage. <A NAME="vcd">4.3 VCD playback</A> Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.290 retrieving revision 1.291 diff -u -r1.290 -r1.291 --- documentation.html 15 Aug 2002 12:42:52 -0000 1.290 +++ documentation.html 18 Aug 2002 20:51:55 -0000 1.291 @@ -189,9 +189,7 @@ <LI><A HREF="encoding.html#vobsub">2.4.3.7 Extracting DVD subtitles to Vobsub file</A></LI> </UL> </LI> - <LI><A HREF="encoding.html#syntax">2.4.4 Syntax</A></LI> - <LI><A HREF="encoding.html#options">2.4.5 Available options</A></LI> - <LI><A HREF="encoding.html#examples">2.4.6 Examples</A></LI> + <LI><A HREF="encoding.html#options">2.4.4 Available options</A></LI> </UL> </LI> <LI><A HREF="#tv">2.5 TV input</A> @@ -880,8 +878,8 @@ OSD has 3 states: (switch with 'o') <UL> - <LI>timer + volume bar + seek bar + subtitles (default)</LI> - <LI>volume bar + seek bar + subtitles</LI> + <LI>timer + volume bar + seek bar + subtitles</LI> + <LI>volume bar + seek bar + subtitles (default)</LI> <LI>subtitles only</LI> </UL> @@ -2514,6 +2512,9 @@ change is required or you have a better fix or you have noticed a possible bug/problem in the committed patch). Be sure in that your target developer reads this list!</LI> + <LI>MPlayer Cygwin-porting list: + <A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin">http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin</A> + List for discussion about MPlayer's Cygwin port.</LI> </UL> Note: Unless explicitly stated otherwise the language of the above Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- encoding.html 14 Aug 2002 20:33:26 -0000 1.57 +++ encoding.html 18 Aug 2002 20:51:55 -0000 1.58 @@ -342,156 +342,10 @@   <CODE>mencoder movie.mpg -ifo movie.ifo -vobsubout subtitles -vobsuboutindex 0 -vobsuboutid fr -sid 1</CODE> +<A NAME="options">2.4.4 Options</A> -<A NAME="syntax">2.4.4 Syntax</A> - -  <CODE>mencoder [options] [input file] [options] ...</CODE> - - -<A NAME="options">2.4.5 Available options</A> - -NOTE: for all available options, read the man page. - -As MEncoder is built on the same codebase as MPlayer, there - are many MPlayer options that have function in MEncoder too. - See, you can use <CODE>-sid</CODE> to rip a DVD with subtitles, or - <CODE>-noidx</CODE> to disregard buggy index of input AVI. Be smart! - -<TABLE BORDER=1> - <TR> - <TD><CODE>-ss</CODE> time</TD> - <TD>start encoding from the given time (can start only from keyframes!) - </TD> - </TR> - <TR> - <TD><CODE>-endpos</CODE> time</TD> - <TD>stop encoding at the given time. See the man page for examples. - </TD> - </TR> - <TR> - <TD><CODE>-o</CODE> filename</TD> - <TD>specify output filename - </TD> - </TR> - <TR> - <TD><CODE>-sws</CODE> 0-2</TD> - <TD>type of scaling method -   0 - fast bilinear -   1 - bilinear -   2 - bicubic (best quality) - </TD> - </TR> - <TR> - <TD><CODE>-ovc</CODE> codecname</TD> - <TD>Encode with the given codec (codec names are from codecs.conf). Examples: -   help - get list of available codecs -   rawrgb - ? -   copy - no encoding, just copy the stream (only from AVI/ASF now) -   divx4 - encode to DivX4 -   lavc - encode with a codec from libavcodec -   vfw - encode with a Windows DLL - </TD> - </TR> - <TR> - <TD><CODE>-oac</CODE> codecname</TD> - <TD>Encode with the given codec (codec names are from codecs.conf). Examples: -   help - get list of available codecs -   copy - no encoding, just copy the stream (only from AVI/ASF now) -   pcm - encode to uncompressed PCM -   mp3lame - encode to MP3 (using Lame) - </TD> - </TR> - <TR> - <TD><CODE>-mf</CODE> multifile options</TD> - <TD>Used when encoding from multiple JPEG files. Its sub-options are: -   on - turns on multifile support -   w=<value> - width of the output file -   h=<value> - height of the output file -   fps=<value> - fps of the output file -   type=<value> - type of input files (available types: - <CODE>jpeg</CODE>, <CODE>png</CODE>) - </TD> - </TR> - - <TR> - <TD><CODE>-divx4opts</CODE></TD> - <TD>If encoding to DivX4, you can specify its parameters here, like: -   <CODE>-divx4opts br=1800:deinterlace:key=250</CODE> - Common options: (for a full list, check the man page) -   help - get help -   br=<value> - specify bitrate in kbit <4-16000> - or bit <16001-24000000> -   q=<value> - quality (1-fastest, 5-best - default 5) -   key=<value> - keyframe interval - </TD> - </TR> - <TR> - <TD><CODE>-lavcopts</CODE></TD> - <TD>If encoding with libavcodec, you can specify its parameters here, like: -   <CODE>-lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250</CODE> - Common options: (for a full list, check the man page) -   help - get help -   vcodec=<value> - select videocodec (for the full list, see the libavcodec section above) -   vbitrate=<value> - specify bitrate in kbit <4-16000> or bit <16001-24000000> -   vhq - high quality -   keyint=<value> - keyframe interval - </TD> - </TR> - <TR> - <TD><CODE>-lameopts</CODE></TD> - <TD>If encoding to MP3 with libmp3lame, you can specify its parameters here, like: -   <CODE>-lameopts q=3</CODE> -   <CODE>-lameopts br=192:cbr</CODE> - Common options: (for a full list, check the man page) -   help - get help -   cbr - select CBR MP3 (default is VBR) -   br=<value> - specify bitrate in kbit <0-1024> (this is for CBR only!) -   q=<value> - quality (0-highest, 9-fastest - default 0) (this is for VBR only!) -   vbr=<value> - VBR sub-mode (3-ABR, best quality/speed) (this is for VBR only!) - </TD> - </TR> - <TR> - <TD><CODE>-vobsubout</CODE> basename</TD> - <TD>Specify the basename for the output <CODE>.idx</CODE> and <CODE>.sub</CODE> - files. This turns off subtitle rendering on the encoded movie.</TD> - </TR> - <TR> - <TD><CODE>-vobsuboutindex</CODE> index</TD> - <TD>Specify the index of the subtitles in the output files. Defaults to 0.</TD> - </TR> - <TR> - <TD><CODE>-vobsuboutid</CODE> langid</TD> - <TD>Specify the language two letter code for the subtitles. This overrides - what is read from the DVD or the <CODE>.ifo</CODE> file.</TD> - </TR> -</TABLE> - -<A NAME="examples">2.4.6 Examples</A> - -Using MEncoder is the easiest thing on Earth. See the following: - -Encoding from DVD, title 2: - <CODE>    mencoder -dvd 2 -lavcopts vcodec=mpeg4:more_options -o title2.avi</CODE> - -The same, but with libavcodec family, MJPEG compression: - <CODE>    mencoder -dvd 2 -lavcopts vcodec=mjpeg:more_options -ffourcc mjpg -o title2.avi</CODE> - -Encoding from DVD, title 2, with rescaling: - <CODE>    mencoder -dvd 2 -vop scale=640:480 -sws 2 -lavcopts vcodec=mpeg4:more_options -o title2.avi</CODE> - -Encoding from HTTP: - <CODE>    mencoder http://mplayer.hq/example.avi -lavcopts vcodec=mpeg4:more_options -o example.avi</CODE> - -Encoding from a pipe: - <CODE>    rar p test-SVCD.rar | mencoder -lavcopts vcodec=mpeg4:more_options -ofps 24 -pass 1 -- -</CODE> - -Encoding multiple *.vob files: - <CODE>    cat *.vob | mencoder <options> -</CODE> - -Encoding from tuner (see the <A HREF="documentation.html#tv">TV input</A> section for tuner options): - <CODE>    mencoder -tv on:driver=v4l:width=640:height=480 <options></CODE> - -For all available options, check the MEncoder man page. +For the complete list of available MEncoder options and examples, please + see the manpage. </BODY> </HTML>

3 2

CVS: main help_mp-dk.h,1.8,1.9
by Johannes Feigl 19 Aug '02

19 Aug '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv30613 Modified Files: help_mp-dk.h Log Message: sync by anders(a)gnulinux.dk Index: help_mp-dk.h =================================================================== RCS file: /cvsroot/mplayer/main/help_mp-dk.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- help_mp-dk.h 7 Aug 2002 09:01:13 -0000 1.8 +++ help_mp-dk.h 19 Aug 2002 11:17:24 -0000 1.9 @@ -15,7 +15,7 @@ "Benyt: mplayer [instilling] [url|sti/]filnavn\n" #endif "\n" -"Basis indstillinger (se mansiden for en komplet liste):\n" +"Basale indstillinger (se mansiden for en komplet liste):\n" " -vo <drv[:dev]> vælg video driver og enhed (se '-vo help' for en komplet liste)\n" " -ao <drv[:dev]> vælg lyd driver og enhed (se '-ao help' for en komplet liste)\n" #ifdef HAVE_VCD @@ -30,12 +30,12 @@ #endif " -ss <timepos> søger til en given position (sekunder eller hh:mm:ss)\n" " -nosound afspiller uden lyd\n" -" -fs -vm -zoom type af afspilning i fuldskærm (fuldskærm, video mode, software skalering)\n" +" -fs -vm -zoom type af afspilning i fuldskærm (alm. fuldskærm, video mode, software skalering)\n" " -x <x> -y <y> skaler billede til <x> * <y> opløsning [hvis -vo driveren understøtter det!]\n" " -sub <file> specificer undertekst-fil (se også -subfps, -subdelay)\n" " -playlist <file> specificer afspilningsliste\n" " -vid x -aid y afspil film (x) og lyd (y)\n" -" -fps x -srate y ændrer filmens (x fps) og lydens (y Hz)\n" +" -fps x -srate y ændre filmens (x fps) og lydens (y Hz)\n" " -pp <quality> slå efterprocesseringsfilter til (bedre billedkvalitet) (0-4 for DivX, 0-63 for mpegs)\n" " -framedrop slå billede-skip til (kan hjælpe langsomme maskiner)\n" "\n" @@ -46,7 +46,7 @@ " < or > søger frem og tilbage en afspilningslisten\n" " p or SPACE pause filmen (starter igen ved en vilkårlig tast)\n" " q or ESC stop afspilning og afslut program\n" -" + or - juster lydforsinkelse med +/- 0.1 sekund\n" +" + or - juster lydforsinkelse med +/- 0.1 sekundt\n" " o vælger OSD type: ingen / søgebar / søgebar+tid\n" " * or / forøger eller formindsker volumen (tryk 'm' for at vælge master/pcm)\n" " z or x justerer undertekstforsinkelse med +/- 0.1 sekund\n" @@ -65,15 +65,15 @@ #define MSGTR_Exit_eof "Slutningen af filen" #define MSGTR_Exit_error "Fatal fejl" #define MSGTR_IntBySignal "\nMPlayer afbrudt af signal %d i modul: %s \n" -#define MSGTR_NoHomeDir "Kan ikke finde hjemmekatalog (HOME)\n" +#define MSGTR_NoHomeDir "Kan ikke finde hjemmekatalog\n" #define MSGTR_GetpathProblem "get_path(\"config\") problem\n" #define MSGTR_CreatingCfgFile "Genererer konfigurationsfil: %s\n" -#define MSGTR_InvalidVOdriver "Ugyldig valg af video driver: %s\nBrug '-vo help' for at få en komplet liste over gyldige video-drivere.\n" -#define MSGTR_InvalidAOdriver "Ugyldig valg af lyd driver: %s\nBrug '-ao help' for at få en komplet liste over gyldige lyd-drivere.\n" -#define MSGTR_CopyCodecsConf "(kopierer/linker etc/codecs.conf (fra MPlayer kilde katalog) til ~/.mplayer/codecs.conf)\n" -#define MSGTR_CantLoadFont "Kan ikke indlæse fonten: %s\n" -#define MSGTR_CantLoadSub "Kan ikke indlæse undertekst-filen: %s\n" -#define MSGTR_ErrorDVDkey "Fejl under afvikling af DVD NØGLE.\n" +#define MSGTR_InvalidVOdriver "Ugyldig valg af videodriver: %s\nBrug '-vo help' for at få en komplet liste over gyldige videodrivere.\n" +#define MSGTR_InvalidAOdriver "Ugyldig valg af lyddriver: %s\nBrug '-ao help' for at få en komplet liste over gyldige lyddrivere.\n" +#define MSGTR_CopyCodecsConf "(kopier/link etc/codecs.conf (fra MPlayer kilde katalog) til ~/.mplayer/codecs.conf)\n" +#define MSGTR_CantLoadFont "Kan ikke indlæse skrifttypen: %s\n" +#define MSGTR_CantLoadSub "Kan ikke indlæse undertekstfilen: %s\n" +#define MSGTR_ErrorDVDkey "Fejl under afvikling af DVDNØGLE.\n" #define MSGTR_CmdlineDVDkey "DVD kommandolinjenøgle er gemt til dekryptering.\n" #define MSGTR_DVDauthOk "DVD auth sekvens synes af være OK.\n" #define MSGTR_DumpSelectedSteramMissing "dump: FATAL: kan ikke finde den valge fil eller adresse!\n" @@ -83,17 +83,17 @@ #define MSGTR_NoVideoStream "Desværre, filmen kan enten ikke findes eller kan ikke afspilles endnu\n" #define MSGTR_TryForceAudioFmt "Prøver at tvinge en lyd codec driver familie %d ...\n" #define MSGTR_CantFindAfmtFallback "Kan ikke finde lyd codec for driver familien, falder tilbage på en anden driver.\n" -#define MSGTR_CantFindAudioCodec "Kan ikke finde codec til lyd formatet 0x%X !\n" +#define MSGTR_CantFindAudioCodec "Kan ikke finde codec til lydformatet 0x%X !\n" #define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Prøv at opgradere %s fra etc/codecs.conf\n*** Hvis dette ikke hjælper, så læs filen DOCS/codecs.html!\n" -#define MSGTR_CouldntInitAudioCodec "Kunne ikke initialisere lyd codec! -> ingen lyd\n" -#define MSGTR_TryForceVideoFmt "Prøver at tvinge en video codec driver familie %d ...\n" -#define MSGTR_CantFindVfmtFallback "Kan ikke finde video codec for den tvungede driver familie, falder tilbage på en anden driver.\n" -#define MSGTR_CantFindVideoCodec "Kan ikke finde video codec til formatet 0x%X !\n" -#define MSGTR_VOincompCodec "Desværre, den valgte video driverenhed er ikke kompatibel med dette codec.\n" -#define MSGTR_CouldntInitVideoCodec "FATAL: Kunne ikke initialisere video codec :(\n" +#define MSGTR_CouldntInitAudioCodec "Kunne ikke initialisere lydcodec! -> ingen lyd\n" +#define MSGTR_TryForceVideoFmt "Prøver at tvinge en videocodec driver familie %d ...\n" +#define MSGTR_CantFindVfmtFallback "Kan ikke finde videocodec for den tvungede driver familie, falder tilbage på en anden driver.\n" +#define MSGTR_CantFindVideoCodec "Kan ikke finde videocodec til formatet 0x%X !\n" +#define MSGTR_VOincompCodec "Desværre, den valgte video-driverenhed er ikke kompatibel med dette codec.\n" +#define MSGTR_CouldntInitVideoCodec "FATAL: Kunne ikke initialisere videocodec :(\n" #define MSGTR_EncodeFileExists "Filen eksisterer allerede: %s (overskriv ikke din favorit film (AVI)!)\n" #define MSGTR_CantCreateEncodeFile "Kan ikke oprette fil til enkodning\n" -#define MSGTR_CannotInitVO "FATAL: Kan ikke initialisere video driveren!\n" +#define MSGTR_CannotInitVO "FATAL: Kan ikke initialisere videodriveren!\n" #define MSGTR_CannotInitAO "Kunne ikke åbne/initialisere lydkortet -> INGEN LYD\n" #define MSGTR_StartPlaying "Starter afspilning ...\n" @@ -110,8 +110,8 @@ "- Ødelagt fil. Prøv kombinationer af følgende: -nobps -ni -mc 0 -forceidx\n"\ "Hvis intet af dette hjalp, læs da DOCS/bugreports.html !\n\n" -#define MSGTR_NoGui "MPlayer blev kompileret UDEN grafisk interface!\n" -#define MSGTR_GuiNeedsX "MPlayer grafisk interface kræver X11!\n" +#define MSGTR_NoGui "MPlayer blev kompileret UDEN grafisk grænseflade!\n" +#define MSGTR_GuiNeedsX "MPlayer grafisk grænseflade kræver X11!\n" #define MSGTR_Playing "Afspiller %s\n" #define MSGTR_NoSound "Lyd: ingen lyd!!!\n" #define MSGTR_FPSforced "FPS tvunget til %5.3f (ftime: %5.3f)\n" @@ -124,10 +124,10 @@ #define MSGTR_AvailableVideoCodecs "Tilgængelige videocodecs:\n" #define MSGTR_UsingRTCTiming "Benytter Linux's hardware RTC timing (%ldHz)\n" #define MSGTR_CannotReadVideoPropertiers "Video: kan ikke læse egenskaber\n" -#define MSGTR_NoStreamFound "Ingen strøm fundet\n" +#define MSGTR_NoStreamFound "Ingen stream fundet\n" #define MSGTR_InitializingAudioCodec "Initialiserer lydcodec...\n" #define MSGTR_ErrorInitializingVODevice "Fejl under initialisering/åbning af den valgte video (-vo) enhed!\n" -#define MSGTR_ForcedVideoCodec "Tvunget video codec: %s\n" +#define MSGTR_ForcedVideoCodec "Tvunget videocodec: %s\n" #define MSGTR_AODescription_AOAuthor "AO: Beskrivelse: %s\nAO: forfatter: %s\n" #define MSGTR_AOComment "AO: Kommentar: %s\n" #define MSGTR_Video_NoVideo "Video: ingen video!!!\n" @@ -135,12 +135,35 @@ #define MSGTR_Paused "\n------ PAUSE -------\r" #define MSGTR_PlaylistLoadUnable "\nKunne ikke indlæse afspilningslisten %s\n" +// mencoder.c: + +#define MSGTR_MEncoderCopyright "(C) 2000-2002 Arpad Gereoffy ((se dokumentation!)\n" +#define MSGTR_UsingPass3ControllFile "Benytter 3. pass kontrolfilen: %s\n" +#define MSGTR_MissingFilename "\nManglende filnavn!\n\n" +#define MSGTR_CannotOpenFile_Device "Kan ikke åbne fil/enhed\n" +#define MSGTR_ErrorDVDAuth "Fejl i DVD auth...\n" +#define MSGTR_CannotOpenDemuxer "Kan ikke åbne demuxer\n" +#define MSGTR_NoAudioEncoderSelected "\nIngen lydenkoder (-oac) valgt! Vælg en eller brug -nosound. Brug -oac for hjælp !\n" +#define MSGTR_NoVideoEncoderSelected "\nIngen videoenkoder (-ovc) valgt! Vælg en eller brug, brug -ovc for hjælp !\n" +#define MSGTR_InitializingAudioCodec "Initialiserer lydcodec...\n" +#define MSGTR_CannotOpenOutputFile "Kan ikke skrive til filen '%s'\n" +#define MSGTR_EncoderOpenFailed "Kunne ikke åbne enkoderen\n" +#define MSGTR_ForcingOutputFourcc "Tvinger udgang fourcc til %x [%.4s]\n" +#define MSGTR_WritingAVIHeader "Skriver AVI header...\n" +#define MSGTR_DuplicateFrames "\nduplikerer %d bille(r)!!! \n" +#define MSGTR_SkipFrame "\nskip billede!!! \n" +#define MSGTR_ErrorWritingFile "%s: fejl under skrivning af fil.\n" +#define MSGTR_WritingAVIIndex "\nSkriver AVI index...\n" +#define MSGTR_FixupAVIHeader "Fixup AVI header...\n" +#define MSGTR_RecommendedVideoBitrate "Anbefalet video bitrate for %s CD: %d\n" +#define MSGTR_VideoStreamResult "\nVideo strøm: %8.3f kbit/s (%d bps) størrelse: %d bytes %5.3f sek. %d billeder\n" +#define MSGTR_AudioStreamResult "\nAudio strøm: %8.3f kbit/s (%d bps) størrelse: %d bytes %5.3f sek.\n" // open.c, stream.c: #define MSGTR_CdDevNotfound "CD-ROM Drev '%s' ikke fundet!\n" #define MSGTR_ErrTrackSelect "Fejl i valg af VCD nummer!" #define MSGTR_ReadSTDIN "Læser fra stdin...\n" -#define MSGTR_UnableOpenURL "Ikke mulig at få kontakt til URL: %s\n" +#define MSGTR_UnableOpenURL "Ikke mulig at få kontakt til adressen: %s\n" #define MSGTR_ConnToServer "Koblet op til serveren: %s\n" #define MSGTR_FileNotFound "Filen blev ikke fundet: '%s'\n" @@ -157,32 +180,40 @@ #define MSGTR_DVDopenOk "DVD korrekt åbnet!\n" // demuxer.c, demux_*.c: -#define MSGTR_AudioStreamRedefined "Advarsel! Lyd-filens hoved %d er blevet omdefineret!\n" -#define MSGTR_VideoStreamRedefined "Advarsel! Video-filens hoved %d er blevet omdefineret!\n" -#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: For mange (%d i %d bytes) lyd pakker i bufferen!\n" -#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: For mange (%d i %d bytes) video pakker i bufferen!\n" +#define MSGTR_AudioStreamRedefined "Advarsel! Lyd-filens header %d er blevet omdefineret!\n" +#define MSGTR_VideoStreamRedefined "Advarsel! Video-filens header %d er blevet omdefineret!\n" +#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: For mange (%d i %d bytes) lydpakker i bufferen!\n" +#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: For mange (%d i %d bytes) videopakker i bufferen!\n" #define MSGTR_MaybeNI "(måske afspiller du en 'non-interleaved' stream/fil ellers fejlede codec'et)\n" #define MSGTR_SwitchToNi "\nDetekteret defekt .AVI - skifter til -ni!\n" #define MSGTR_DetectedFILMfile "Detekterede FILM fil format!\n" -#define MSGTR_DetectedFLIfile "Detekterede FLI fil format!\n" -#define MSGTR_DetectedROQfile "Detekterede RoQ fil format!\n" -#define MSGTR_DetectedREALfile "Detekterede REAL fil format!\n" -#define MSGTR_DetectedAVIfile "Detekterede AVI fil format!\n" -#define MSGTR_DetectedASFfile "Detekterede ASF fil format!\n" -#define MSGTR_DetectedMPEGPESfile "Detekterede MPEG-PES fil format!\n" -#define MSGTR_DetectedMPEGPSfile "Detekterede MPEG-PS fil format!\n" -#define MSGTR_DetectedMPEGESfile "Detekterede MPEG-ES fil format!\n" -#define MSGTR_DetectedQTMOVfile "Detekterede QuickTime/MOV fil format!\n" +#define MSGTR_DetectedFLIfile "Detekterede FLI filformat!\n" +#define MSGTR_DetectedROQfile "Detekterede RoQ filformat!\n" +#define MSGTR_DetectedREALfile "Detekterede REAL filformat!\n" +#define MSGTR_DetectedAVIfile "Detekterede AVI filformat!\n" +#define MSGTR_DetectedASFfile "Detekterede ASF filformat!\n" +#define MSGTR_DetectedMPEGPESfile "Detekterede MPEG-PES filformat!\n" +#define MSGTR_DetectedMPEGPSfile "Detekterede MPEG-PS filformat!\n" +#define MSGTR_DetectedMPEGESfile "Detekterede MPEG-ES filformat!\n" +#define MSGTR_DetectedQTMOVfile "Detekterede QuickTime/MOV filformat!\n" +#define MSGTR_DetectedYUV4MPEG2file "Detekterede YUV4MPEG2 filformat!\n" +#define MSGTR_DetectedNuppelVideofile "Detekterede NuppelVideo filformat!\n" +#define MSGTR_DetectedVIVOfile "Detekterede VIVO filformat!\n" +#define MSGTR_DetectedBMPfile "Detekterede BMP filformat!\n" +#define MSGTR_DetectedOGGfile "Detekterede OGG filformat!\n" +#define MSGTR_DetectedRAWDVfile "Detekterede RAWDV filformat!\n" +#define MSGTR_DetectedAudiofile "Detekterede lydfil!\n" +#define MSGTR_NotSystemStream "Ikke MPEG System Stream format... (måske Transport Stream?)\n" #define MSGTR_MissingMpegVideo "Manglende MPEG video stream!? Rapporter venligst dette, det kan være en fejl i programmet :(\n" #define MSGTR_InvalidMPEGES "Ugyldig MPEG-ES stream??? Rapporter venligst dette, det kunne være en fejl i programmet :(\n" #define MSGTR_FormatNotRecognized \ "============= Desværre, dette fil-format er ikke detekteret eller understøttet ===============\n"\ "=== Hvis denne fil er en AVI, ASF or MPEG stream, så rapporter venligst dette, det kunne være en fejl i programmet :(===\n" -#define MSGTR_MissingVideoStream "Ingen video strøm fundet!\n" -#define MSGTR_MissingAudioStream "Ingen lyd strøm fundet... ->ingen lyd\n" -#define MSGTR_MissingVideoStreamBug "Manglende video strøm!? Rapporter venligst dette, det kunne være en fejl i programmet :(\n" +#define MSGTR_MissingVideoStream "Ingen videostream fundet!\n" +#define MSGTR_MissingAudioStream "Ingen lydstream fundet... ->ingen lyd\n" +#define MSGTR_MissingVideoStreamBug "Manglende videostream!? Rapporter venligst dette, det kunne være en fejl i programmet :(\n" -#define MSGTR_DoesntContainSelectedStream "demux: filen indeholder ikke den valgte lyd eller video stream\n" +#define MSGTR_DoesntContainSelectedStream "demux: filen indeholder ikke den valgte lyd- eller video-stream\n" #define MSGTR_NI_Forced "Tvunget" #define MSGTR_NI_Detected "Detekteret" @@ -190,15 +221,27 @@ #define MSGTR_UsingNINI "Bruger NON-INTERLEAVED (-ni), ødelagt AVI fil-format!\n" #define MSGTR_CouldntDetFNo "Kunne ikke finde antallet af billeder (for en absolutte søgning) \n" -#define MSGTR_CantSeekRawAVI "Kan ikke søge i rå .AVI strøm! (manglende index, prøv med -idx!) \n" +#define MSGTR_CantSeekRawAVI "Kan ikke søge i rå .AVI stream! (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 strøm men autoriseringen blev ikke påbegyndt af dig!!\n" +#define MSGTR_EncryptedVOBauth "Krypteret stream men autoriseringen blev ikke påbegyndt af dig!!\n" -#define MSGTR_MOVcomprhdr "MOV: Komprimeret hoved (endnu) ikke understøttet!\n" +#define MSGTR_MOVcomprhdr "MOV: Komprimeret header (endnu) ikke understøttet!\n" #define MSGTR_MOVvariableFourCC "MOV: Advarsel! variablen FOURCC detekteret!?\n" #define MSGTR_MOVtooManyTrk "MOV: Advarsel! For mange numre!" #define MSGTR_MOVnotyetsupp "\n****** Quicktime MOV format endnu ikke understøttet! *******\n" +#define MSGTR_FoundAudioStream "==> Fandt lydstream: %d\n" +#define MSGTR_FoundVideoStream "==> Fandt videostream: %d\n" +#define MSGTR_DetectedTV "Detekteret TV! ;-)\n" +#define MSGTR_ErrorOpeningOGGDemuxer "Ikke i stand til at åbne ogg demuxer\n" +#define MSGTR_ASFSearchingForAudioStream "ASF: Søger efter lydstream (id:%d)\n" +#define MSGTR_CannotOpenAudioStream "Kan ikke åbne lydstream: %s\n" +#define MSGTR_CannotOpenSubtitlesStream "Kan ikke åbne undertekststream: %s\n" +#define MSGTR_OpeningAudioDemuxerFailed "Kan ikke åbne lyddemuxer: %s\n" +#define MSGTR_OpeningSubtitlesDemuxerFailed "Kunne ikke åbne undertekstdemuxer: %s\n" +#define MSGTR_TVInputNotSeekable "TV input er ikke søgebart! (kan være du skulle skifte kanal ;))\n" +#define MSGTR_DemuxerInfoAlreadyPresent "Demuxer info %s allerede tilstede\n!" +#define MSGTR_ClipInfo "Klip info: \n" // dec_video.c & dec_audio.c: #define MSGTR_CantOpenCodec "kunne ikke åbne codec\n" @@ -220,20 +263,35 @@ #define MSGTR_MpegPPhint "ADVARSEL! Du anmodede efterprocesseringsfilter for en MPEG 1/2 video,\n" \ " men MPlayer blev kompileret uden MPEG 1/2 efterprocesseringsfilter understøttelse!\n" \ " #define MPEG12_POSTPROC i config.h, og rekompiler libmpeg2!\n" -#define MSGTR_MpegNoSequHdr "MPEG: FATAL: EOF under søgning efter sekvens hoved\n" -#define MSGTR_CannotReadMpegSequHdr "FATAL: Kunne ikke læse sekvens hoved!\n" -#define MSGTR_CannotReadMpegSequHdrEx "FATAL: Kunne ikke læse sekvems hoved udvidelse!\n" -#define MSGTR_BadMpegSequHdr "MPEG: Ugyldig sekvens hoved!\n" -#define MSGTR_BadMpegSequHdrEx "MPEG: Ugyldig sekvens hoved udvidelse!\n" +#define MSGTR_MpegNoSequHdr "MPEG: FATAL: EOF under søgning efter sekvensheader\n" +#define MSGTR_CannotReadMpegSequHdr "FATAL: Kunne ikke læse sekvensheader!\n" +#define MSGTR_CannotReadMpegSequHdrEx "FATAL: Kunne ikke læse sekvensheaderudvidelse!\n" +#define MSGTR_BadMpegSequHdr "MPEG: Ugyldig sekvensheader!\n" +#define MSGTR_BadMpegSequHdrEx "MPEG: Ugyldig sekvensheaderudvidelse!\n" #define MSGTR_ShMemAllocFail "Kunne ikke allokere delt ram\n" #define MSGTR_CantAllocAudioBuf "Kunne ikke allokere lyd buffer\n" #define MSGTR_NoMemForDecodedImage "ikke nok ram til at dekode billed buffer (%ld bytes)\n" -#define MSGTR_AC3notvalid "AC3 strøm invalid.\n" -#define MSGTR_AC3only48k "Kun 48000 Hz strømme understøttet.\n" +#define MSGTR_AC3notvalid "AC3 stream invalid.\n" +#define MSGTR_AC3only48k "Kun 48000 Hz stream understøttet.\n" #define MSGTR_UnknownAudio "Ukendt/manglende lyd format, slår over til ingen lyd\n" +#define MSGTR_UsingExternalPP "[PP] Benytter ekstern efterprocesseringsfilter, max q = %d\n" +#define MSGTR_UsingCodecPP "[PP] Benytter codec's efterprocessering, max q = %d\n" +#define MSGTR_VideoAttributeNotSupportedByVO_VD "Video egenskab '%s' ikke understøttet af den valgte vo & vd! \n" +#define MSGTR_VideoCodecFamilyNotAvailable "Anmodede videocodec familie [%s] (vfm=%d) ikke tilgængelig (aktiver før kompilering!)\n" +#define MSGTR_AudioCodecFamilyNotAvailable "Anmodede lydcodec familie [%s] (afm=%d) ikke tilgængelig (aktiver før kompilering!)\n" +#define MSGTR_OpeningVideoDecoder "Åbner videodekoder: [%s] %s\n" +#define MSGTR_OpeningAudioDecoder "Åbner audiodekoder: [%s] %s\n" +#define MSGTR_UninitVideo "deinit video: %d \n" +#define MSGTR_UninitAudio "deinit lyd: %d \n" +#define MSGTR_VDecoderInitFailed "Videodekoder init fejlede :(\n" +#define MSGTR_ADecoderInitFailed "Lyddekoder init fejlede :(\n" +#define MSGTR_ADecoderPreinitFailed "Lyddekoder præinit fejlede :(\n" +#define MSGTR_AllocatingBytesForInputBuffer "dec_audio: Allokerer %d bytes til input buffer\n" +#define MSGTR_AllocatingBytesForOutputBuffer "dec_audio: Allokerer %d + %d = %d bytes til output buffer\n" + // LIRC: #define MSGTR_SettingUpLIRC "Sætter LIRC understøttelse op...\n" #define MSGTR_LIRCdisabled "Du vil ikke være i stand til at bruge din fjernbetjening\n" @@ -241,6 +299,18 @@ #define MSGTR_LIRCsocketerr "Der er noget galt med LIRC socket: %s\n" #define MSGTR_LIRCcfgerr "Kunne ikke læse LIRC konfigurationsfil %s !\n" +// vf.c +#define MSGTR_CouldNotFindVideoFilter "Kunne ikke finde videofilter '%s'\n" +#define MSGTR_CouldNotOpenVideoFilter "Kunne ikke åbne videofilter '%s'\n" +#define MSGTR_OpeningVideoFilter "Åbner videofilter: " +#define MSGTR_CannotFindColorspace "Kunne ikke finde fælles colorspace, selv med 'scale' :(\n" + +// vd.c +#define MSGTR_CodecDidNotSet "VDek: codec satte ikke sh->disp_w og sh->disp_h, prøver en anden løsning!\n" +#define MSGTR_VoConfigRequest "VDek: vo konfig. anmodning - %d x %d (foretrukket csp: %s)\n" +#define MSGTR_CouldNotFindColorspace "Kunne ikke finde colorspace som matcher - prøver med -vop scale...\n" +#define MSGTR_MovieAspectIsSet "Film-Aspect er %.2f:1 - præskalerer for at rette film-aspect.\n" +#define MSGTR_MovieAspectUndefined "Film-Aspect er ikke defineret - ingen præskalering benyttet.\n" // ====================== GUI messages/buttons ======================== @@ -253,13 +323,13 @@ #define MSGTR_OtherSelect "Vælg..." #define MSGTR_AudioFileSelect "Vælg ekstern lydkanal ..." #define MSGTR_FontSelect "Vælg font ..." -#define MSGTR_MessageBox "Meddelelses kasse" +#define MSGTR_MessageBox "Meddelelseskasse" #define MSGTR_PlayList "PlayList" #define MSGTR_Equalizer "Equalizer" #define MSGTR_SkinBrowser "Vælg udseende" -#define MSGTR_Network "Netværksstrømning ..." +#define MSGTR_Network "Netværksstreaming ..." #define MSGTR_Preferences "Instillinger" -#define MSGTR_OSSPreferences "OSS driver konfiguration" +#define MSGTR_OSSPreferences "OSS driverkonfiguration" // --- buttons --- #define MSGTR_Ok "Ok" @@ -273,9 +343,10 @@ // --- error messages --- #define MSGTR_NEMDB "Desværre, ikke nok ram til at vise bufferen." -#define MSGTR_NEMFMR "Desværre, ikke nok ram til menu rendering." -#define MSGTR_NEMFMM "Desværre, ikke nok ram til at vise main window shape mask." +#define MSGTR_NEMFMR "Desværre, ikke nok ram til at vise menuen." +#define MSGTR_NEMFMM "Desværre, ikke nok ram til at vise hovedvindue shape mask." #define MSGTR_IDFGCVD "Desværre, kunne ikke finde gui kompabitel video driver." +#define MSGTR_NEEDLAVCFAME "For at afspille ikke-mpeg filer med dit DXR3/H+ skal du kode filmen igen.\nVenligst aktiver lavc eller fame i DXR3/H+ configboxen." // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "[skin] fejl i skin config filen på linje %d: %s" @@ -291,9 +362,9 @@ #define MSGTR_SKIN_BITMAP_ConvertError "Fejl i 24 bit to 32 bit convertering ( %s )\n" #define MSGTR_SKIN_BITMAP_UnknownMessage "ukendt besked: %s\n" #define MSGTR_SKIN_FONT_NotEnoughtMemory "ikke nok ram\n" -#define MSGTR_SKIN_FONT_TooManyFontsDeclared "for mange fonte specificeret\n" -#define MSGTR_SKIN_FONT_FontFileNotFound "font-filen ikke fundet\n" -#define MSGTR_SKIN_FONT_FontImageNotFound "font-billed ikke fundet\n" +#define MSGTR_SKIN_FONT_TooManyFontsDeclared "for mange skrifttyper specificeret\n" +#define MSGTR_SKIN_FONT_FontFileNotFound "skriftypefilen ikke fundet\n" +#define MSGTR_SKIN_FONT_FontImageNotFound "skrifttypebilled ikke fundet\n" #define MSGTR_SKIN_FONT_NonExistentFontID "ikke eksisterende font ( %s )\n" #define MSGTR_SKIN_UnknownParameter "ukendt parameter ( %s )\n" #define MSGTR_SKINBROWSER_NotEnoughMemory "[skinbrowser] ikke nok ram.\n" @@ -375,7 +446,7 @@ #define MSGTR_PREFERENCES_Audio "Lyd" #define MSGTR_PREFERENCES_VideoEqu "Anvend video equalizer" #define MSGTR_PREFERENCES_DoubleBuffer "Anvend double buffering" -#define MSGTR_PREFERENCES_DirectRender "Anvend direct rendering" +#define MSGTR_PREFERENCES_DirectRender "Anvend 'direct rendering'" #define MSGTR_PREFERENCES_FrameDrop "Anvend billed-skip" #define MSGTR_PREFERENCES_HFrameDrop "Anvend meget billed-skip ( farlig )" #define MSGTR_PREFERENCES_Flip "Flip billede" @@ -400,12 +471,15 @@ #define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:" #define MSGTR_PREFERENCES_FRAME_OSD_Level "OSD level" #define MSGTR_PREFERENCES_FRAME_Subtitle "Undertekst" -#define MSGTR_PREFERENCES_FRAME_Font "Font" +#define MSGTR_PREFERENCES_FRAME_Font "Skriftype" #define MSGTR_PREFERENCES_FRAME_PostProcess "Efterprocesseringsfilter" #define MSGTR_PREFERENCES_FRAME_CodecDemuxer "Codec & demuxer" #define MSGTR_PREFERENCES_OSS_Device "Device:" #define MSGTR_PREFERENCES_OSS_Mixer "Mixer:" #define MSGTR_PREFERENCES_Message "Husk, nogle funktioner kræver at MPlayer bliver genstartet for at de virker." +#define MSGTR_PREFERENCES_DXR3_VENC "Video enkoder:" +#define MSGTR_PREFERENCES_DXR3_LAVC "Brug LAVC (ffmpeg)" +#define MSGTR_PREFERENCES_DXR3_FAME "Brug FAME" // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "fatal fejl ..."

1 0

CVS: main/DOCS mplayer.1,1.207,1.208
by Diego Biurrun CVS 19 Aug '02

19 Aug '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv21742 Modified Files: mplayer.1 Log Message: Sync the man page with the removed sections of the HTML docs. Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- mplayer.1 15 Aug 2002 22:43:27 -0000 1.207 +++ mplayer.1 19 Aug 2002 01:38:59 -0000 1.208 @@ -98,7 +98,8 @@ .TP .B \-alang <two letter\ country\ code> (also see \-aid option) Works only for DVD playback! Selects DVD audio language. It always tries -to play audio streams whose language matches the given code. +to play audio streams whose language matches the given code. For the list of +available languages, use with the \-v switch and look at the output. .I EXAMPLE: \-alang hu,en Plays Hungarian and falls back to @@ -153,7 +154,7 @@ .TP .B \-chapter <chapter\ id>[-<end\ chapter\ id>] Specify which chapter to start playing at. Optionally specify which chapter to -end playing at. Examples can be found below. +end playing at (default: 1). Examples can be found below. .TP .B \-csslib <filename> (old-style DVD option) This option is used to override the default location of libcss.so. @@ -192,7 +193,8 @@ .TP .B \-dvdangle <angle\ id> Some DVD discs contain scenes that can be viewed from multiple angles. -Here you can tell MPlayer which angles to use. Examples can be found below. +Here you can tell MPlayer which angles to use (default: 1). Examples can be +found below. .TP .B \-dvdauth <DVD\ device> (old-style DVD option) Turns on DVD authentication using the given device.

1 0

CVS: main/libmpcodecs vf_scale.c,1.22,1.23
by Michael Niedermayer 19 Aug '02

19 Aug '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv2054 Modified Files: vf_scale.c Log Message: typo fix, patch by (Eric Lammerts <eric at lammerts dot org>) Index: vf_scale.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- vf_scale.c 2 Aug 2002 22:57:58 -0000 1.22 +++ vf_scale.c 18 Aug 2002 22:46:03 -0000 1.23 @@ -121,7 +121,7 @@ if(vf->priv->w<0) vf->priv->w=width; else if(vf->priv->w==0) vf->priv->w=d_width; if(vf->priv->h==-3) vf->priv->h=(vf->priv->w*height/width+1)&~1; else - if(vf->priv->h==-2) vf->priv->h=(vf->priv->w*d_height/d_width+2)&~1; + if(vf->priv->h==-2) vf->priv->h=(vf->priv->w*d_height/d_width+1)&~1; break; default: if(vf->priv->w==-3) vf->priv->w=vf->priv->h*width/height; else

1 0

adv: - Email Blaster Newsletter
by Newsletter 18 Aug '02

18 Aug '02

1 0