Skip to content

Commit 12d3cae

Browse files
author
Uoti Urpala
committed
Merge svn changes up to r30475
2 parents 3238908 + b1ca7b2 commit 12d3cae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+2099
-96
lines changed

‎Copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ License: GNU General Public License
128128
Name: dvbstream
129129
Version: 0.4.3-pre3 (CVS checkout)
130130
URL: http://sourceforge.net/projects/dvbtools/
131-
Directory: stream/dvbin.h stream/rtp.[ch] stream/stream_dvb.c
131+
Directory: stream/dvbin.h stream/rtp.c stream/stream_dvb.c
132132
Copyright: 2001-2002 Dave Chapman <dave@dchapman.com>
133133
License: GNU General Public License
134134

‎DOCS/man/en/mplayer.1

+1-3
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,6 @@ Switch teletext on/\:off.
413413
Go to next/\:prev teletext page.
414414
.RE
415415
.PD 1
416-
.PP
417-
.RS
418416
.
419417
.TP
420418
.B mouse control
@@ -4478,7 +4476,7 @@ Specify advanced audio filter options:
44784476
.IPs force=<0\-7>
44794477
Forces the insertion of audio filters to one of the following:
44804478
.RSss
4481-
0: Use completely automatic filter insertion.
4479+
0: Use completely automatic filter insertion (currently identical to 1).
44824480
.br
44834481
1: Optimize for accuracy (default).
44844482
.br

‎access_mpcontext.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_ACCESS_MPCONTEXT_H
220
#define MPLAYER_ACCESS_MPCONTEXT_H
321

‎asxparser.c

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#include "config.h"
220

321
#include <stdlib.h>

‎asxparser.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_ASXPARSER_H
220
#define MPLAYER_ASXPARSER_H
321

‎cfg-common-opts.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
// ------------------------- common options --------------------
220
{"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
321
{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},

‎cfg-common.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_CFG_COMMON_H
220
#define MPLAYER_CFG_COMMON_H
321

‎cfg-mencoder.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_CFG_MENCODER_H
220
#define MPLAYER_CFG_MENCODER_H
321

‎cfg-mplayer-def.h

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
#ifndef MPLAYER_CFG_MPLAYER_DEF_H
2+
#define MPLAYER_CFG_MPLAYER_DEF_H
3+
14
static char* default_config=
25
"# Write your default config options here!\n"
36
"\n"
47
//"nosound=nem"
58
"\n";
9+
10+
#endif /* MPLAYER_CFG_MPLAYER_DEF_H */

‎cfg-mplayer.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_CFG_MPLAYER_H
220
#define MPLAYER_CFG_MPLAYER_H
321

‎codec-cfg.c

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
/*
22
* codec.conf parser
3-
* by Szabolcs Berecz <szabi@inf.elte.hu>
4-
* (C) 2001
53
*
64
* to compile test application:
75
* cc -I. -DTESTING -o codec-cfg-test codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap
86
* to compile CODECS2HTML:
97
* gcc -DCODECS2HTML -o codecs2html codec-cfg.c mp_msg.o
108
*
119
* TODO: implement informat in CODECS2HTML too
10+
*
11+
* Copyright (C) 2001 Szabolcs Berecz <szabi@inf.elte.hu>
12+
*
13+
* This file is part of MPlayer.
14+
*
15+
* MPlayer is free software; you can redistribute it and/or modify
16+
* it under the terms of the GNU General Public License as published by
17+
* the Free Software Foundation; either version 2 of the License, or
18+
* (at your option) any later version.
19+
*
20+
* MPlayer is distributed in the hope that it will be useful,
21+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
22+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
* GNU General Public License for more details.
24+
*
25+
* You should have received a copy of the GNU General Public License along
26+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
27+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1228
*/
1329

1430
#define DEBUG

‎codec-cfg.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_CODEC_CFG_H
220
#define MPLAYER_CODEC_CFG_H
321

‎command.c

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#include <stdlib.h>
220
#include <inttypes.h>
321
#include <unistd.h>

‎command.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_COMMAND_H
220
#define MPLAYER_COMMAND_H
321

‎cpudetect.c

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#include "config.h"
220
#include "cpudetect.h"
321
#include "mp_msg.h"

‎cpudetect.h

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#ifndef MPLAYER_CPUDETECT_H
220
#define MPLAYER_CPUDETECT_H
321

‎cpuinfo.c

+21-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
/* small utility to extract CPU information
2-
Used by configure to set CPU optimization levels on some operating
3-
systems where /proc/cpuinfo is non-existent or unreliable. */
1+
/*
2+
* small utility to extract CPU information
3+
* Used by configure to set CPU optimization levels on some operating
4+
* systems where /proc/cpuinfo is non-existent or unreliable.
5+
*
6+
* This file is part of MPlayer.
7+
*
8+
* MPlayer is free software; you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation; either version 2 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* MPlayer is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License along
19+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
20+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21+
*/
422

523
#include <stdio.h>
624
#include <sys/time.h>

‎edl.c

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* This file is part of MPlayer.
3+
*
4+
* MPlayer is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* MPlayer is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License along
15+
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
16+
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
*/
18+
119
#include <stdio.h>
220
#include <stdlib.h>
321
#include "config.h"

0 commit comments

Comments
 (0)