summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-05-18 23:31:08 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-05-18 23:31:08 +0000
commitd4327e368f9db5301bcc14542ea4b5236a200ed6 (patch)
tree71f7d3c7946be94a18fc3e88f96a757efff64696 /ffmpeg.c
parent7f913a35fb6e91b93715522e5c6f1ccd42584e33 (diff)
oops - removed obsolete license draft
Originally committed as revision 534 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 61d03fde49..38ede5563e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -7,15 +7,6 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * As a special exception, if you link this library with other files
- * to produce an executable, this library does not by itself cause the
- * resulting executable to be covered by the GNU General Public
- * License. This exception does not however invalidate any other
- * reasons why the executable file might be covered by the GNU General
- * Public License. (The General Public License restrictions do apply
- * in other respects; for example, they cover modification of the
- * file, and distribution when not linked into a combine executable.)
- *
* 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
@@ -23,7 +14,7 @@
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define HAVE_AV_CONFIG_H
#include "avformat.h"