mnauw gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/qtmux/
[email protected] Fri, 19 Dec 2008 10:34:01 -0800 (PST)
| Newsgroups | gmane.comp.video.gstreamer.cvs |
|---|---|
| Message-ID | <[email protected]> |
CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: mnauw
Date: Fri Dec 19 2008 18:34:01 UTC
Log message:
* gst/qtmux/atoms.c:
* gst/qtmux/atoms.h:
* gst/qtmux/descriptors.c:
* gst/qtmux/descriptors.h:
* gst/qtmux/fourcc.h:
* gst/qtmux/ftypcc.h:
* gst/qtmux/gstqtmux.c:
* gst/qtmux/gstqtmux.h:
* gst/qtmux/gstqtmuxmap.c:
* gst/qtmux/gstqtmuxmap.h:
* gst/qtmux/properties.c:
* gst/qtmux/properties.h:
Dual license qtmux LGPL/MIT. Fixes #564232.
Modified files:
. : ChangeLog
gst/qtmux : atoms.c atoms.h descriptors.c descriptors.h
fourcc.h ftypcc.h gstqtmux.c gstqtmux.h
gstqtmuxmap.c gstqtmuxmap.h properties.c
properties.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3824&r2=1.3825
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/atoms.c.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/atoms.h.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/descriptors.c.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/descriptors.h.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/fourcc.h.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/ftypcc.h.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmux.c.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmux.h.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmuxmap.c.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmuxmap.h.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/properties.c.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/qtmux/properties.h.diff?r1=1.3&r2=1.4
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3824
retrieving revision 1.3825
diff -u -d -r1.3824 -r1.3825
--- ChangeLog 19 Dec 2008 10:06:22 -0000 1.3824
+++ ChangeLog 19 Dec 2008 18:33:44 -0000 1.3825
@@ -1,3 +1,19 @@
+2008-12-19 Mark Nauwelaerts <[email protected]>
+
+ * gst/qtmux/atoms.c:
+ * gst/qtmux/atoms.h:
+ * gst/qtmux/descriptors.c:
+ * gst/qtmux/descriptors.h:
+ * gst/qtmux/fourcc.h:
+ * gst/qtmux/ftypcc.h:
+ * gst/qtmux/gstqtmux.c:
+ * gst/qtmux/gstqtmux.h:
+ * gst/qtmux/gstqtmuxmap.c:
+ * gst/qtmux/gstqtmuxmap.h:
+ * gst/qtmux/properties.c:
+ * gst/qtmux/properties.h:
+ Dual license qtmux LGPL/MIT. Fixes #564232.
2008-12-19 Sebastian Dröge <[email protected]>
* gst/mxf/mxfaes-bwf.c: (mxf_bwf_create_caps),
Index: atoms.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/atoms.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- atoms.c 1 Dec 2008 16:37:45 -0000 1.5
+++ atoms.c 19 Dec 2008 18:33:45 -0000 1.6
@@ -17,6 +17,29 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+/*
+ * Unless otherwise indicated, Source Code is licensed under MIT license.
+ * See further explanation attached in License Statement (distributed in the file
+ * LICENSE).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
#include "atoms.h"
#include <string.h>
Index: atoms.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/atoms.h,v
retrieving revision 1.4
diff -u -d -r1.4 -r1.5
--- atoms.h 14 Nov 2008 21:24:50 -0000 1.4
+++ atoms.h 19 Dec 2008 18:33:46 -0000 1.5
@@ -16,6 +16,29 @@
#ifndef __ATOMS_H__
#define __ATOMS_H__
Index: descriptors.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/descriptors.c,v
retrieving revision 1.3
diff -u -d -r1.3 -r1.4
--- descriptors.c 14 Nov 2008 21:24:50 -0000 1.3
+++ descriptors.c 19 Dec 2008 18:33:46 -0000 1.4
#include "descriptors.h"
Index: descriptors.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/descriptors.h,v
--- descriptors.h 14 Nov 2008 21:24:50 -0000 1.3
+++ descriptors.h 19 Dec 2008 18:33:46 -0000 1.4
#ifndef __DESCRIPTORS_H__
#define __DESCRIPTORS_H__
Index: fourcc.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/fourcc.h,v
--- fourcc.h 14 Nov 2008 21:24:50 -0000 1.4
+++ fourcc.h 19 Dec 2008 18:33:46 -0000 1.5
@@ -16,6 +16,30 @@
+ /*
#ifndef __FOURCC_H__
#define __FOURCC_H__
Index: ftypcc.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/ftypcc.h,v
--- ftypcc.h 14 Nov 2008 21:24:50 -0000 1.3
+++ ftypcc.h 19 Dec 2008 18:33:46 -0000 1.4
#ifndef __FTYP_CC_H__
#define __FTYP_CC_H__
Index: gstqtmux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstqtmux.c 16 Dec 2008 16:26:52 -0000 1.8
+++ gstqtmux.c 19 Dec 2008 18:33:46 -0000 1.9
/**
Index: gstqtmux.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmux.h,v
--- gstqtmux.h 16 Dec 2008 16:26:52 -0000 1.5
+++ gstqtmux.h 19 Dec 2008 18:33:46 -0000 1.6
#ifndef __GST_QT_MUX_H__
#define __GST_QT_MUX_H__
Index: gstqtmuxmap.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmuxmap.c,v
--- gstqtmuxmap.c 14 Nov 2008 21:24:50 -0000 1.4
+++ gstqtmuxmap.c 19 Dec 2008 18:33:46 -0000 1.5
#include "gstqtmuxmap.h"
#include "fourcc.h"
Index: gstqtmuxmap.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/gstqtmuxmap.h,v
--- gstqtmuxmap.h 14 Nov 2008 21:24:50 -0000 1.3
+++ gstqtmuxmap.h 19 Dec 2008 18:33:46 -0000 1.4
#ifndef __GST_QT_MUX_MAP_H__
#define __GST_QT_MUX_MAP_H__
Index: properties.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/properties.c,v
--- properties.c 14 Nov 2008 21:24:50 -0000 1.3
+++ properties.c 19 Dec 2008 18:33:46 -0000 1.4
#include "properties.h"
Index: properties.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/qtmux/properties.h,v
--- properties.h 14 Nov 2008 21:24:51 -0000 1.3
+++ properties.h 19 Dec 2008 18:33:47 -0000 1.4
#ifndef __PROPERTIES_H__
#define __PROPERTIES_H__
------------------------------------------------------------------------------
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose