summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--sys/directdraw/gstdirectdrawplugin.c5
-rw-r--r--sys/directdraw/gstdirectdrawsink.c8
-rw-r--r--sys/directdraw/gstdirectdrawsink.h5
-rw-r--r--sys/directsound/gstdirectsoundplugin.c6
-rw-r--r--sys/directsound/gstdirectsoundsink.c6
-rw-r--r--sys/directsound/gstdirectsoundsink.h6
-rw-r--r--sys/osxvideo/cocoawindow.h5
-rw-r--r--sys/osxvideo/cocoawindow.m5
-rw-r--r--sys/osxvideo/osxvideosink.h7
-rw-r--r--sys/osxvideo/osxvideosink.m7
11 files changed, 63 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 21cd40f9..8a19c41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-27 Christian Schaller <christian at fluendo dot com>
+
+ * sys/direct*: Add Pioneers of the Inevitable to copyright
+ * sys/macosxvideosink: Add Pioneers of the Inevitable to copyright
+
2007-02-27 Edward Hervey <edward@fluendo.com>
* sys/osxvideo/cocoawindow.h:
@@ -19,6 +24,7 @@
Add a new plugin/library to make it easy for apps to shove
data into a pipeline.
+>>>>>>> 1.2426
2007-02-26 Tim-Philipp Müller <tim at centricular dot net>
* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_init):
diff --git a/sys/directdraw/gstdirectdrawplugin.c b/sys/directdraw/gstdirectdrawplugin.c
index 14943020..190bd02e 100644
--- a/sys/directdraw/gstdirectdrawplugin.c
+++ b/sys/directdraw/gstdirectdrawplugin.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+* Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* gstdirectdrawplugin.c:
*
@@ -17,6 +18,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+*
+* The development of this code was made possible due to the involvement
+* of Pioneers of the Inevitable, the creators of the Songbird Music player
+*
*/
#ifdef HAVE_CONFIG_H
diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c
index 4dd0d834..b7e3fc86 100644
--- a/sys/directdraw/gstdirectdrawsink.c
+++ b/sys/directdraw/gstdirectdrawsink.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+* Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* Based on directfb video sink
* gstdirectdrawsink.c:
@@ -18,6 +19,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+*
+* The development of this code was made possible due to the involvement
+* of Pioneers of the Inevitable, the creators of the Songbird Music player
+*
*/
/**
@@ -1030,8 +1035,7 @@ gst_directdraw_sink_setup_ddraw (GstDirectDrawSink * ddrawsink)
/* create an instance of the ddraw object use DDCREATE_EMULATIONONLY as first parameter to
force Directdraw to use the hardware emulation layer */
- hRes =
- DirectDrawCreateEx ( /*DDCREATE_EMULATIONONLY */ 0,
+ hRes = DirectDrawCreateEx ( /*DDCREATE_EMULATIONONLY */ 0,
(void **) &ddrawsink->ddraw_object, &IID_IDirectDraw7, NULL);
if (hRes != DD_OK || ddrawsink->ddraw_object == NULL) {
GST_ELEMENT_ERROR (ddrawsink, RESOURCE, WRITE,
diff --git a/sys/directdraw/gstdirectdrawsink.h b/sys/directdraw/gstdirectdrawsink.h
index 85ed0824..3bd55dd3 100644
--- a/sys/directdraw/gstdirectdrawsink.h
+++ b/sys/directdraw/gstdirectdrawsink.h
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* gstdirectdrawsink.h:
*
@@ -17,6 +18,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement
+ * of Pioneers of the Inevitable, the creators of the Songbird Music player
+ *
*/
diff --git a/sys/directsound/gstdirectsoundplugin.c b/sys/directsound/gstdirectsoundplugin.c
index 5a0ef205..1af665a2 100644
--- a/sys/directsound/gstdirectsoundplugin.c
+++ b/sys/directsound/gstdirectsoundplugin.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+* Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* gstdirectsoundplugin.c:
*
@@ -17,6 +18,11 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+*
+*
+* The development of this code was made possible due to the involvement
+* of Pioneers of the Inevitable, the creators of the Songbird Music player
+*
*/
#ifdef HAVE_CONFIG_H
diff --git a/sys/directsound/gstdirectsoundsink.c b/sys/directsound/gstdirectsoundsink.c
index 94b5579f..e0b262ed 100644
--- a/sys/directsound/gstdirectsoundsink.c
+++ b/sys/directsound/gstdirectsoundsink.c
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+* Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* gstdirectsoundsink.c:
*
@@ -17,6 +18,11 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+*
+*
+* The development of this code was made possible due to the involvement
+* of Pioneers of the Inevitable, the creators of the Songbird Music player
+*
*/
/**
diff --git a/sys/directsound/gstdirectsoundsink.h b/sys/directsound/gstdirectsoundsink.h
index dd0a04f4..ea7ccbdf 100644
--- a/sys/directsound/gstdirectsoundsink.h
+++ b/sys/directsound/gstdirectsoundsink.h
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2005 Sebastien Moutte <sebastien@moutte.net>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* gstdirectsoundsink.h:
*
@@ -17,6 +18,11 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement
+ * of Pioneers of the Inevitable, the creators of the Songbird Music player
+ *
+ *
*/
#ifndef __GST_DIRECTSOUNDSINK_H__
diff --git a/sys/osxvideo/cocoawindow.h b/sys/osxvideo/cocoawindow.h
index 87f592aa..f479c995 100644
--- a/sys/osxvideo/cocoawindow.h
+++ b/sys/osxvideo/cocoawindow.h
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2004 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -15,6 +16,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement of Pioneers
+ * of the Inevitable, the creators of the Songbird Music player
+ *
*/
/* inspiration gained from looking at source of osx video out of xine and vlc
diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index ef881a21..e191de45 100644
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -1,5 +1,6 @@
/* GStreamer
* Copyright (C) 2004 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -15,6 +16,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement of Pioneers
+ * of the Inevitable, the creators of the Songbird Music player
+ *
*/
/* inspiration gained from looking at source of osx video out of xine and vlc
diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h
index f03d1bde..2c144f5e 100644
--- a/sys/osxvideo/osxvideosink.h
+++ b/sys/osxvideo/osxvideosink.h
@@ -1,5 +1,7 @@
/* GStreamer
* Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
+ *
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -15,6 +17,11 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ *
+ * The development of this code was made possible due to the involvement of Pioneers
+ * of the Inevitable, the creators of the Songbird Music player
+ *
*/
#ifndef __GST_OSX_VIDEO_SINK_H__
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 43b514fc..0122c4cb 100644
--- a/sys/osxvideo/osxvideosink.m
+++ b/sys/osxvideo/osxvideosink.m
@@ -1,7 +1,8 @@
/* GStreamer
* OSX video sink
* Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org>
- *
+ * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com>
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
@@ -16,6 +17,10 @@
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
+ *
+ * The development of this code was made possible due to the involvement of Pioneers
+ * of the Inevitable, the creators of the Songbird Music player
+ *
*/
#include "config.h"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 14:42:21 +0000