diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-01 18:46:51 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-01 18:50:32 +0000 |
commit | 044df35560bb095f2d244147928f291a4e65f5d3 (patch) | |
tree | 212c38ed938a9ee26b032202486bf41b0e1d0af9 /sys | |
parent | 097f09b8237d2ad3f72b96be4bc76b668a7c2513 (diff) | |
download | gstreamer-plugins-bad-044df35560bb095f2d244147928f291a4e65f5d3.tar.gz |
vdpau: relicense four source files from GPL3+ to LGPL2+
These source files were mistakenly licensed as GPL3, the
author (Carl-Anton Ingmarsson) has given permission to
relicense them to LGPL2+.
https://bugzilla.gnome.org/show_bug.cgi?id=671142
Diffstat (limited to 'sys')
-rw-r--r-- | sys/vdpau/gstvdp/gstvdpoutputbufferpool.c | 26 | ||||
-rw-r--r-- | sys/vdpau/gstvdp/gstvdpoutputbufferpool.h | 26 | ||||
-rw-r--r-- | sys/vdpau/gstvdp/gstvdpvideobufferpool.c | 26 | ||||
-rw-r--r-- | sys/vdpau/gstvdp/gstvdpvideobufferpool.h | 26 |
4 files changed, 56 insertions, 48 deletions
diff --git a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c index 826ef218b..27f668988 100644 --- a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c +++ b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.c @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad 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 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 this program. If not, see <http://www.gnu.org/licenses/>. + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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. + * + * 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #include "gstvdpdevice.h" diff --git a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h index 354461c0e..7c40684b4 100644 --- a/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h +++ b/sys/vdpau/gstvdp/gstvdpoutputbufferpool.h @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad 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 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 this program. If not, see <http://www.gnu.org/licenses/>. + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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. + * + * 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifndef _GST_VDP_OUTPUT_BUFFER_POOL_H_ diff --git a/sys/vdpau/gstvdp/gstvdpvideobufferpool.c b/sys/vdpau/gstvdp/gstvdpvideobufferpool.c index 889367d98..fdecb0d48 100644 --- a/sys/vdpau/gstvdp/gstvdpvideobufferpool.c +++ b/sys/vdpau/gstvdp/gstvdpvideobufferpool.c @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad 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 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 this program. If not, see <http://www.gnu.org/licenses/>. + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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. + * + * 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #include "gstvdpdevice.h" diff --git a/sys/vdpau/gstvdp/gstvdpvideobufferpool.h b/sys/vdpau/gstvdp/gstvdpvideobufferpool.h index e22e9b939..8676102f1 100644 --- a/sys/vdpau/gstvdp/gstvdpvideobufferpool.h +++ b/sys/vdpau/gstvdp/gstvdpvideobufferpool.h @@ -3,18 +3,20 @@ * gst-plugins-bad * Copyright (C) Carl-Anton Ingmarsson 2010 <ca.ingmarsson@gmail.com> * - * gst-plugins-bad 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 3 of the License, or - * (at your option) any later version. - * - * gst-plugins-bad 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 this program. If not, see <http://www.gnu.org/licenses/>. + * 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 + * version 2 of the License, or (at your option) any later version. + * + * This library 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. + * + * 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. */ #ifndef _GST_VDP_VIDEO_BUFFERPOOL_H_ |