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

CVS: main/TOOLS mencvcd,1.7,1.8
by Johannes Feigl 31 May '02

31 May '02

Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var/tmp.root/cvs-serv29479 Modified Files: mencvcd Log Message: v0.1.8, - new option -sync, by Jürgen Hammelmann <juergen.hammelmann(a)gmx.de> Index: mencvcd =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/mencvcd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mencvcd 17 May 2002 05:45:30 -0000 1.7 +++ mencvcd 31 May 2002 21:44:39 -0000 1.8 @@ -1,6 +1,6 @@ #!/bin/sh # -# Version: 0.1.7 +# Version: 0.1.8 # # Licence: GPL # @@ -41,6 +41,8 @@ # 2002/05/15 v0.1.7 # - bugfixes # - more help +# 2002/05/26 v0.1.8 +# - new option "-sync" # ################################################################################ # @@ -78,6 +80,8 @@ echo "-ratio <s> output ratio size of frames, see yuvscaler (1)." echo "-size <X>x<Y> sets output size of frames." echo "-svcdout encode to SVCD format [VCD default]." + echo "-sync <n> set the presentation timestamp offset of video" + echo " stream w.r.t. audio stream (video-audio) in mSec." echo "-vbr <n> output video bitrate in kbs [VCD:1152, SVCD:2500]." echo "-vfr <n> sets the frame-rate of the output-stream. Currently" echo " only the standard MPEG rates are supported." @@ -145,6 +149,7 @@ imaget="-t vcd2" yuvin="" framerate="" +sync="" while [ "$1"x != "x" ]; do case $1 in @@ -210,6 +215,10 @@ -svcdout) norm="SVCD" ;; + -sync) + sync="-O $2" + shift 1 + ;; -vbr) vbr=$2 vbrset=1 @@ -281,7 +290,7 @@ # multiplex streams [ -f $NAME.mpv -a -f $NAME.mpa ] || exit 1 rm -f ${NAME}*.mpg - mplex $mplexnorm $NAME.mpv $NAME.mpa -o ${NAME}%d.mpg + mplex $mplexnorm $sync $NAME.mpv $NAME.mpa -o ${NAME}%d.mpg # create cd images for mpg in ${NAME}*.mpg; do

1 0

CVS: main/drivers mga_vid_test.c,1.3,1.4
by Johannes Feigl 31 May '02

31 May '02

Update of /cvsroot/mplayer/main/drivers In directory mail:/var/tmp.root/cvs-serv27462 Modified Files: mga_vid_test.c Log Message: When compiling mga_vid_test.c, memcpy() is subject to an implicit declaration. The attached patch fixes it. by Tore Anderson <tore(a)linpro.no> Index: mga_vid_test.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/mga_vid_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mga_vid_test.c 23 May 2001 19:51:52 -0000 1.3 +++ mga_vid_test.c 31 May 2002 21:42:15 -0000 1.4 @@ -17,6 +17,7 @@ #include <fcntl.h> #include <sys/mman.h> #include <inttypes.h> +#include <string.h> #include "mga_vid.h" mga_vid_config_t config;

1 0

CVS: main README,1.2,1.3
by Arpi of Ize 31 May '02

31 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv26167 Modified Files: README Log Message: few fixes Index: README =================================================================== RCS file: /cvsroot/mplayer/main/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README 31 May 2002 21:26:28 -0000 1.2 +++ README 31 May 2002 21:39:12 -0000 1.3 @@ -13,10 +13,10 @@ packages installed, for the GUI you also need the GTK development packages. Before you start... -Unless you know what are you doing, consult DOCS/video.html to see which -driver you should get for your video card to have the best quality and video -performance. Most cards require special drivers not included with standard X11, -to drive the 2-D video acceleration features of your card! +Unless you know what are you doing, consult DOCS/video.html to see which driver +to use with your video card to get the best video quality and performance. +Most cards require special drivers not included with standard X11, to drive +the 2-D video acceleration features (YUV, scaling etc) of your card! A quick and incomplete list of recommendations: - ATI cards: get the GATOS drivers for X11/Xv or use vidix @@ -57,8 +57,8 @@ While MPlayer and libavcodec has built-in support for the most common audio and video formats, some others are playable only with the Win32 DLLs or the XAnim binary plugins. Few examples: WMV video, Divx/WMA audio, Indeo. -This step is not mandatory, but recommended for getting MPlayer to play -play more different file types! +This step is not mandatory, but recommended for getting MPlayer to play more +different file types! Grab the win32 codecs package from the download page

1 0

CVS: main README,1.1,1.2
by Arpi of Ize 31 May '02

31 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv20225 Modified Files: README Log Message: quick install guide, based on draft and patches by Diego Biurrun <diego(a)biurrun.de> Index: README =================================================================== RCS file: /cvsroot/mplayer/main/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 7 Dec 2001 17:43:20 -0000 1.1 +++ README 31 May 2002 21:26:28 -0000 1.2 @@ -1 +1,185 @@ -The main documentation file is DOCS/documentation.html + +Welcome to MPlayer, the Unix movie player. MPlayer can play most standard video +formats out of the box and almost all others with the help of external codecs. +MPlayer currently works best from the command line, but there is a GUI with +skin support in the alpha development stage. + +This document is for getting you started in a few minutes. It cannot answer +all of your questions. If you have problems, please read the documentation in +DOCS/documentation.html. It is extensive and should answer most of your +questions. Also read the manpage to learn how to use MPlayer. + +To compile MPlayer with X11 support, you need to have the XFree86 development +packages installed, for the GUI you also need the GTK development packages. + +Before you start... +Unless you know what are you doing, consult DOCS/video.html to see which +driver you should get for your video card to have the best quality and video +performance. Most cards require special drivers not included with standard X11, +to drive the 2-D video acceleration features of your card! + +A quick and incomplete list of recommendations: +- ATI cards: get the GATOS drivers for X11/Xv or use vidix +- Matrox G200/G4x0/G550: compile and use mga_vid for Linux, use vidix for BSD +- 3dfx Voodoo3/Banshee: get XFree86 4.2.0+ for Xv or use the tdfxfb driver +- nVidia cards: get the X11 driver from www.nvidia.com for Xv support +Without having accelerated video, even a 800MHz P3 may be slow to play DVD! + +___________________________________ +STEP1: Installing FFmpeg libavcodec +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you are using an official release, skip this step, since official releases +always include libavcodec. To verify this check if the libavcodec subdirectory +is empty or contains the sources! + +The FFmpeg project provides libavcodec, a very portable MPEG4/DivX codec with +excellent speed and quality. It is the preferred codec of MPlayer for playing +mpeg4 and divx video. You have to get libavcodec directly from the FFmpeg CVS +server. Use the following commands in a suitable directory outside the MPlayer +source directory: + +cvs -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg login +cvs -z9 -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co ffmpeg/libavcodec + +When asked for a password, you can just hit enter. + +Now, replace the empty libavcodec directory with the FFmpeg libavcodec source +by removing the libavcodec subdirectory in the MPlayer source tree and then +copying (symbolic linking does not suffice!) the freshly downloaded FFmpeg +libavcodec directory back into the MPlayer source tree. + + +______________________________ +STEP2: Installing Win32 Codecs +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +While MPlayer and libavcodec has built-in support for the most common audio +and video formats, some others are playable only with the Win32 DLLs +or the XAnim binary plugins. Few examples: WMV video, Divx/WMA audio, Indeo. +This step is not mandatory, but recommended for getting MPlayer to play +play more different file types! + +Grab the win32 codecs package from the download page + + http://www.mplayerhq.hu/homepage/dload.html + +unpack it and put the contents in a directory where MPlayer will find them. +The default directory is /usr/lib/win32/ but you can change that to something +else by using the '--with-win32libdir=DIR' option when you run './configure' . + +__________________________ +STEP3: Configuring MPlayer +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +MPlayer has a lot of options that get selected in this phase. Run + + ./configure + +to configure MPlayer with the default options. The options you installed above +should be autodetected, except GUI support, which has to be enabled separately, +run + + ./configure --enable-gui + +if you want to use the GUI. + +If something does not work as expected, try + + ./configure --help + +to see the available options and select what you need. + +The ./configure script prints a summary of enabled and disabled options. +If you have something installed that ./configure fails to detect, check +the file configure.log for errors and reasons for the failure. Repeat this +step until you are satisfied with the enabled feature set. + +________________________ +STEP4: Compiling MPlayer +~~~~~~~~~~~~~~~~~~~~~~~~ + +Now you can start the compilation by typing + + make + +You can install MPlayer with + + make install + +provided that you have write permission in the installation directory. + +If all went well, you can run MPlayer by typing 'mplayer' +You should get a summary of the most common options and keys (help screen). + +If you get 'unable to load shared library' or similar errors, then run +'ldd ./mplayer' to check which libraries fail and go back to STEP 3 to fix it. +Sometimes just running 'ldconfig' is enough. + +NOTE: If you run Debian you can configure, compile and build a proper deb +package with only one command: + + fakeroot debian/rules binary + +____________________________________________ +STEP5: Installing the onscreen display fonts +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To enable OSD (onscreen status display) and ASCII/TEXT subtitles you need some +fonts. Get them from our homepage: + +http://www.mplayerhq.hu/homepage/dload.html + +Unpack the archive and choose one of the available font sizes. Then copy the +font files of the corresponding size into /usr/local/share/mplayer/font/ +(or whatever you set with './configure --datadir=DIR'). + +____________________________ +STEP6: Installing a GUI skin +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Please remember that the GUI is still in the alpha development stage and not +completely finished yet. Features like playlist, preferences and equalizer +do not work at all. Expect them for the 1.0 release +Basic stuff like file selection and seeking works, though. + +If you want to use the GUI you need to download a skin, since MPlayer does not +come with a skin by default. Choose one from the download page + + http://www.mplayerhq.hu/homepage/dload.html + +unpack it in /usr/local/share/mplayer/Skin/. MPlayer will use the skin in +the default/ subdirectory (/usr/local/share/mplayer/Skin/default/*) unless +told otherwise via the '-skin' switch. You should therefore rename your +skin subdirectory, make a suitable symbolic link or set the skin name in +the file mplayer.conf by 'skin=skinname'. + +__________________ +STEP7: Let's play! +~~~~~~~~~~~~~~~~~~ + +That's it for the moment. To start playing movies, open a command line and try + + mplayer <moviefile> + +or for the GUI: + + gmplayer <moviefile> + (just 'gmplayer' is enough to use the GUI fileselector) + +To play VCD track or DVD title, try: + + mplayer -vcd 2 -cdrom-device /dev/hdc + mplayer -dvd 1 -alang en -slang hu -dvd-device /dev/hdd + +See 'mplayer -help' and 'man mplayer' for further options. + +'mplayer -vo help' will show you the available video output drivers. Experiment +with the '-vo' switch to see which one gives you the best performance! +If you get very jerky playback or no sound, experiment with -ao (see -ao help) +Note that jerky playback is caused by buggy audio drivers or too slow cpu/vga. +With a good audio and video driver combination, one can play DVDs and 720x576 +DivX files smoothly on a Celeron 366. For slower systems, you need -framedrop. + +Questions you may have are probably answered in the rest of the documentation. +The place to start reading is DOCS/faq.html and DOCS/documentation.html.

1 0

Worm Klez.E immunity
by laparo-erfurt 31 May '02

31 May '02

1 0

CVS: main subreader.c,1.61,1.62
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv22085 Modified Files: subreader.c Log Message: possible sig11 fixed in .rt parser (weisskreuzova.zip) Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- subreader.c 27 May 2002 17:20:55 -0000 1.61 +++ subreader.c 30 May 2002 17:44:58 -0000 1.62 @@ -149,6 +149,8 @@ int len=0; char *p=source; +// printf("src=%p dest=%p \n",source,dest); + while ( !eol(*p) && *p!= '|' ) { p++,len++; } @@ -358,11 +360,14 @@ current->end = b1*360000+b2*6000+b3*100+b4/10; p=line; p+=plen;i=0; // TODO: I don't know what kind of convention is here for marking multiline subs, maybe like in xml? - next = strstr(line,"<clear/>")+8;i=0; - while ((next =sub_readtext (next, &(current->text[i])))) { + next = strstr(line,"<clear/>"); + if(next && strlen(next)>8){ + next+=8;i=0; + while ((next =sub_readtext (next, &(current->text[i])))) { if (current->text[i]==ERR) {return ERR;} i++; if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;} + } } current->lines=i+1; }

1 0

CVS: main/DOCS/German codecs.html,1.33,1.34 documentation.html,1.53,1.54 encoding.html,1.15,1.16 faq.html,1.25,1.26 formats.html,1.10,1.11
by Jonas Jermann CVS 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/DOCS/German In directory mail:/var/tmp.root/cvs-serv27629 Modified Files: codecs.html documentation.html encoding.html faq.html formats.html Log Message: corrections, sync Index: codecs.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/codecs.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- codecs.html 9 May 2002 11:25:59 -0000 1.33 +++ codecs.html 30 May 2002 14:45:12 -0000 1.34 @@ -125,7 +125,7 @@ das FFmpeg 0.4.5 nicht mit Mplayer zusammen läuft. Um dies zu erreichen, sollten folgende Schritte vollzogen werden: -<UL> +<OL> <LI><CODE>cvs -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg login</CODE></LI> <LI><CODE>cvs -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co ffmpeg</CODE></LI> <LI>Dass <CODE>libavcodec</CODE> Verzeichnis von den FFmpeg-Sourcen muss ins @@ -135,7 +135,12 @@ Symlinken ist nicht genug, es muss kopiert/bewegt werden!!!</LI> <LI>Es folgt die Kompilierung. Configure sollte allfällige Probleme vor der Kompilierung erkennen.</LI> -</UL> +</OL> + +HINWEIS: MPlayer über CVS enthält ein libavcodec +Unterverzeichnis, dieses enthält jedoch NICHT den Quellcode von libavcodec! +Es muss der obrigen Anleitung gefolgt werden, um den Quellcode für diese +Bibliothek (library) zu erhalten. Der Codec unterstützt auch Postprocessing! Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/documentation.html,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- documentation.html 21 May 2002 18:59:53 -0000 1.53 +++ documentation.html 30 May 2002 14:45:13 -0000 1.54 @@ -49,7 +49,7 @@ <LI><A HREF="formats.html#2.1.1.2">2.1.1.2 AVI Dateien</A></LI> <LI><A HREF="formats.html#2.1.1.3">2.1.1.3 ASF/WMV Dateien</A></LI> <LI><A HREF="formats.html#2.1.1.4">2.1.1.4 QT/MOV Dateien</A></LI> - <LI><A HREF="formats.html#2.1.1.5">2.1.1.5 VIV Dateien</A></LI> + <LI><A HREF="formats.html#2.1.1.5">2.1.1.5 VIVO Dateien</A></LI> <LI><A HREF="formats.html#2.1.1.6">2.1.1.6 FLI Dateien</A></LI> <LI><A HREF="formats.html#2.1.1.7">2.1.1.7 RealMedia Dateien</A></LI> <LI><A HREF="formats.html#2.1.1.8">2.1.1.8 NuppelVideo Dateien</A></LI> Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/encoding.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- encoding.html 21 May 2002 18:59:53 -0000 1.15 +++ encoding.html 30 May 2002 14:45:13 -0000 1.16 @@ -162,14 +162,14 @@ <UL> 2-pass Encodierung: <CODE>rm -f lavc_stats.txt -mencoder -dvd 2 -ovc lavc -lacvopts vcodec=mpeg4:vpass=1 (Audio-Optionen) -o film.avi -mencoder -dvd 2 -ovc lavc -lacvopts vcodec=mpeg4:vpass=2 (Audio-Optionen) -o film.avi</CODE> +mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 (Audio-Optionen) -o film.avi +mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 (Audio-Optionen) -o film.avi</CODE> 3-pass Encodierung: <CODE>rm -f frameno.avi lavc_stats.txt mencoder -dvd 2 -ovc frameno (Audio-Optionen) -o frameno.avi -mencoder -dvd 2 -ovc lavc -lacvopts vcodec=mpeg4:vpass=1 -oac copy -o film.avi -mencoder -dvd 2 -ovc lavc -lacvopts vcodec=mpeg4:vpass=2 -oac copy -o film.avi</CODE> +mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o film.avi +mencoder -dvd 2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o film.avi</CODE> </UL> Index: faq.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/faq.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- faq.html 21 May 2002 18:59:53 -0000 1.25 +++ faq.html 30 May 2002 14:45:13 -0000 1.26 @@ -363,7 +363,9 @@ </TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD> Die Taskbar kann von keinem Fenster überschrieben werden, es sei denn man fügt folgende Zeile zu <CODE>~/.icewm/preferences</CODE> dazu: -<CODE>TaskBarKeepBelow=1</CODE> +<CODE>TaskBarKeepBelow=1</CODE> +Alternativ kann man folgende Zeile der Datei <CODE>~/.icewm/winoptions</CODE> beifügen: +<CODE>MPlayer.layer: Menu</CODE> </TD><TR><TD COLSPAN=3> </TD><TR> <TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%> Index: formats.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/German/formats.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- formats.html 9 May 2002 11:25:59 -0000 1.10 +++ formats.html 30 May 2002 14:45:13 -0000 1.11 @@ -79,13 +79,16 @@ M$ versucht zur Zeit von der Verwendung stark abzuraten und propergiert ASF/WMV. Aber keiner achtet darauf. -Es gibt einen Hack für AVI-Dateien, der diese erweitert, so dass sie Ogg Vorbis - Audio Streams enthalten können, sie aber auch inkompatibel mit Standard AVI macht. - MPlayer unterstützt die Wiedergabe solcher Dateien, eine Suchfunktion ist jedoch - momentan noch nicht implementiert. - -HINWEIS: DV-Kameras können 2 Arten von AVI-Formaten erzeugen, eines ist -normal und abspielbar das andere weder normal noch abspielbar. +Es gibt einen Hack, der es AVI-Dateien erlaubt Ogg Vorbis Audio Streams zu enthalten, + sie aber auch inkompatibel mit Standard AVI macht. MPlayer unterstützt die Wiedergabe + solcher Dateien. Eine Suchfunktion ist auch implementiert, wird jedoch stark gestört bei + schlecht konvertierten Dateien mit verwirrenden Headers. Leider hat auch der einzige + Encodierer, der fähig ist solche Dateien zu erzeugen (nansub), dieses Problem. + +HINWEIS: DV-Kameras können raw DV-Streams erzeugen, welche von DV-Tools in zwei +unterschiedliche Typen von AVI-Dateien konvertiert werden. Die AVI-Datei enthält dabei +entweder separate Audio- und Video-Streams, die Mplayer wiedergeben kann, oder +den raw DV-Stream. An dessen Unterstützung wird gerade gearbeitet. Es gibt 2 Arten von AVI-Dateien: <UL> @@ -144,7 +147,7 @@ nicht enthüllt und werden wahrscheinlich auch in Zukunft so bleiben, was Apple's QuickTime Player zum einzigen Player macht, der fähig ist, diese Dateien abzuspielen (aber nur auf Win/Mac). -<A NAME=2.1.1.5>2.1.1.5. VIV Dateien</A> +<A NAME=2.1.1.5>2.1.1.5. VIVO Dateien</A> MPlayer demuxt nun auch fröhlich VIVO-Dateiformate. Der grösste Nachteil des Formates ist das es keinen Index-Block besitzt, auch keine fixe Paketgröße oder Sync-Bytes.

1 0

CVS: main Makefile,1.189,1.190 configure,1.486,1.487
by pl 30 May '02

30 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv10383 Modified Files: Makefile configure Log Message: avoids stripping the binary at install if debugging or profiling is enabled (original patch by Balazs Tibor <tibcu(a)sch.bme.hu> - edited for simplicity) Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- Makefile 28 May 2002 01:52:32 -0000 1.189 +++ Makefile 30 May 2002 14:26:35 -0000 1.190 @@ -11,6 +11,12 @@ PRG_CFG = codec-cfg PRG_MENCODER = mencoder +# Do not strip the binaries at installation +ifeq ($(STRIPBINARIES),yes) +INSTALLSTRIP = -s +endif + + # these subdirectories required installation due binaries within them ifeq ($(VIDIX),yes) SUBDIRS += libdha vidix @@ -221,14 +227,14 @@ $(DO_MAKE) endif if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi - $(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG) + $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) ifeq ($(GUI),yes) -ln -sf $(PRG) $(BINDIR)/gmplayer endif if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi $(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1 ifeq ($(MENCODER),yes) - $(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) + $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) -ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1 endif @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi @@ -249,7 +255,7 @@ ifeq ($(DVDKIT),yes) ifeq ($(DVDKIT_SHARED),yes) if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi - $(INSTALL) -m 755 -s libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so + $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so endif endif ifeq ($(CSS_USE),yes) @@ -257,7 +263,7 @@ @echo "however it means you can't use fibmap_mplayer." @echo "Without this (or without running mplayer as root) you won't be" @echo "able to play encrypted DVDs." - -$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) + -$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) endif uninstall: Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.486 retrieving revision 1.487 diff -u -r1.486 -r1.487 --- configure 30 May 2002 11:42:55 -0000 1.486 +++ configure 30 May 2002 14:26:35 -0000 1.487 @@ -3639,8 +3639,10 @@ ############################################################################# # Checking for CFLAGS +_stripbinaries=yes if test "$_profile" || test "$_debug" ; then CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile" + _stripbinaries=no elif test -z "$CFLAGS" ; then if test "$host_arch" != "mips" ; then CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer" @@ -3650,6 +3652,7 @@ # always compile with '-g' if .developer: if test -f ".developer" ; then CFLAGS="-g $CFLAGS" + _stripbinaries=no fi else cat <<EOF @@ -3796,6 +3799,7 @@ OPTFLAGS = $CFLAGS EXTRA_INC = $_inc_extra $_inc_gtk WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\" +STRIPBINARIES = $_stripbinaries STREAMING = $_streaming STREAMING_LIB = $_ld_streaming

1 0

CVS: main/libvo vo_mpegpes.c,1.31,1.32
by pl 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv12984 Modified Files: vo_mpegpes.c Log Message: warning fix (write()/close() require unistd.h) Index: vo_mpegpes.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- vo_mpegpes.c 28 Apr 2002 02:24:05 -0000 1.31 +++ vo_mpegpes.c 30 May 2002 11:59:24 -0000 1.32 @@ -15,6 +15,7 @@ * */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -22,8 +23,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <unistd.h> -#include "config.h" #include "mp_msg.h" #ifdef HAVE_DVB @@ -33,7 +34,6 @@ #include <sys/ioctl.h> #include <stdio.h> #include <time.h> -#include <unistd.h> #include <ost/dmx.h> #include <ost/frontend.h>

1 0

CVS: main/libmpcodecs/native nuppelvideo.c,1.7,1.8
by pl 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libmpcodecs/native In directory mail:/var/tmp.root/cvs-serv10819 Modified Files: nuppelvideo.c Log Message: warning fix (strings.h > string.h) Index: nuppelvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/native/nuppelvideo.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nuppelvideo.c 20 May 2002 00:06:29 -0000 1.7 +++ nuppelvideo.c 30 May 2002 11:56:59 -0000 1.8 @@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <strings.h> +#include <string.h> #include "config.h" #include "mp_msg.h"

1 0