diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
| commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
| tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /TOOLS/avisubdump.c | |
| parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
| parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
| download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz | |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'TOOLS/avisubdump.c')
| -rw-r--r-- | TOOLS/avisubdump.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/TOOLS/avisubdump.c b/TOOLS/avisubdump.c index 8afd12ec5b..9fc50aff46 100644 --- a/TOOLS/avisubdump.c +++ b/TOOLS/avisubdump.c @@ -2,9 +2,22 @@ * avisubdump * * avi vobsub subtitle stream dumper (c) 2004 Tobias Diedrich - * Licensed under GNU GPLv2 or (at your option) any later version. * * The subtitles are dumped to stdout. + * + * 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. */ #include <unistd.h> |