summaryrefslogtreecommitdiff
path: root/libavformat/mpjpeg.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-10-07 15:30:46 +0000
committerDiego Biurrun <diego@biurrun.de>2006-10-07 15:30:46 +0000
commitb78e7197a81e193827cf2408fe25bc1f14843a72 (patch)
treebe7793a3871ad6c50f261939e521b324cddff835 /libavformat/mpjpeg.c
parent2ae7569dc89f2877c7544c05d4dea4c0b597ce09 (diff)
downloadffmpeg-b78e7197a81e193827cf2408fe25bc1f14843a72.tar.gz
Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpjpeg.c')
-rw-r--r--libavformat/mpjpeg.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 72d8e82a0d..937917313b 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -2,18 +2,20 @@
* Multipart JPEG format
* Copyright (c) 2000, 2001, 2002, 2003 Fabrice Bellard.
*
- * This library is free software; you can redistribute it and/or
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * 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 this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"