summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS38
-rw-r--r--src/audio_out/Makefile.am2
-rw-r--r--[-rwxr-xr-x]src/post/goom/gfontlib.c0
-rw-r--r--[-rwxr-xr-x]src/post/goom/gfontlib.h0
-rw-r--r--[-rwxr-xr-x]src/post/goom/gfontrle.c0
-rw-r--r--[-rwxr-xr-x]src/post/goom/mathtools.h0
-rw-r--r--[-rwxr-xr-x]src/post/goom/surf3d.c0
-rw-r--r--[-rwxr-xr-x]src/post/goom/surf3d.h0
-rw-r--r--[-rwxr-xr-x]src/post/goom/tentacle3d.c0
-rw-r--r--[-rwxr-xr-x]src/post/goom/tentacle3d.h0
-rw-r--r--[-rwxr-xr-x]src/post/goom/v3d.h0
-rw-r--r--src/video_out/video_out_vaapi.c3
-rw-r--r--src/xine-engine/accel_vaapi.h3
13 files changed, 24 insertions, 22 deletions
diff --git a/AUTHORS b/AUTHORS
index 87b126b0b..1d7bec5ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,22 +1,3 @@
-project leaders
-===============
-
-Miguel Freitas <miguel@cetuc.puc-rio.br>
- many bug and deadlock fixes, engine maintenance, soft deinterlacer,
- massive libwin32 updates
-
-Michael Roitzsch <mroi@users.sourceforge.net>
- several dxr3 fixes, massive engine contributions, multistream and
- post plugin architecture, DVD navigation
-
-Mike Melanson <melanson@pcisys.net>
- a whole bunch of file demuxers, lots of audio and video decoders,
- assorted other input sources and utilities
-
-Thibaut Mattern <tmattern@noos.fr>
- demuxer cleanups and fixes, mms input plugin fixes, xml parser,
- mmsh protocol support
-
project administrator
=====================
@@ -37,6 +18,25 @@ Darren Salt <linux@youmustbejoking.demon.co.uk>
developers
==========
+Petri Hintukainen <phintuka@users.sourceforge.net>
+ maintenance, fixes, OpenGL2 output
+
+Miguel Freitas <miguel@cetuc.puc-rio.br>
+ many bug and deadlock fixes, engine maintenance, soft deinterlacer,
+ massive libwin32 updates, 'former' project leader
+
+Michael Roitzsch <mroi@users.sourceforge.net>
+ several dxr3 fixes, massive engine contributions, multistream and
+ post plugin architecture, DVD navigation, 'former' project leader
+
+Mike Melanson <melanson@pcisys.net>
+ a whole bunch of file demuxers, lots of audio and video decoders,
+ assorted other input sources and utilities, 'former' project leader
+
+Thibaut Mattern <tmattern@noos.fr>
+ demuxer cleanups and fixes, mms input plugin fixes, xml parser,
+ mmsh protocol support, 'former' project leader
+
Guenter Bartsch <guenter@users.sourceforge.net>
xine founder, former project leader
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index 3d35504e9..7932d7af6 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,5 +1,5 @@
include $(top_srcdir)/misc/Makefile.quiet
-include $(top_builddir)/misc/Makefile.plugins
+-include $(top_builddir)/misc/Makefile.plugins
include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
diff --git a/src/post/goom/gfontlib.c b/src/post/goom/gfontlib.c
index f538aad34..f538aad34 100755..100644
--- a/src/post/goom/gfontlib.c
+++ b/src/post/goom/gfontlib.c
diff --git a/src/post/goom/gfontlib.h b/src/post/goom/gfontlib.h
index 0520b7da9..0520b7da9 100755..100644
--- a/src/post/goom/gfontlib.h
+++ b/src/post/goom/gfontlib.h
diff --git a/src/post/goom/gfontrle.c b/src/post/goom/gfontrle.c
index a22545a1e..a22545a1e 100755..100644
--- a/src/post/goom/gfontrle.c
+++ b/src/post/goom/gfontrle.c
diff --git a/src/post/goom/mathtools.h b/src/post/goom/mathtools.h
index 165fc66b0..165fc66b0 100755..100644
--- a/src/post/goom/mathtools.h
+++ b/src/post/goom/mathtools.h
diff --git a/src/post/goom/surf3d.c b/src/post/goom/surf3d.c
index ba8c69094..ba8c69094 100755..100644
--- a/src/post/goom/surf3d.c
+++ b/src/post/goom/surf3d.c
diff --git a/src/post/goom/surf3d.h b/src/post/goom/surf3d.h
index 482b6a090..482b6a090 100755..100644
--- a/src/post/goom/surf3d.h
+++ b/src/post/goom/surf3d.h
diff --git a/src/post/goom/tentacle3d.c b/src/post/goom/tentacle3d.c
index e1e2157e7..e1e2157e7 100755..100644
--- a/src/post/goom/tentacle3d.c
+++ b/src/post/goom/tentacle3d.c
diff --git a/src/post/goom/tentacle3d.h b/src/post/goom/tentacle3d.h
index ad0858fad..ad0858fad 100755..100644
--- a/src/post/goom/tentacle3d.h
+++ b/src/post/goom/tentacle3d.h
diff --git a/src/post/goom/v3d.h b/src/post/goom/v3d.h
index 7690847f2..7690847f2 100755..100644
--- a/src/post/goom/v3d.h
+++ b/src/post/goom/v3d.h
diff --git a/src/video_out/video_out_vaapi.c b/src/video_out/video_out_vaapi.c
index 8ff02d04b..ade498d3a 100644
--- a/src/video_out/video_out_vaapi.c
+++ b/src/video_out/video_out_vaapi.c
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2000-2004, 2008 the xine project
+ * Copyright (C) 2012 Edgar Hucek <gimli|@dark-green.com>
+ * Copyright (C) 2012-2013 xine developers
*
* This file is part of xine, a free video player.
*
diff --git a/src/xine-engine/accel_vaapi.h b/src/xine-engine/accel_vaapi.h
index 5ff6cee65..454bc1d9f 100644
--- a/src/xine-engine/accel_vaapi.h
+++ b/src/xine-engine/accel_vaapi.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2008 the xine project
+ * Copyright (C) 2012 Edgar Hucek <gimli|@dark-green.com>
+ * Copyright (C) 2012-2013 xine developers
*
* This file is part of xine, a free video player.
*