diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
commit | e0172b96e3b6cc6a8b62ee5a52f780941a43de8b (patch) | |
tree | f652f6d15740667d5434e526db3fd12a0573aa0f /osdep | |
parent | 0c6f667896620943ee6ae899d6e36c3da5c98c54 (diff) | |
parent | 7e253f01715811e0c4f5f5b54317b098f2cd59d9 (diff) |
Merge svn changes up to r28862
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/getch2-win.c | 21 | ||||
-rw-r--r-- | osdep/getch2.c | 23 | ||||
-rw-r--r-- | osdep/getch2.h | 24 | ||||
-rw-r--r-- | osdep/gettimeofday.c | 18 | ||||
-rw-r--r-- | osdep/glob-win.c | 18 | ||||
-rw-r--r-- | osdep/glob.h | 18 | ||||
-rw-r--r-- | osdep/keycodes.h | 22 | ||||
-rw-r--r-- | osdep/macosx_finder_args.c | 18 | ||||
-rw-r--r-- | osdep/mmap_anon.c | 18 | ||||
-rw-r--r-- | osdep/mmap_anon.h | 18 | ||||
-rw-r--r-- | osdep/mplayer.rc | 23 | ||||
-rw-r--r-- | osdep/setenv.c | 20 | ||||
-rw-r--r-- | osdep/shmem.c | 25 | ||||
-rw-r--r-- | osdep/shmem.h | 18 | ||||
-rw-r--r-- | osdep/strsep.c | 20 | ||||
-rw-r--r-- | osdep/swab.c | 18 | ||||
-rw-r--r-- | osdep/timer-linux.c | 21 | ||||
-rw-r--r-- | osdep/timer-win2.c | 20 | ||||
-rw-r--r-- | osdep/timer.h | 18 | ||||
-rw-r--r-- | osdep/vsscanf.c | 22 |
20 files changed, 383 insertions, 20 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index a1c5601474..5df87b2377 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -1,4 +1,23 @@ -/* windows TermIO for MPlayer (C) 2003 Sascha Sommer */ +/* Windows TermIO + * + * copyright (C) 2003 Sascha Sommer + * + * 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. + */ // See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinUI/WindowsUserInterface/UserInput/VirtualKeyCodes.asp // for additional virtual keycodes diff --git a/osdep/getch2.c b/osdep/getch2.c index 403519913a..e1871c7d6d 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -1,4 +1,25 @@ -/* GyS-TermIO v2.0 (for GySmail v3) (C) 1999 A'rpi/ESP-team */ +/* + * GyS-TermIO v2.0 (for GySmail v3) + * a very small replacement of ncurses library + * + * copyright (C) 1999 A'rpi/ESP-team + * + * 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" diff --git a/osdep/getch2.h b/osdep/getch2.h index a85969207c..1156aedf7a 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -1,5 +1,25 @@ -/* GyS-TermIO v2.0 (for GySmail v3) (C) 1999 A'rpi/ESP-team */ -/* a very small replacement of ncurses library */ +/* + * GyS-TermIO v2.0 (for GySmail v3) + * a very small replacement of ncurses library + * + * copyright (C) 1999 A'rpi/ESP-team + * + * 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_GETCH2_H #define MPLAYER_GETCH2_H diff --git a/osdep/gettimeofday.c b/osdep/gettimeofday.c index 7436898121..2dd59acaa1 100644 --- a/osdep/gettimeofday.c +++ b/osdep/gettimeofday.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 <sys/time.h> diff --git a/osdep/glob-win.c b/osdep/glob-win.c index f0764bba37..427a30e7b0 100644 --- a/osdep/glob-win.c +++ b/osdep/glob-win.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 <sys/types.h> #include <stdio.h> diff --git a/osdep/glob.h b/osdep/glob.h index 64d618d0dd..2d23b3a075 100644 --- a/osdep/glob.h +++ b/osdep/glob.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_GLOB_H #define MPLAYER_GLOB_H diff --git a/osdep/keycodes.h b/osdep/keycodes.h index d7e4e785c0..fd5a7f22b2 100644 --- a/osdep/keycodes.h +++ b/osdep/keycodes.h @@ -1,4 +1,24 @@ -/* KEY code definitions for GyS-TermIO v2.0 (C) 1999 A'rpi/ESP-team */ +/* + * KEY code definitions for GyS-TermIO v2.0 + * + * copyright (C) 1999 A'rpi/ESP-team + * + * 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_KEYCODES_H #define MPLAYER_KEYCODES_H diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c index 7312969eab..f784db0e61 100644 --- a/osdep/macosx_finder_args.c +++ b/osdep/macosx_finder_args.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 <Carbon/Carbon.h> #include <ApplicationServices/ApplicationServices.h> #include "stream/url.h" diff --git a/osdep/mmap_anon.c b/osdep/mmap_anon.c index cd42c92b2f..a29345a4ee 100644 --- a/osdep/mmap_anon.c +++ b/osdep/mmap_anon.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. + */ + /** * \file mmap_anon.c * \brief Provide a compatible anonymous space mapping function diff --git a/osdep/mmap_anon.h b/osdep/mmap_anon.h index f8712ca628..577f685838 100644 --- a/osdep/mmap_anon.h +++ b/osdep/mmap_anon.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_MMAP_ANON_H #define MPLAYER_MMAP_ANON_H diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index 4b0c1cd74e..82c5fbb317 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -1,7 +1,22 @@ -/*Windows resource file for MPlayer - compile with - windres -o resfile.o mplayer.rc - and add resfile.o to OBJS_MPLAYER in Makefile*/ +/* + * Windows resource file for MPlayer + * + * 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 <winver.h> #include "version.h" diff --git a/osdep/setenv.c b/osdep/setenv.c index 1dd6c4828e..e1e3b1f7da 100644 --- a/osdep/setenv.c +++ b/osdep/setenv.c @@ -1,4 +1,22 @@ -/* setenv implementation for systems lacking it. */ +/* + * setenv implementation for systems lacking it. + * + * 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" diff --git a/osdep/shmem.c b/osdep/shmem.c index 1adacfaef5..f1cec1be37 100644 --- a/osdep/shmem.c +++ b/osdep/shmem.c @@ -1,9 +1,24 @@ /* - * shmem.c - Shared memory allocation - * - * based on mpg123's xfermem.c by - * Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de> - * Sun Apr 6 02:26:26 MET DST 1997 + * shared memory allocation + * + * based on mpg123's xfermem.c by + * Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de> + * + * 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" diff --git a/osdep/shmem.h b/osdep/shmem.h index bdfcb5c474..7696e45281 100644 --- a/osdep/shmem.h +++ b/osdep/shmem.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_SHMEM_H #define MPLAYER_SHMEM_H diff --git a/osdep/strsep.c b/osdep/strsep.c index 85bb8b5749..21552907a5 100644 --- a/osdep/strsep.c +++ b/osdep/strsep.c @@ -1,4 +1,22 @@ -/* strsep implementation for systems that do not have it in libc */ +/* + * strsep implementation for systems that do not have it in libc + * + * 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 <stdio.h> #include <string.h> diff --git a/osdep/swab.c b/osdep/swab.c index 46da22c744..f0bb7964d8 100644 --- a/osdep/swab.c +++ b/osdep/swab.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" /* system has no swab. emulate via bswap */ diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index 6e066711d5..576bae5be6 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.c @@ -1,4 +1,23 @@ -// Precise timer routines for LINUX (C) LGB & A'rpi/ASTRAL +/* + * precise timer routines for Linux + * copyright (C) LGB & A'rpi/ASTRAL + * + * 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 <unistd.h> #ifdef __BEOS__ diff --git a/osdep/timer-win2.c b/osdep/timer-win2.c index 3c6b86afa4..0a424f2dd3 100644 --- a/osdep/timer-win2.c +++ b/osdep/timer-win2.c @@ -1,4 +1,22 @@ -// Precise timer routines for WINDOWS +/* + * precise timer routines for Windows + * + * 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 <windows.h> #include <mmsystem.h> diff --git a/osdep/timer.h b/osdep/timer.h index 4ddac524ef..c3925041ca 100644 --- a/osdep/timer.h +++ b/osdep/timer.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_TIMER_H #define MPLAYER_TIMER_H diff --git a/osdep/vsscanf.c b/osdep/vsscanf.c index 8a7ccf98b7..f75ddfe033 100644 --- a/osdep/vsscanf.c +++ b/osdep/vsscanf.c @@ -1,6 +1,24 @@ -#include "config.h" +/* + * vsscanf implementation for systems that do not have it in libc + * + * 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. + */ -/* system has no vsscanf. try to provide one */ +#include "config.h" #include <stdio.h> #include <stdarg.h> |