From 4ca1fa0a0835d511167017a2621a085076d9fdfa Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Sep 2008 05:40:29 +0000 Subject: Upgrade license of LGPL 2 or later files to LGPL 2.1 or later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27614 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avs.c | 19 ++++++++++--------- libmpdemux/demux_avs.h | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 2f8ec46bde..8d2ac82046 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -2,20 +2,21 @@ * Demuxer for avisynth * Copyright (c) 2005 Gianluigi Tiesi * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * This file is part of MPlayer. + * + * MPlayer 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, + * MPlayer 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 - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h index 0962146281..708ce9c70a 100644 --- a/libmpdemux/demux_avs.h +++ b/libmpdemux/demux_avs.h @@ -5,20 +5,21 @@ * Avisynth C Interface Version 0.20 * Copyright 2003 Kevin Atkinson * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * This file is part of MPlayer. + * + * MPlayer 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, + * MPlayer 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 - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_DEMUX_AVS_H -- cgit v1.2.3 From ec0ba2f460ddaef0525060955579fc2a4532c04d Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Sep 2008 15:30:06 +0000 Subject: riff.h and avi.h are not needed, but avio.h is. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27616 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 868b100b68..062cad7f98 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -35,10 +35,9 @@ #include "libvo/sub.h" #include "libavformat/avformat.h" +#include "libavformat/avio.h" #include "libavutil/avutil.h" -#include "libavformat/avi.h" #include "libavcodec/opt.h" -#include "libavformat/riff.h" #include "mp_taglists.h" -- cgit v1.2.3