Merge svn changes up to r27649

Conflicts:
	Makefile
	configure
	libvo/x11_common.c

3 files changed, 21 insertions, 20 deletions

diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c
index 3fb19c1ec3..444e06c90c 100644
--- a/libmpdemux/demux_avs.c
+++ b/libmpdemux/demux_avs.c
@@ -2,20 +2,21 @@
  * Demuxer for avisynth
  * Copyright (c) 2005 Gianluigi Tiesi <sherpya@netfarm.it>
  *
- * 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 <stdio.h>
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
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index d5dcd0989b..641b7cf902 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -36,10 +36,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"