diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
| commit | ca3feba5c339f12141bf335e5592967caccc290b (patch) | |
| tree | 06ec4960d34fd7a50c6efb80f8e017b2f4ab5d99 /libmpdemux/nuppelvideo.h | |
| parent | 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 (diff) | |
| parent | 8760b0cb71dc6aa9c08d926712e64218931a1782 (diff) | |
| download | mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.bz2 mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.xz | |
Merge svn changes up to r27242
Conflicts:
Makefile
configure
Diffstat (limited to 'libmpdemux/nuppelvideo.h')
| -rw-r--r-- | libmpdemux/nuppelvideo.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h index 5534318e82..e12c1eb325 100644 --- a/libmpdemux/nuppelvideo.h +++ b/libmpdemux/nuppelvideo.h @@ -1,4 +1,21 @@ -/* nuppelvideo.h rh */ +/* + nuppelvideo.h taken from NuppelVideo, by + (c) Roman Hochleitner roman@mars.tuwien.ac.at + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ #ifndef MPLAYER_NUPPELVIDEO_H #define MPLAYER_NUPPELVIDEO_H |