diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 | |
parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz |
Merge svn changes up to r27514
-rw-r--r-- | Changelog | 6 | ||||
-rw-r--r-- | Copyright | 6 | ||||
-rw-r--r-- | DOCS/man/en/mplayer.1 | 15 | ||||
-rw-r--r-- | DOCS/man/fr/mplayer.1 | 18 | ||||
-rw-r--r-- | DOCS/man/it/mplayer.1 | 25 | ||||
-rw-r--r-- | Makefile | 29 | ||||
-rw-r--r-- | TOOLS/netstream.c | 2 | ||||
-rw-r--r-- | command.c | 1 | ||||
-rwxr-xr-x | configure | 118 | ||||
-rw-r--r-- | cpudetect.c | 2 | ||||
-rw-r--r-- | etc/codecs.conf | 61 | ||||
-rw-r--r-- | gui/mplayer/gtk/mb.c | 4 | ||||
-rw-r--r-- | gui/mplayer/gtk/menu.c | 76 | ||||
-rw-r--r-- | gui/win32/playlist.c | 1 | ||||
-rw-r--r-- | help/help_mp-it.h | 86 | ||||
-rw-r--r-- | liba52/bitstream.h | 12 | ||||
-rw-r--r-- | liba52/downmix.c | 33 | ||||
-rw-r--r-- | liba52/liba52_changes.diff | 49 | ||||
-rw-r--r-- | libao2/ao_mpegpes.c | 20 | ||||
-rw-r--r-- | libao2/ao_nas.c | 50 | ||||
-rw-r--r-- | libao2/ao_oss.c | 2 | ||||
-rw-r--r-- | libdvdcss/common.h | 2 | ||||
-rw-r--r-- | libdvdcss/css.c | 7 | ||||
-rw-r--r-- | libdvdcss/css.h | 2 | ||||
-rw-r--r-- | libdvdcss/csstables.h | 2 | ||||
-rw-r--r-- | libdvdcss/device.c | 4 | ||||
-rw-r--r-- | libdvdcss/device.h | 6 | ||||
-rw-r--r-- | libdvdcss/dvdcss/dvdcss.h | 8 | ||||
-rw-r--r-- | libdvdcss/error.c | 2 | ||||
-rw-r--r-- | libdvdcss/ioctl.c | 6 | ||||
-rw-r--r-- | libdvdcss/ioctl.h | 2 | ||||
-rw-r--r-- | libdvdcss/libdvdcss.c | 32 | ||||
-rw-r--r-- | libdvdcss/libdvdcss.h | 4 | ||||
-rw-r--r-- | libdvdread/bswap.h (renamed from dvdread/bswap.h) | 0 | ||||
-rw-r--r-- | libdvdread/cmd_print.c (renamed from dvdread/cmd_print.c) | 0 | ||||
-rw-r--r-- | libdvdread/cmd_print.h (renamed from dvdread/cmd_print.h) | 2 | ||||
-rw-r--r-- | libdvdread/dvd_input.c (renamed from dvdread/dvd_input.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_input.h (renamed from dvdread/dvd_input.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_reader.c (renamed from dvdread/dvd_reader.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_reader.h (renamed from dvdread/dvd_reader.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_udf.c (renamed from dvdread/dvd_udf.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_udf.h (renamed from dvdread/dvd_udf.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvdread_internal.h (renamed from dvdread/dvdread_internal.h) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_print.c (renamed from dvdread/ifo_print.c) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_print.h (renamed from dvdread/ifo_print.h) | 4 | ||||
-rw-r--r-- | libdvdread/ifo_read.c (renamed from dvdread/ifo_read.c) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_read.h (renamed from dvdread/ifo_read.h) | 4 | ||||
-rw-r--r-- | libdvdread/ifo_types.h (renamed from dvdread/ifo_types.h) | 2 | ||||
-rw-r--r-- | libdvdread/libdvdread_changes.diff (renamed from dvdread/libdvdread_changes.diff) | 0 | ||||
-rw-r--r-- | libdvdread/md5.c (renamed from dvdread/md5.c) | 0 | ||||
-rw-r--r-- | libdvdread/md5.h (renamed from dvdread/md5.h) | 0 | ||||
-rw-r--r-- | libdvdread/nav_print.c (renamed from dvdread/nav_print.c) | 0 | ||||
-rw-r--r-- | libdvdread/nav_print.h (renamed from dvdread/nav_print.h) | 2 | ||||
-rw-r--r-- | libdvdread/nav_read.c (renamed from dvdread/nav_read.c) | 0 | ||||
-rw-r--r-- | libdvdread/nav_read.h (renamed from dvdread/nav_read.h) | 2 | ||||
-rw-r--r-- | libdvdread/nav_types.h (renamed from dvdread/nav_types.h) | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_qtvideo.c | 6 | ||||
-rw-r--r-- | libmpdemux/asf.h | 14 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 16 | ||||
-rw-r--r-- | libmpdemux/extension.c | 1 | ||||
-rw-r--r-- | libmpdemux/mp_taglists.c | 7 | ||||
-rw-r--r-- | libmpdemux/video.c | 1 | ||||
-rw-r--r-- | libswscale/rgb2rgb.h | 6 | ||||
-rw-r--r-- | libswscale/swscale.c | 5 | ||||
-rw-r--r-- | libswscale/swscale.h | 13 | ||||
-rw-r--r-- | libswscale/swscale_internal.h | 6 | ||||
-rw-r--r-- | libvo/vo_bl.c | 9 | ||||
-rw-r--r-- | libvo/vo_fbdev.c | 2 | ||||
-rw-r--r-- | libvo/vo_mpegpes.c | 18 | ||||
-rw-r--r-- | loader/win32.c | 13 | ||||
-rw-r--r-- | stream/asf_mmst_streaming.c | 4 | ||||
-rw-r--r-- | stream/asf_streaming.c | 4 | ||||
-rw-r--r-- | stream/dvb_tune.c | 2 | ||||
-rw-r--r-- | stream/http.c | 3 | ||||
-rw-r--r-- | stream/librtsp/rtsp.c | 4 | ||||
-rw-r--r-- | stream/librtsp/rtsp_rtp.c | 14 | ||||
-rw-r--r-- | stream/librtsp/rtsp_session.c | 16 | ||||
-rw-r--r-- | stream/netstream.h | 2 | ||||
-rw-r--r-- | stream/network.c | 4 | ||||
-rw-r--r-- | stream/network.h | 6 | ||||
-rw-r--r-- | stream/pnm.c | 7 | ||||
-rw-r--r-- | stream/realrtsp/real.c | 2 | ||||
-rw-r--r-- | stream/realrtsp/real.h | 2 | ||||
-rw-r--r-- | stream/realrtsp/rmff.h | 2 | ||||
-rw-r--r-- | stream/realrtsp/sdpplin.c | 2 | ||||
-rw-r--r-- | stream/realrtsp/sdpplin.h | 2 | ||||
-rw-r--r-- | stream/rtp.c | 4 | ||||
-rw-r--r-- | stream/stream.c | 10 | ||||
-rw-r--r-- | stream/stream_cddb.c | 2 | ||||
-rw-r--r-- | stream/stream_dvb.c | 2 | ||||
-rw-r--r-- | stream/stream_dvd.c | 3 | ||||
-rw-r--r-- | stream/stream_dvd.h | 16 | ||||
-rw-r--r-- | stream/stream_dvd_common.c | 4 | ||||
-rw-r--r-- | stream/stream_dvd_common.h | 4 | ||||
-rw-r--r-- | stream/stream_ftp.c | 4 | ||||
-rw-r--r-- | stream/stream_netstream.c | 8 | ||||
-rw-r--r-- | stream/stream_pvr.c | 2 | ||||
-rw-r--r-- | stream/stream_rtsp.c | 4 | ||||
-rw-r--r-- | stream/tcp.c | 20 | ||||
-rw-r--r-- | stream/tvi_v4l2.c | 1 | ||||
-rw-r--r-- | stream/udp.c | 20 | ||||
-rw-r--r-- | vobsub.c | 4 |
103 files changed, 494 insertions, 521 deletions
@@ -28,7 +28,7 @@ MPlayer (1.0) * support MOV subtitle format * support for attachments in lavf demuxer * support for chapters in lavf demuxer - * Flac speedup in lavf demuxer + * FLAC speedup in lavf demuxer Filters: * vf_ow new overcomplete wavelet denoiser @@ -56,7 +56,6 @@ MPlayer (1.0) libmpeg2: * enable Alpha/ARM optimizations in libmpeg2 * SSE2-optimized IDCT routines from upstream libmpeg2 - * synced with upstream Drivers: * replace PolypAudio by PulseAudio (-ao pulse) @@ -82,6 +81,7 @@ MPlayer (1.0) * support for DOS-style file:///x:/path paths * some new slave commands (check DOCS/tech/slave.txt) * misc fixes to libass + * libdvdcss updated to 1.2.10, now same as upstream version Ports: * small crash with vo_macosx fixed @@ -89,7 +89,7 @@ MPlayer (1.0) * fix frozen OSD on Mac OS X * vo_gl now works with -wid and nVidia drivers on Windows (this is a hack) * VIDIX on SuperH. - * intentionally break gcc 3.3 on mac os x, please use 4.x + * workarounds for AltiVec on Apple gcc 3.3 on Mac OS X dropped rc2try2: @@ -42,16 +42,16 @@ Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> License: GNU General Public License Name: libdvdcss -Version: Subversion r208 (post 1.2.9 release) +Version: 1.2.10 Homepage: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss -Copyright: 1998-2006 VideoLAN +Copyright: 1998-2008 VideoLAN License: GNU General Public License Name: libdvdread Version: 0.9.7 + patches Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml -Directory: dvdread +Directory: libdvdread Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com> 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs <vektor@dumbterm.net>, diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 7e06545b80..7396616252 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7629,6 +7629,21 @@ Read the source for full details. .PD 1 . .TP +.B o=<key>=<value>[,<key>=<value>[,...]] +Pass AVOptions to libavcodec +Note, a patch to make the o= unneeded and pass all unknown options through +the AVOption system is welcome. +.sp 1 +.RS +.I EXAMPLE: +.RE +.RSs +.PD 0 +.IPs o=bt=100k +.PD 1 +.RE +. +.TP .B acodec=<value> audio codec (default: mp2) .PD 0 diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 9fd199e428..e5d3487023 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r27407 +.\" synced with r27466 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -8045,6 +8045,22 @@ Pour avoir tous les détails lisez le source. .PD 1 . .TP +.B o=<key>=<value>[,<key>=<value>[,...]] +Passe les à libavcodec les AVOptions. +Notez que la création d'une rustine pour que cette option ne soit pas +nécessaire, mais qu'à la place, toutes les options inconnues soient passées +au système AVOption est la bienvenue. +.sp 1 +.RS +.I EXEMPLE\ : +.RE +.RSs +.PD 0 +.IPs o=bt=100k +.PD 1 +.RE +. +.TP .B acodec=<value> codec audio (par défaut\ : mp2) .PD 0 diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1 index edfefe7d9e..f22aa15445 100644 --- a/DOCS/man/it/mplayer.1 +++ b/DOCS/man/it/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r27348 +.\" synced with r27454 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" Questa pagina di manuale è stata fatta da Gabucino, Diego Biurrun, @@ -3618,8 +3618,9 @@ Driver di uscita video molto veloce su schede che lo supportano. .RSs .IPs <sottodispositivo> Seleziona in modo esplicito il sotto dispositivo VIDIX da usare. -I driver disponibili sono cyberblade, mach64, -mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, sis e unichrome. +I driver disponibili sono cyberblade, ivtv, mach64, +mga_crtc2, mga, nvidia, pm2, pm3, radeon, rage128, s3, sh_veu, +sis_vid e unichrome. .RE .PD 1 . @@ -4113,6 +4114,10 @@ Seleziona esplicitamente il nome del dispositivo fbdev da usare .PD 1 . .TP +.B wii (solo Linux) +Driver di uscita video specifico per Nintendo Wii/GameCube. +. +.TP .B 3dfx (solo Linux) Driver di uscita video specifico per 3dfx che utilizza direttamente l'hardware della scheda sopra a X11. @@ -8585,26 +8590,16 @@ Sfocatura gaussiana di quantizzazione (default: 0.5), valori più grandi medieranno la quantizzazione maggiormente nel tempo (cambiamenti più lenti). . .TP -.B vqcomp=<valore> +.B vqcomp=<0.0\-1.0> Compressione della quantizzazione, vrc_eq dipende da questo (default: 0.5). -Per esempio, supponendo che sia utilizzata l'equazione di default del rate control, -se si utilizza vqcomp=1.0 il controllo della dimensione del file alloca per ogni -fotogramma la quantità di bit necessari a codificarlo con lo stesso QP. -Se vqcomp=0.0 il controllo della dimensione del file alloca lo stesso numero di bit -per ogni fotogramma, cioè CBR preciso. .I NOTA: -Questi sono impostazioni estreme e non dovrebbero mai essere usate. -La miglior qualità percepita sarà ottimale tra questi due valori. +La qualità percepita sarà ottimale per valori compresi nella gamma. . .TP .B vrc_eq=<equazione> equazione principale per il controllo della dimensione del file (ratecontrol) .RE .RSs -.IPs "1\ \ \ \ " -bitrate costante -.IPs "tex\ \ " -qualità costante .IPs 1+(tex/\:avgTex-1)*qComp approssimativamente l'equazione del vecchio controllo di dimensione .IPs tex^qComp @@ -238,15 +238,15 @@ SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c -SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \ - dvdread/dvd_input.c \ - dvdread/dvd_reader.c \ - dvdread/dvd_udf.c \ - dvdread/ifo_print.c \ - dvdread/ifo_read.c \ - dvdread/md5.c \ - dvdread/nav_print.c \ - dvdread/nav_read.c \ +SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread/cmd_print.c \ + libdvdread/dvd_input.c \ + libdvdread/dvd_reader.c \ + libdvdread/dvd_udf.c \ + libdvdread/ifo_print.c \ + libdvdread/ifo_read.c \ + libdvdread/md5.c \ + libdvdread/nav_print.c \ + libdvdread/nav_read.c \ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ @@ -658,7 +658,6 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man DIRS = . \ - dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -682,6 +681,7 @@ DIRS = . \ ffmpeg/libavformat \ ffmpeg/libavutil \ libdvdcss \ + libdvdread \ libfaad2 \ libmenu \ libmpcodecs \ @@ -744,7 +744,7 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h +$(FFMPEGLIBS): $(FFMPEGFILES) config.h $(MAKE) -C $(@D) touch $@ @@ -786,8 +786,8 @@ codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h $(DEPS): help_mp.h -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE |