diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-18 00:29:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-18 00:29:32 +0200 |
| commit | eac673d506eaefc29b0fc74b5043e41a2bf0967d (patch) | |
| tree | 68d053d4f79716a82408a110bd0df324fc946628 | |
| parent | 9a9ceb8776264c799ff9669ed7e287a5daaab564 (diff) | |
| download | ffmpeg-eac673d506eaefc29b0fc74b5043e41a2bf0967d.tar.gz | |
timecode: relicense to LGPLv2+ with permission of Baptiste and ubitux.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/timecode.c | 12 | ||||
| -rw-r--r-- | libavcodec/timecode.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c index b12506f74d..7f3b1d5ab8 100644 --- a/libavcodec/timecode.c +++ b/libavcodec/timecode.c @@ -5,19 +5,19 @@ * This file is part of FFmpeg. * * FFmpeg 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; - * version 2 of the License. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * FFmpeg 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ /** * @file diff --git a/libavcodec/timecode.h b/libavcodec/timecode.h index d8507a7419..c1664075c7 100644 --- a/libavcodec/timecode.h +++ b/libavcodec/timecode.h @@ -5,16 +5,16 @@ * This file is part of FFmpeg. * * FFmpeg 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; - * version 2 of the License. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * FFmpeg 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |