summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer.11
-rw-r--r--DOCS/man/it/mplayer.18
-rw-r--r--Makefile9
-rw-r--r--cfg-common-opts.h38
-rw-r--r--cfg-common.h8
-rw-r--r--cfg-mencoder.h26
-rw-r--r--cfg-mplayer.h12
-rw-r--r--codec-cfg.h2
-rw-r--r--command.c62
-rwxr-xr-xconfigure370
-rw-r--r--etc/codecs.conf47
-rw-r--r--get_path.c12
-rw-r--r--gui/cfg.c18
-rw-r--r--gui/cfg.h2
-rw-r--r--gui/interface.c32
-rw-r--r--gui/interface.h6
-rw-r--r--gui/mplayer/gtk/menu.c8
-rw-r--r--gui/mplayer/gtk/opts.c56
-rw-r--r--gui/mplayer/gui_common.c4
-rw-r--r--gui/mplayer/mw.c8
-rw-r--r--gui/mplayer/play.c8
-rw-r--r--gui/win32/dialogs.c2
-rw-r--r--gui/win32/gui.c6
-rw-r--r--gui/win32/interface.c20
-rw-r--r--gui/win32/widgetrender.c2
-rw-r--r--help/help_mp-bg.h2
-rw-r--r--help/help_mp-cs.h2
-rw-r--r--help/help_mp-de.h2
-rw-r--r--help/help_mp-dk.h2
-rw-r--r--help/help_mp-el.h2
-rw-r--r--help/help_mp-en.h2
-rw-r--r--help/help_mp-es.h2
-rw-r--r--help/help_mp-fr.h2
-rw-r--r--help/help_mp-hu.h2
-rw-r--r--help/help_mp-it.h2
-rw-r--r--help/help_mp-ja.h2
-rw-r--r--help/help_mp-ko.h2
-rw-r--r--help/help_mp-mk.h2
-rw-r--r--help/help_mp-nb.h2
-rw-r--r--help/help_mp-nl.h2
-rw-r--r--help/help_mp-pl.h2
-rw-r--r--help/help_mp-pt_BR.h2
-rw-r--r--help/help_mp-ro.h2
-rw-r--r--help/help_mp-ru.h2
-rw-r--r--help/help_mp-sk.h2
-rw-r--r--help/help_mp-sv.h2
-rw-r--r--help/help_mp-tr.h2
-rw-r--r--help/help_mp-uk.h2
-rw-r--r--help/help_mp-zh_CN.h2
-rw-r--r--help/help_mp-zh_TW.h2
-rw-r--r--input/input.c12
-rw-r--r--liba52/imdct.c12
-rw-r--r--liba52/liba52_changes.diff14
-rw-r--r--libaf/af.c8
-rw-r--r--libao2/audio_out.c16
-rw-r--r--libass/ass.c10
-rw-r--r--libass/ass_mp.c2
-rw-r--r--libmenu/menu.c6
-rw-r--r--libmpcodecs/ad.c16
-rw-r--r--libmpcodecs/ad_faad.c2
-rw-r--r--libmpcodecs/ad_hwac3.c3
-rw-r--r--libmpcodecs/ad_mp3lib.c2
-rw-r--r--libmpcodecs/ad_realaud.c28
-rw-r--r--libmpcodecs/ae.c4
-rw-r--r--libmpcodecs/ae_lavc.c6
-rw-r--r--libmpcodecs/dec_audio.c2
-rw-r--r--libmpcodecs/dec_video.c2
-rw-r--r--libmpcodecs/vd.c12
-rw-r--r--libmpcodecs/vd_ffmpeg.c2
-rw-r--r--libmpcodecs/vd_realvid.c18
-rw-r--r--libmpcodecs/ve.c8
-rw-r--r--libmpcodecs/ve_lavc.c2
-rw-r--r--libmpcodecs/vf.c8
-rw-r--r--libmpcodecs/vf_pp.c2
-rw-r--r--libmpcodecs/vf_vo.c10
-rw-r--r--libmpdemux/demux_audio.c2
-rw-r--r--libmpdemux/demux_mkv.c12
-rw-r--r--libmpdemux/demux_mov.c6
-rw-r--r--libmpdemux/demux_ogg.c39
-rw-r--r--libmpdemux/demux_rtp.cpp4
-rw-r--r--libmpdemux/demux_rtp_codec.cpp4
-rw-r--r--libmpdemux/demux_rtp_internal.h2
-rw-r--r--libmpdemux/demuxer.c18
-rw-r--r--libmpdemux/extension.c2
-rw-r--r--libmpdemux/mp_taglists.c2
-rw-r--r--libmpdemux/muxer.c2
-rw-r--r--libmpdemux/muxer_mpeg.c2
-rw-r--r--libmpeg2/cpu_accel.c8
-rw-r--r--libmpeg2/libmpeg-0.4.1.diff8
-rw-r--r--libswscale/yuv2rgb_altivec.c16
-rw-r--r--libvo/aclib.c5
-rw-r--r--libvo/fastmemcpy.h4
-rw-r--r--libvo/font_load_ft.c6
-rw-r--r--libvo/sub.c12
-rw-r--r--libvo/sub.h2
-rw-r--r--loader/win32.c2
-rw-r--r--mencoder.c28
-rw-r--r--mp3lib/dct64_altivec.c12
-rw-r--r--mp3lib/decod386.c2
-rw-r--r--mp3lib/mp3.h2
-rw-r--r--mp3lib/sr1.c4
-rw-r--r--mp3lib/test.c2
-rw-r--r--mp3lib/test2.c2
-rw-r--r--mp_core.h2
-rw-r--r--mp_msg.c10
-rw-r--r--mpcommon.c4
-rw-r--r--mplayer.c77
-rw-r--r--osdep/getch2-os2.c6
-rw-r--r--osdep/getch2-win.c2
-rw-r--r--osdep/getch2.c16
-rw-r--r--stream/asf_mmst_streaming.c20
-rw-r--r--stream/audio_in.c16
-rw-r--r--stream/audio_in.h6
-rw-r--r--stream/librtsp/rtsp.c3
-rw-r--r--stream/librtsp/rtsp_rtp.c4
-rw-r--r--stream/network.c2
-rw-r--r--stream/stream.c12
-rw-r--r--stream/stream.h2
-rw-r--r--stream/stream_dvd.h2
-rw-r--r--stream/stream_dvd_common.c2
-rw-r--r--stream/stream_dvd_common.h2
-rw-r--r--stream/stream_radio.c24
-rw-r--r--stream/tcp.c4
-rw-r--r--stream/tvi_bsdbt848.c8
-rw-r--r--stream/udp.c4
-rw-r--r--subreader.c46
-rw-r--r--vobsub.c4
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)
diff --git a/Makefile b/Makefile
index b377af3596..318ebec703 100644
--- a/Makefile
+++ b/Makefile
@@ -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 -DTRACE=__vprintf -DDETAILED_OUT
diff --git a/cfg-common-opts.h b/cfg-common-opts.h
index 9ed9f9b096..02b97ca770 100644
--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@@ -6,7 +6,7 @@
{"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
{"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
{"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#endif
#ifdef WIN32
@@ -16,18 +16,18 @@
// ------------------------- stream options --------------------
-#ifdef USE_STREAM_CACHE
+#ifdef CONFIG_STREAM_CACHE
{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL},
{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
{"cache-seek-min", &stream_cache_seek_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
#else
{"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* USE_STREAM_CACHE */
+#endif /* CONFIG_STREAM_CACHE */
{"vcd", "-vcd N has been removed, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
{"cuefile", "-cuefile has been removed, use cue://fil