diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 11:08:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 11:08:38 +0200 |
| commit | 25ffaf52770253a5bfce353dc3d30637664e5e60 (patch) | |
| tree | 7506a67fb00f5780aa86df5c265a41148650d302 | |
| parent | c88503e3f6bd7881f147d340bf222a629daa55fc (diff) | |
| parent | 910042072a88cdf64490e31f0b791caaaaf07a92 (diff) | |
| download | ffmpeg-25ffaf52770253a5bfce353dc3d30637664e5e60.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: Add missing license boilerplates
Conflicts:
compat/tms470/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | compat/aix/math.h | 22 | ||||
| -rw-r--r-- | compat/tms470/math.h | 18 |
2 files changed, 38 insertions, 2 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h index e1d1417c82..65a89c4565 100644 --- a/compat/aix/math.h +++ b/compat/aix/math.h @@ -1,5 +1,23 @@ -/* Work around the class() function in AIX math.h clashing with identifiers - * named "class". */ +/* + * Work around the class() function in AIX math.h clashing with + * identifiers named "class". + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * 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 + * Lesser General Public License for more details. + * + * 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 + */ #ifndef FFMPEG_COMPAT_AIX_MATH_H #define FFMPEG_COMPAT_AIX_MATH_H diff --git a/compat/tms470/math.h b/compat/tms470/math.h index ad531297a1..6234cc597b 100644 --- a/compat/tms470/math.h +++ b/compat/tms470/math.h @@ -1,3 +1,21 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * 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 + * Lesser General Public License for more details. + * + * 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 + */ + #ifndef FFMPEG_COMPAT_TMS470_MATH_H #define FFMPEG_COMPAT_TMS470_MATH_H |