summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-12 04:17:55 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-12 04:17:55 +0200
commit1e869638280f962fb80f372d152234f21246c2af (patch)
tree64657f88e7902aa000f44f40be4f8e575f58c8de /libvo
parent9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff)
parent379b176f25905f273a368336c3f5f287eeea51a2 (diff)
downloadmpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2
mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz
Merge svn changes up to r28537
Diffstat (limited to 'libvo')
-rw-r--r--libvo/aclib.c33
-rw-r--r--libvo/aclib_template.c22
-rw-r--r--libvo/aspect.c18
-rw-r--r--libvo/aspect.h18
-rw-r--r--libvo/aspecttest.c20
-rw-r--r--libvo/font_load.c18
-rw-r--r--libvo/font_load.h18
-rw-r--r--libvo/font_load_ft.c18
-rw-r--r--libvo/gl_common.h18
-rw-r--r--libvo/gtf.h18
-rw-r--r--libvo/mga_common.c17
-rw-r--r--libvo/osd.c24
-rw-r--r--libvo/osd.h23
-rw-r--r--libvo/osd_font.h18
-rw-r--r--libvo/osd_template.c23
-rw-r--r--libvo/sub.c17
-rw-r--r--libvo/sub.h17
-rw-r--r--libvo/video_out.c22
-rw-r--r--libvo/video_out.h23
-rw-r--r--libvo/videodev_mjpeg.h24
-rw-r--r--libvo/vo_aa.c26
-rw-r--r--libvo/vo_caca.c25
-rw-r--r--libvo/vo_cvidix.c30
-rw-r--r--libvo/vo_direct3d.c88
-rw-r--r--libvo/vo_dxr2.c17
-rw-r--r--libvo/vo_dxr3.c17
-rw-r--r--libvo/vo_fbdev.c21
-rw-r--r--libvo/vo_fbdev2.c21
-rw-r--r--libvo/vo_ggi.c44
-rw-r--r--libvo/vo_gl.c18
-rw-r--r--libvo/vo_gl2.c18
-rw-r--r--libvo/vo_macosx.h28
-rw-r--r--libvo/vo_macosx.m18
-rw-r--r--libvo/vo_mga.c20
-rw-r--r--libvo/vo_mpegpes.c25
-rw-r--r--libvo/vo_png.c19
-rw-r--r--libvo/vo_quartz.c18
-rw-r--r--libvo/vo_svga.c29
-rw-r--r--libvo/vo_tga.c42
-rw-r--r--libvo/vo_winvidix.c26
-rw-r--r--libvo/vo_x11.c17
-rw-r--r--libvo/vo_xmga.c22
-rw-r--r--libvo/vo_xover.c34
-rw-r--r--libvo/vo_xv.c20
-rw-r--r--libvo/vo_xvidix.c32
-rw-r--r--libvo/vo_xvmc.c18
-rw-r--r--libvo/vo_yuv4mpeg.c25
-rw-r--r--libvo/w32_common.c18
-rw-r--r--libvo/w32_common.h18
-rw-r--r--libvo/wskeys.h17
-rw-r--r--libvo/x11_common.c17
-rw-r--r--libvo/x11_common.h18
52 files changed, 1020 insertions, 195 deletions
diff --git a/libvo/aclib.c b/libvo/aclib.c
index bc9bb2e55c..cae86dd3d4 100644
--- a/libvo/aclib.c
+++ b/libvo/aclib.c
@@ -1,12 +1,27 @@
-#include "config.h"
-#ifdef CONFIG_FASTMEMCPY
-
/*
- aclib - advanced C library ;)
- This file contains functions which improve and expand standard C-library
- see aclib_template.c ... this file only contains runtime cpu detection and config options stuff
- runtime cpu detection by michael niedermayer (michaelni@gmx.at) is under GPL
-*/
+ * aclib - advanced C library ;)
+ * Functions which improve and expand the standard C library, see aclib_template.c.
+ * This file only contains runtime CPU detection and config option stuff.
+ * runtime CPU detection by Michael Niedermayer (michaelni@gmx.at)
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "config.h"
#include <stddef.h>
#include <string.h>
#include "cpudetect.h"
@@ -210,5 +225,3 @@ void * mem2agpcpy(void * to, const void * from, size_t len)
#endif //!RUNTIME_CPUDETECT
return to;
}
-
-#endif /* CONFIG_FASTMEMCPY */
diff --git a/libvo/aclib_template.c b/libvo/aclib_template.c
index ab2ed6e5f5..a0c5aae55d 100644
--- a/libvo/aclib_template.c
+++ b/libvo/aclib_template.c
@@ -1,7 +1,23 @@
/*
- aclib - advanced C library ;)
- This file contains functions which improve and expand standard C-library
-*/
+ * aclib - advanced C library ;)
+ * functions which improve and expand the standard C library
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.
+ */
#if !HAVE_SSE2
/*
diff --git a/libvo/aspect.c b/libvo/aspect.c
index 5a2091baba..367cdec076 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.
+ */
+
/* Stuff for correct aspect scaling. */
#include "aspect.h"
#include "geometry.h"
diff --git a/libvo/aspect.h b/libvo/aspect.h
index 5fa313d7ff..89839e2c94 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_ASPECT_H
#define MPLAYER_ASPECT_H
/* Stuff for correct aspect scaling. */
diff --git a/libvo/aspecttest.c b/libvo/aspecttest.c
index 5cb0585bff..9beebcf766 100644
--- a/libvo/aspecttest.c
+++ b/libvo/aspecttest.c
@@ -1,4 +1,22 @@
-/* test app for aspect.[ch] by Atmos */
+/*
+ * test app for aspect.[ch] by Atmos
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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>
#include <stdlib.h>
diff --git a/libvo/font_load.c b/libvo/font_load.c
index ba747dc7dc..ad2311e37a 100644
--- a/libvo/font_load.c
+++ b/libvo/font_load.c
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "config.h"
#include <stdio.h>
diff --git a/libvo/font_load.h b/libvo/font_load.h
index 6bb4a175e3..c945d11277 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_FONT_LOAD_H
#define MPLAYER_FONT_LOAD_H
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 67707dff7b..ac9bcbfa75 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -4,9 +4,23 @@
*
* Artur Zaprzala <zybi@fanthom.irc.pl>
*
- * ported inside mplayer by Jindrich Makovicka
- * <makovick@gmail.com>
+ * ported inside MPlayer by Jindrich Makovicka <makovick@gmail.com>
*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "config.h"
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 1662c7a5d3..978866e340 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_GL_COMMON_H
#define MPLAYER_GL_COMMON_H
diff --git a/libvo/gtf.h b/libvo/gtf.h
index 3928ad9be2..057d7b352e 100644
--- a/libvo/gtf.h
+++ b/libvo/gtf.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_GTF_H
#define MPLAYER_GTF_H
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 14fc47f754..06d374f9fd 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "fastmemcpy.h"
#include "cpudetect.h"
diff --git a/libvo/osd.c b/libvo/osd.c
index 80a8da7f1c..6660500ecd 100644
--- a/libvo/osd.c
+++ b/libvo/osd.c
@@ -1,6 +1,24 @@
-// Generic alpha renderers for all YUV modes and RGB depths.
-// These are "reference implementations", should be optimized later (MMX, etc)
-// Templating Code from Michael Niedermayer (michaelni@gmx.at) is under GPL
+/*
+ * generic alpha renderers for all YUV modes and RGB depths
+ * These are "reference implementations", should be optimized later (MMX, etc).
+ * templating code by Michael Niedermayer (michaelni@gmx.at)
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.
+ */
//#define FAST_OSD
//#define FAST_OSD_TABLE
diff --git a/libvo/osd.h b/libvo/osd.h
index 897f79faa3..7773149b79 100644
--- a/libvo/osd.h
+++ b/libvo/osd.h
@@ -1,10 +1,27 @@
+/*
+ * generic alpha renderers for all YUV modes and RGB depths
+ * These are "reference implementations", should be optimized later (MMX, etc).
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_OSD_H
#define MPLAYER_OSD_H
-// Generic alpha renderers for all YUV modes and RGB depths.
-// These are "reference implementations", should be optimized later (MMX, etc)
-
void vo_draw_alpha_init(void); // build tables
void vo_draw_alpha_yv12(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
diff --git a/libvo/osd_font.h b/libvo/osd_font.h
index 99d162060c..6be45bc1fa 100644
--- a/libvo/osd_font.h
+++ b/libvo/osd_font.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_OSD_FONT_H
#define MPLAYER_OSD_FONT_H
diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index bc37b9d460..954135c55a 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -1,6 +1,23 @@
-// Generic alpha renderers for all YUV modes and RGB depths.
-// Optimized by Nick and Michael
-// Code from Michael Niedermayer (michaelni@gmx.at) is under GPL
+/*
+ * generic alpha renderers for all YUV modes and RGB depths
+ * Optimized by Nick and Michael.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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.
+ */
#undef PREFETCH
#undef EMMS
diff --git a/libvo/sub.c b/libvo/sub.c
index d4efcb9a5c..47bfdac2e8 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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>
#include <stdlib.h>
diff --git a/libvo/sub.h b/libvo/sub.h
index 9c4dc78525..d5a30e0b86 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -1,3 +1,20 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_SUB_H
#define MPLAYER_SUB_H
diff --git a/libvo/video_out.c b/libvo/video_out.c
index d0a873a486..5dc28522b5 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -1,6 +1,22 @@
-
-/* this file contains libvo's common functions, variables used by
- many/all drivers. */
+/*
+ * libvo common functions, variables used by many/all drivers.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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>
#include <stdlib.h>
diff --git a/libvo/video_out.h b/libvo/video_out.h
index e0bc79976e..a5f90305b4 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -1,12 +1,25 @@
/*
- * video_out.h
+ * Copyright (C) Aaron Holtzman - Aug 1999
+ * Strongly modified, most parts rewritten: A'rpi/ESP-team - 2000-2001
+ * (C) MPlayer developers
*
- * Copyright (C) Aaron Holtzman - Aug 1999
- * Strongly modified, most parts rewritten: A'rpi/ESP-team - 2000-2001
- * (C) MPlayer Developers
+ * This file is part of MPlayer.
*
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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_VIDEO_OUT_H
#define MPLAYER_VIDEO_OUT_H
diff --git a/libvo/videodev_mjpeg.h b/libvo/videodev_mjpeg.h
index 74962e9f5e..35c8b41d2f 100644
--- a/libvo/videodev_mjpeg.h
+++ b/libvo/videodev_mjpeg.h
@@ -1,7 +1,23 @@
-/* These are the MJPEG API extensions for the Video4Linux API,
- first introduced by the Iomega Buz driver by Rainer Johanni
- <rainer@johanni.de>
-*/
+/*
+ * MJPEG API extensions for the Video4Linux API, first introduced by the
+ * Iomega Buz driver by Rainer Johanni <rainer@johanni.de>.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 PARTICU