summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:18:43 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:18:43 +0200
commit12d3caebc7a44c67e7cc5a55e5ddadac844a225a (patch)
treee1d4d50d1960d8f7015dc7f139443550eccff51d
parent323890871d9a4d5bed8a38b1b676590ce614d87a (diff)
parentb1ca7b2a66a2f53312cd831de42b80aa430c6898 (diff)
downloadmpv-12d3caebc7a44c67e7cc5a55e5ddadac844a225a.tar.bz2
mpv-12d3caebc7a44c67e7cc5a55e5ddadac844a225a.tar.xz
Merge svn changes up to r30475
-rw-r--r--Copyright2
-rw-r--r--DOCS/man/en/mplayer.14
-rw-r--r--access_mpcontext.h18
-rw-r--r--asxparser.c18
-rw-r--r--asxparser.h18
-rw-r--r--cfg-common-opts.h18
-rw-r--r--cfg-common.h18
-rw-r--r--cfg-mencoder.h18
-rw-r--r--cfg-mplayer-def.h5
-rw-r--r--cfg-mplayer.h18
-rw-r--r--codec-cfg.c20
-rw-r--r--codec-cfg.h18
-rw-r--r--command.c18
-rw-r--r--command.h18
-rw-r--r--cpudetect.c18
-rw-r--r--cpudetect.h18
-rw-r--r--cpuinfo.c24
-rw-r--r--edl.c18
-rw-r--r--edl.h20
-rw-r--r--find_sub.c22
-rw-r--r--fmt-conversion.h18
-rw-r--r--get_path.c16
-rw-r--r--m_config.c17
-rw-r--r--m_config.h18
-rw-r--r--m_option.c17
-rw-r--r--m_option.h18
-rw-r--r--m_property.c17
-rw-r--r--m_property.h18
-rw-r--r--m_struct.c17
-rw-r--r--m_struct.h18
-rw-r--r--mencoder.c18
-rw-r--r--mixer.c18
-rw-r--r--mixer.h18
-rw-r--r--mp_core.h18
-rw-r--r--mp_fifo.c18
-rw-r--r--mp_fifo.h18
-rw-r--r--mp_msg.c18
-rw-r--r--mp_msg.h18
-rw-r--r--mp_osd.h18
-rw-r--r--mpbswap.h18
-rw-r--r--mpcommon.c18
-rw-r--r--mpcommon.h18
-rw-r--r--mplayer.c17
-rw-r--r--mplayer.h17
-rw-r--r--parser-cfg.c17
-rw-r--r--parser-cfg.h18
-rw-r--r--parser-mecmd.c17
-rw-r--r--parser-mecmd.h18
-rw-r--r--parser-mpcmd.c17
-rw-r--r--parser-mpcmd.h18
-rw-r--r--playtree.c17
-rw-r--r--playtree.h18
-rw-r--r--playtreeparser.c17
-rw-r--r--playtreeparser.h18
-rw-r--r--spudec.c40
-rw-r--r--spudec.h18
-rw-r--r--stream/ai_alsa.c18
-rw-r--r--stream/ai_alsa1x.c18
-rw-r--r--stream/ai_oss.c18
-rw-r--r--stream/asf_streaming.c18
-rw-r--r--stream/audio_in.c18
-rw-r--r--stream/audio_in.h18
-rw-r--r--stream/cache2.c18
-rw-r--r--stream/cache2.h18
-rw-r--r--stream/cdd.h18
-rw-r--r--stream/cdinfo.c22
-rw-r--r--stream/cookies.c18
-rw-r--r--stream/cookies.h18
-rw-r--r--stream/frequencies.c18
-rw-r--r--stream/frequencies.h16
-rw-r--r--stream/http.c20
-rw-r--r--stream/http.h20
-rw-r--r--stream/network.c20
-rw-r--r--stream/network.h20
-rw-r--r--stream/open.c17
-rw-r--r--stream/realrtsp/xbuffer.c15
-rw-r--r--stream/realrtsp/xbuffer.h15
-rw-r--r--stream/rtp.h19
-rw-r--r--stream/stream.c17
-rw-r--r--stream/stream.h18
-rw-r--r--stream/stream_cdda.c18
-rw-r--r--stream/stream_cddb.c20
-rw-r--r--stream/stream_cue.c20
-rw-r--r--stream/stream_dvd.c18
-rw-r--r--stream/stream_dvd.h18
-rw-r--r--stream/stream_dvd_common.c18
-rw-r--r--stream/stream_dvd_common.h18
-rw-r--r--stream/stream_dvdnav.c18
-rw-r--r--stream/stream_dvdnav.h18
-rw-r--r--stream/stream_ffmpeg.c18
-rw-r--r--stream/stream_file.c17
-rw-r--r--stream/stream_ftp.c17
-rw-r--r--stream/stream_live555.c17
-rw-r--r--stream/stream_netstream.h17
-rw-r--r--stream/stream_null.c17
-rw-r--r--stream/stream_radio.h18
-rw-r--r--stream/stream_smb.c17
-rw-r--r--stream/stream_vcd.c17
-rw-r--r--stream/tcp.c20
-rw-r--r--stream/tv.c35
-rw-r--r--stream/tvi_bsdbt848.c37
-rw-r--r--stream/tvi_def.h18
-rw-r--r--stream/tvi_dshow.h18
-rw-r--r--stream/tvi_dummy.c20
-rw-r--r--stream/tvi_v4l.c46
-rw-r--r--stream/url.c19
-rw-r--r--stream/url.h20
-rw-r--r--stream/vcd_read.h18
-rw-r--r--stream/vcd_read_darwin.h18
-rw-r--r--stream/vcd_read_fbsd.h18
-rw-r--r--stream/vcd_read_win32.h18
-rw-r--r--sub_cc.c21
-rw-r--r--sub_cc.h18
-rw-r--r--subopt-helper.c18
-rw-r--r--subopt-helper.h18
-rw-r--r--subreader.c18
-rw-r--r--subreader.h18
-rw-r--r--vobsub.c17
-rw-r--r--vobsub.h18
119 files changed, 2099 insertions, 96 deletions
diff --git a/Copyright b/Copyright
index 7a1485a720..24261f58d2 100644
--- a/Copyright
+++ b/Copyright
@@ -128,7 +128,7 @@ License: GNU General Public License
Name: dvbstream
Version: 0.4.3-pre3 (CVS checkout)
URL: http://sourceforge.net/projects/dvbtools/
-Directory: stream/dvbin.h stream/rtp.[ch] stream/stream_dvb.c
+Directory: stream/dvbin.h stream/rtp.c stream/stream_dvb.c
Copyright: 2001-2002 Dave Chapman <dave@dchapman.com>
License: GNU General Public License
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 5239a0e39a..6e9282ae25 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -413,8 +413,6 @@ Switch teletext on/\:off.
Go to next/\:prev teletext page.
.RE
.PD 1
-.PP
-.RS
.
.TP
.B mouse control
@@ -4478,7 +4476,7 @@ Specify advanced audio filter options:
.IPs force=<0\-7>
Forces the insertion of audio filters to one of the following:
.RSss
-0: Use completely automatic filter insertion.
+0: Use completely automatic filter insertion (currently identical to 1).
.br
1: Optimize for accuracy (default).
.br
diff --git a/access_mpcontext.h b/access_mpcontext.h
index c975a90fe6..23bfcfb0ce 100644
--- a/access_mpcontext.h
+++ b/access_mpcontext.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#ifndef MPLAYER_ACCESS_MPCONTEXT_H
#define MPLAYER_ACCESS_MPCONTEXT_H
diff --git a/asxparser.c b/asxparser.c
index ba9ba45354..6005987d87 100644
--- a/asxparser.c
+++ b/asxparser.c
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#include "config.h"
#include <stdlib.h>
diff --git a/asxparser.h b/asxparser.h
index 7b148a7775..c5a3b18fc7 100644
--- a/asxparser.h
+++ b/asxparser.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#ifndef MPLAYER_ASXPARSER_H
#define MPLAYER_ASXPARSER_H
diff --git a/cfg-common-opts.h b/cfg-common-opts.h
index 1770d2bd59..7a32b2101a 100644
--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
// ------------------------- common options --------------------
{"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
diff --git a/cfg-common.h b/cfg-common.h
index 831bd5b435..e4f3af7efd 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along