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

CVS: main/input input.c,1.30,1.31
by Alban Bedel CVS 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/input In directory mail:/var/tmp.root/cvs-serv30223/input Modified Files: input.c Log Message: Added -input js-dev xx option to specifies the joystick device to use. Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- input.c 12 Apr 2002 10:17:24 -0000 1.30 +++ input.c 20 Apr 2002 08:51:09 -0000 1.31 @@ -292,6 +292,8 @@ static int use_joystick = 1, use_lirc = 1; static char* config_file = "input.conf"; +static char* js_dev = NULL; + static int mp_input_print_key_list(config_t* cfg); static int mp_input_print_cmd_list(config_t* cfg); @@ -302,6 +304,7 @@ { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL }, { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL }, { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL }, + { "js-dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, { NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -1235,7 +1238,7 @@ #ifdef HAVE_JOYSTICK if(use_joystick) { - int fd = mp_input_joystick_init(NULL); + int fd = mp_input_joystick_init(js_dev); if(fd < 0) mp_msg(MSGT_INPUT,MSGL_ERR,"Can't init input joystick\n"); else

1 0

CVS: main/DOCS/Hungarian documentation.html,1.129,1.130 encoding.html,1.26,1.27 sound.html,1.27,1.28
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv8133/Hungarian Modified Files: documentation.html encoding.html sound.html Log Message: more deciliters Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- documentation.html 20 Apr 2002 06:39:50 -0000 1.129 +++ documentation.html 20 Apr 2002 07:02:36 -0000 1.130 @@ -155,6 +155,7 @@ <LI><A HREF="sound.html#2.3.2.2.5">2.3.2.2.5 Szoftveres hangerõszabályzás</A></LI> <LI><A HREF="sound.html#2.3.2.2.6">2.3.2.2.6 Extrastereo</A></LI> <LI><A HREF="sound.html#2.3.2.2.7">2.3.2.2.7 Volume Normalizer</A></LI> + <LI><A HREF="sound.html#2.3.2.2.8">2.3.2.2.8 Surround</A></LI> </UL> </UL> </UL> @@ -425,9 +426,11 @@ <LI>Win32 codecek : ha az MPlayer-t x86-os gépen fogod használni, valószínûleg használni akarod õket. Töltsd le és tömörítsd ki a - w32codecs.zip-et az /usr/lib/win32 könyvtárba . Megj.: az avifile project - hasonló csomagot használ, de különbözik a miénktõl, ígyhát ezt használd! A mi - csomagunk egyébként használható az avifile-vel. + w32codecs.zip-et az /usr/lib/win32 könyvtárba MIELÕTT még az + MPlayer-t lefordítanád, különben nem lesz Win32 támogatás + befordítva. + Megj.: az avifile project hasonló csomagot használ, de különbözik a miénktõl, + ígyhát ezt használd! A mi csomagunk egyébként használható az avifile-vel. <UL> <LI>Ha valamilyen hardveres tömörítõ eszközzel, digitális kamerával (pl. DV, ATI VCR, MJPEG) felvett filmeket is le akarsz játszani, akkor muszáj Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/encoding.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- encoding.html 20 Apr 2002 06:40:48 -0000 1.26 +++ encoding.html 20 Apr 2002 07:02:36 -0000 1.27 @@ -75,8 +75,9 @@ <LI>opcionálisan külsõ audio stream használata</LI> <LI>1, 2 vagy 3 menetes DivX4 video</LI> <LI>VBR MP3 audio - FONTOS : a VBR-es mp3-ak nem minden - körülmények között lejátszhatóak windows rendszereken! Ha windows-on - (is) lejátszandó AVI-t akarsz létrehozni, csinálj CBR-es mp3-at!</LI> + körülmények között lejátszhatóak windows rendszereken! Viszont a + MEncoderrel által létrehozott CBR AVI-k teljesen lejátszhatatlanok + Win32 lejátszókkal :)</LI> <LI>PCM audio</LI> <LI>stream másolás</LI> <LI>bemeneti file A/V szinkronizálása (PTS-alapú, az -mc 0 opcióval @@ -431,6 +432,8 @@   cbr - CBR-es MP3 kiválasztása (az alapértelmezett a VBR)   br=XXX - bitráta megadása kbit-ben <0-1024> (csak CBR-nél!)   q=XXXX - minõség (0-legjobb, 9-leggyorsabb) (csak VBR-nél!) +   vbr=XXXX - VBR alüzemmód (3-ABR, ennek van a legjobb + sebesség/minõség mutatója) (csak VBR-nél!) </TD> </TR> </TABLE> Index: sound.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/sound.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sound.html 17 Mar 2002 09:41:26 -0000 1.27 +++ sound.html 20 Apr 2002 07:02:36 -0000 1.28 @@ -269,6 +269,10 @@ Használat :   <CODE>mplayer media.avi -aop list=volnorm</CODE> +<A NAME=2.3.2.2.8>2.3.2.2.8. Surround</A> + +Valaki írjon ide értelmeset. + </BODY> </HTML>

1 0

CVS: main/DOCS documentation.html,1.221,1.222 encoding.html,1.36,1.37 sound.html,1.32,1.33
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv8133 Modified Files: documentation.html encoding.html sound.html Log Message: more deciliters Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- documentation.html 20 Apr 2002 06:39:49 -0000 1.221 +++ documentation.html 20 Apr 2002 07:02:35 -0000 1.222 @@ -155,6 +155,7 @@ <LI><A HREF="sound.html#2.3.2.2.5">2.3.2.2.5 Software volume control</A></LI> <LI><A HREF="sound.html#2.3.2.2.6">2.3.2.2.6 Extrastereo</A></LI> <LI><A HREF="sound.html#2.3.2.2.7">2.3.2.2.7 Volume Normalizer</A></LI> + <LI><A HREF="sound.html#2.3.2.2.8">2.3.2.2.8 Surround</A></LI> </UL> </UL> </UL> @@ -426,7 +427,9 @@ <LI>Win32 codecs : If you plan to use MPlayer on x86 architecture, you will possibly need them. Download and unzip w32codecs.zip to -/usr/lib/win32 . Note: the avifile project has similar codecs package, but it +/usr/lib/win32 BEFORE compiling MPlayer, otherwise no Win32 +support will be compiled! +Note: the avifile project has similar codecs package, but it differs from ours, so if you want to use all supported codecs, then use our package! However, you can use our codecs package with avifile. Features: <UL> @@ -1913,7 +1916,6 @@ <LI>vo_png.c - Atmos <LI>vo_sdl.c - Atmos <LI>vo_svga.c - se7en - <LI>vo_syncfb.c - OBSOLETED, use mga <LI>vo_vesa.c - Nick Kurshev <LI>vo_x11.c - Pontscho <LI>vo_xmga.c - Pontscho Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- encoding.html 20 Apr 2002 06:40:47 -0000 1.36 +++ encoding.html 20 Apr 2002 07:02:35 -0000 1.37 @@ -71,8 +71,8 @@ <LI>creating files from external audio stream</LI> <LI>1, 2 or 3 pass DivX4 video</LI> <LI>VBR MP3 audio - IMPORTANT NOTE : VBR MP3 audio doesn't - always play nicely on windows players! If you intend to encode AVIs - mainly for windows, encode with CBR!</LI> + always play nicely on windows players! On the other hand, currently + MEncoder's CBR encoding is totally broken on win32 players :)</LI> <LI>PCM audio</LI> <LI>stream copying</LI> <LI>input A/V synchronizing (PTS-based, can be disabled with -mc 0 option)</LI> @@ -431,6 +431,7 @@   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> </TABLE> Index: sound.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/sound.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sound.html 15 Mar 2002 23:53:58 -0000 1.32 +++ sound.html 20 Apr 2002 07:02:35 -0000 1.33 @@ -282,5 +282,10 @@ Usage :   <CODE>mplayer media.avi -aop list=volnorm</CODE> + +<A NAME=2.3.2.2.8>2.3.2.2.8. Surround</A> + +Someone should document something, sometime. + </BODY> </HTML>

1 0

CVS: main/DOCS/Hungarian encoding.html,1.25,1.26
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv1433/Hungarian Modified Files: encoding.html Log Message: updates Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/encoding.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- encoding.html 28 Mar 2002 17:30:46 -0000 1.25 +++ encoding.html 20 Apr 2002 06:40:48 -0000 1.26 @@ -83,7 +83,10 @@ kikapcsolható)</LI> <LI>FPS javítás az <CODE>-ofps</CODE> opcióval (hasznos ha 29.97fps-es VOB-ot kódolsz 24fps-es AVI-ba)</LI> - <LI>kép átméretezése</LI> + <LI>a video filter réteg használata (crop, expand, flip, postprocess, + rotate, scale, RGB/YUV konverzió)</LI> + <LI>a kimeneti file-ba bele tudja kódolni mind a DVD/VOBsub, mind a + szöveges feliratokat</LI> </UL>

1 0

CVS: main/DOCS encoding.html,1.35,1.36 mencoder.1,1.35,1.36 mplayer.1,1.159,1.160
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv1433 Modified Files: encoding.html mencoder.1 mplayer.1 Log Message: updates Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- encoding.html 28 Mar 2002 17:30:37 -0000 1.35 +++ encoding.html 20 Apr 2002 06:40:47 -0000 1.36 @@ -78,7 +78,9 @@ <LI>input A/V synchronizing (PTS-based, can be disabled with -mc 0 option)</LI> <LI>FPS correction with <CODE>-ofps</CODE> option (useful when encoding 29.97fps VOB to 24fps AVI)</LI> - <LI>movie rescaling</LI> + <LI>using our very powerful plugin system (crop, expand, flip, postprocess, + rotate, scale, rgb/yuv conversion)</LI> + <LI>can encode DVD/VOBsub AND text subtitles into the output file</LI> </UL> Index: mencoder.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mencoder.1,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mencoder.1 20 Mar 2002 21:23:59 -0000 1.35 +++ mencoder.1 20 Apr 2002 06:40:47 -0000 1.36 @@ -43,6 +43,7 @@ .RB [ \-ss\ <time> ] .RB [ \-endpos\ <time> ] .RB [ \-audiofile\ <file\ name> ] +.RB [ \-sub\ <subtitle\ file\ name> ] .I - or file or files specified with escaped wildcard or device .PP .SH DESCRIPTION @@ -276,6 +277,10 @@ -ss 01:10:00 seeks to 1 hour 10 min Can start only from keyframes ! +.TP +.B \-sub <subtitle file name> +given VOBsub/text subtitle will be encoded INTO the output file. Text +subtitles need fonts properly installed. .TP .B \-endpos <time> stop encoding at given time. Can be specified in many was : Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- mplayer.1 19 Apr 2002 01:08:00 -0000 1.159 +++ mplayer.1 20 Apr 2002 06:40:47 -0000 1.160 @@ -636,7 +636,7 @@ Select video channel [MPG: 0\-15 ASF: 0\-255 ] .TP .B \-vop <filter> -Activate video filters (see documentation at DOCS/tech/vop.txt !). +Activate video filters (see documentation!). .TP .B \-vsync Enables VBI for vesa

1 0

CVS: main/DOCS/Hungarian documentation.html,1.128,1.129
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv1101/Hungarian Modified Files: documentation.html Log Message: RTFMed tech/vop.txt, added more info Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- documentation.html 20 Apr 2002 06:24:59 -0000 1.128 +++ documentation.html 20 Apr 2002 06:39:50 -0000 1.129 @@ -1061,7 +1061,15 @@ <A NAME=2.6.9>2.6.9. RGB2BGR -Vmi.. +Leírás: + +RGB 24/32 <-> BGR 24/32 képformátum konverziót végez (alapértelmezés), + vagy RGB 24/32 <-> RGB 24/32 konverziót az R és B megcserélésével ('swap' + opció) + +Használat: + +<CODE>  -vop rgb2bgr[=swap]</CODE> <A NAME=2.6.10>2.6.10. Rotate @@ -1096,7 +1104,13 @@ <A NAME=2.6.13>2.6.13. YUY2 -Biztos +Leírás: + +YV12/I420 --> YUY2 konverzió kényszerítése. + +Használat: + +<CODE>  -vop yuy2</CODE> <A NAME=3>3. Használat</A>

1 0

CVS: main/DOCS documentation.html,1.220,1.221
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv1101 Modified Files: documentation.html Log Message: RTFMed tech/vop.txt, added more info Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- documentation.html 20 Apr 2002 06:25:49 -0000 1.220 +++ documentation.html 20 Apr 2002 06:39:49 -0000 1.221 @@ -1031,7 +1031,15 @@ <A NAME=2.6.9>2.6.9. RGB2BGR -Anything.. +Description: + +Performs RGB 24/32 <-> BGR 24/32 colorspace conversion (default behaviour) + or RGB 24/32 <-> RGB 24/32 conversion with R<->B swapping (with the 'swap' + option) + +Usage: + +<CODE>  -vop rgb2bgr[=swap]</CODE> <A NAME=2.6.10>2.6.10. Rotate @@ -1064,7 +1072,13 @@ <A NAME=2.6.13>2.6.13. YUY2 -Biztos +Description: + +Forced software YV12/I420 to YUY2 conversion. + +Usage: + +<CODE>  -vop yuy2</CODE> <A NAME=3>3. Usage</A>

1 0

CVS: main/DOCS documentation.html,1.218,1.219
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv28406 Modified Files: documentation.html Log Message: tájpó Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- documentation.html 20 Apr 2002 05:58:21 -0000 1.218 +++ documentation.html 20 Apr 2002 06:10:04 -0000 1.219 @@ -950,7 +950,7 @@ This sets up a filter pipeline (you can use any number of filters). Their parameters are optional and if omitted, some of them are set to default - values, like x and y are both set to 0, and w and y will be + values, like x and y are both set to 0, and w and h will be set to the movie's width and height. Filters are queued starting from libvo, so <CODE>filter1</CODE> will be the

1 0

CVS: main/DOCS/Hungarian video.html,1.55,1.56
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv31561/Hungarian Modified Files: video.html Log Message: I2C is also needed for G400 tvout Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/video.html,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- video.html 28 Mar 2002 17:30:46 -0000 1.55 +++ video.html 20 Apr 2002 04:16:24 -0000 1.56 @@ -948,7 +948,8 @@ <LI>Framebuffer: a 2.4-es kernelek matroxfb moduljait használva. A 2.2-es kernelekben nincs TV kimenet, így használhatatlanok ilyen célra. Kernelfordításnál kapcsolj be MINDEN matroxfb-vel kapcsolatos - dolgot (MultiHead-et ne), és fordítsd õket modulba ! + dolgot (MultiHead-et ne), és fordítsd õket modulba! Szükséges + továbbá bekapcsolni a kernelben az I2C-t. <UL> <LI> Menj a <CODE>TVout/matroxset</CODE> könyvtárba, és írd be: <CODE>make</CODE>.

1 0

CVS: main/DOCS video.html,1.74,1.75
by Winner of tha face compo 20 Apr '02

20 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv31561 Modified Files: video.html Log Message: I2C is also needed for G400 tvout Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/video.html,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- video.html 28 Mar 2002 17:30:37 -0000 1.74 +++ video.html 20 Apr 2002 04:16:23 -0000 1.75 @@ -989,7 +989,8 @@ <LI>Framebuffer: using the matroxfb modules in the 2.4 kernels. 2.2 kernels don't have the TVout feature in them, thus unusable for this. You have to enable ALL matroxfb-specific feature during compilation (except - MultiHead), and compile them into modules! + MultiHead), and compile them into modules! You'll also need I2C + enabled. <UL> <LI> Enter <CODE>TVout/matroxset</CODE> and type <CODE>make</CODE>. Install

1 0