diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
127 files changed, 765 insertions, 747 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 8fe9601867..ec17c3f873 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3248,6 +3248,7 @@ Will usually only work with "\-fstype \-fullscreen" or "\-fstype none". This option is not suitable to only set the startup screen (and not also the fullscreen screen), \-geometry is the best that is available for that purpose currently. +Supported by the gl, gl2, x11, and xv video output drivers. . .TP .B \-zrbw (\-vo zr only) diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1 index d765a0e22a..edfefe7d9e 100644 --- a/DOCS/man/it/mplayer.1 +++ b/DOCS/man/it/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r27337 +.\" synced with r27348 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" Questa pagina di manuale č stata fatta da Gabucino, Diego Biurrun, @@ -3374,7 +3374,7 @@ Utile per 'incastrare' MPlayer in un browser (p.es.\& con l'estensione plugger). . .TP -.B \-xineramascreen <\-2\-...> (solo X11) +.B \-xineramascreen <\-2\-...> In configurazioni con Xinerama (p.es.\& un singolo desktop che si espande su monitor multipli) questa opzione indica a MPlayer su quale schermo deve visualizzare il filmato. @@ -3385,6 +3385,10 @@ la finestra. La posizione iniziale selezionata con l'opzione \-geometry č relativa allo schermo specificato. Funzionerą solitamente solo con "\-fstype \-fullscreen" o "\-fstype none". +Non conviene usare quest'opzione solo per impostare la schermata di avvio +(e neanche per la modalitą a tutto schermo), per far questo la miglior opzione +attualmente disponibilie č \-geometry. +Supportata dai driver di uscita video gl, gl2, x11, ed xv. . .TP .B \-zrbw (solo \-vo zr) @@ -83,7 +83,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/ad_alaw.c \ libmpcodecs/ad_dk3adpcm.c \ libmpcodecs/ad_dvdpcm.c \ - libmpcodecs/ad_hwac3.c \ libmpcodecs/ad_hwmpa.c \ libmpcodecs/ad_imaadpcm.c \ libmpcodecs/ad_msadpcm.c \ @@ -258,7 +257,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c -SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c \ +SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_hwac3.c \ + libmpcodecs/ad_liba52.c \ liba52/crc.c \ liba52/resample.c \ liba52/bit_allocate.c \ @@ -777,7 +777,6 @@ version.h: ./version.sh `$(CC) -dumpversion` %(EXESUF): %.c -%.o: %.d @@ -787,9 +786,9 @@ codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d osdep/mplayer-rc.o: version.h $(DEPS): help_mp.h -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" -libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE +libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) #loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf |