diff options
author | Christian Schaller <uraeus@gnome.org> | 2007-02-27 12:02:03 +0000 |
---|---|---|
committer | Christian Schaller <uraeus@gnome.org> | 2007-02-27 12:02:03 +0000 |
commit | e3ede85ab51d7bd2d1248a16158e5366219a6c4a (patch) | |
tree | 92fcfb5d5a3251189be2b9a72b9ab13bbd4fce45 | |
parent | bd7b6fc51c1ba10d77780cc5084d830448592b0e (diff) | |
download | gstreamer-plugins-bad-e3ede85ab51d7bd2d1248a16158e5366219a6c4a.tar.gz |
update copyright statements
Original commit message from CVS:
update copyright statements
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sys/directdraw/gstdirectdrawplugin.c | 5 | ||||
-rw-r--r-- | sys/directdraw/gstdirectdrawsink.c | 8 | ||||
-rw-r--r-- | sys/directdraw/gstdirectdrawsink.h | 5 | ||||
-rw-r--r-- | sys/directsound/gstdirectsoundplugin.c | 6 | ||||
-rw-r--r-- | sys/directsound/gstdirectsoundsink.c | 6 | ||||
-rw-r--r-- | sys/directsound/gstdirectsoundsink.h | 6 | ||||
-rw-r--r-- | sys/osxvideo/cocoawindow.h | 5 | ||||
-rw-r--r-- | sys/osxvideo/cocoawindow.m | 5 | ||||
-rw-r--r-- | sys/osxvideo/osxvideosink.h | 7 | ||||
-rw-r--r-- | sys/osxvideo/osxvideosink.m | 7 |
11 files changed, 63 insertions, 3 deletions
@@ -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 149430208..190bd02ef 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 4dd0d834d..b7e3fc866 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 85ed08243..3bd55dd34 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 5a0ef205d..1af665a2f 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 94b5579f4..e0b262ed3 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 dd0a04f42..ea7ccbdfb 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 87f592aa0..f479c995b 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 ef881a212..e191de45f 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 f03d1bded..2c144f5e5 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 43b514fc3..0122c4cbf 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" |