Commit 4d780297 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

quicktime: move qtmux plugin from -bad to -good

https://bugzilla.gnome.org/show_bug.cgi?id=636699
parent 6630f7de
......@@ -191,6 +191,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/multipart/multipartdemux.h \
$(top_srcdir)/gst/multipart/multipartmux.h \
$(top_srcdir)/gst/quicktime/qtdemux.h \
$(top_srcdir)/gst/quicktime/gstqtmux.h \
$(top_srcdir)/gst/replaygain/gstrganalysis.h \
$(top_srcdir)/gst/replaygain/gstrglimiter.h \
$(top_srcdir)/gst/replaygain/gstrgvolume.h \
......
......@@ -134,6 +134,7 @@
<xi:include href="xml/element-pulsemixer.xml" />
<xi:include href="xml/element-quarktv.xml" />
<xi:include href="xml/element-qtdemux.xml" />
<xi:include href="xml/element-qtmux.xml" />
<xi:include href="xml/element-radioactv.xml" />
<xi:include href="xml/element-revtv.xml" />
<xi:include href="xml/element-rganalysis.xml" />
......
......@@ -1687,6 +1687,20 @@ GST_TYPE_QTDEMUX
gst_qtdemux_get_type
</SECTION>
<SECTION>
<FILE>element-qtmux</FILE>
<TITLE>qtmux</TITLE>
GstQTMux
<SUBSECTION Standard>
GstQTMuxClass
GST_QT_MUX
GST_QT_MUX_CLASS
GST_IS_QT_MUX
GST_IS_QT_MUX_CLASS
GST_TYPE_QT_MUX
gst_qt_mux_get_type
</SECTION>
<SECTION>
<FILE>element-rganalysis</FILE>
<TITLE>rganalysis</TITLE>
......
This diff is collapsed.
......@@ -12,7 +12,9 @@ libgstqtdemux_la_LIBADD = \
$(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
libgstqtdemux_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
libgstqtdemux_la_SOURCES = quicktime.c gstrtpxqtdepay.c \
qtdemux.c qtdemux_types.c qtdemux_dump.c qtdemux_lang.c
qtdemux.c qtdemux_types.c qtdemux_dump.c qtdemux_lang.c \
gstqtmux.c gstqtmoovrecover.c atoms.c atomsrecovery.c descriptors.c \
properties.c gstqtmuxmap.c
libgstqtdemux_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \
......@@ -23,7 +25,16 @@ noinst_HEADERS = \
qtdemux_fourcc.h \
qtdemux_lang.h \
qtpalette.h \
gstrtpxqtdepay.h
gstrtpxqtdepay.h \
gstqtmux.h \
gstqtmoovrecover.h \
atoms.h \
atomsrecovery.h \
descriptors.h \
properties.h \
fourcc.h \
ftypcc.h \
gstqtmuxmap.h
Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \
......
/* Quicktime muxer plugin for GStreamer
* Copyright (C) 2008-2010 Thiago Santos <thiagoss@embedded.ufcg.edu.br>
* Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sf.net>
*
* 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.
*/
/*
* 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.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gstqtmux.h"
#include "gstqtmoovrecover.h"
static gboolean
gst_qt_mux_plugin_init (GstPlugin * plugin)
{
if (!gst_qt_mux_register (plugin))
return FALSE;
if (!gst_qt_moov_recover_register (plugin))
return FALSE;
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"qtmux",
"Quicktime Muxer plugin",
gst_qt_mux_plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN);
......@@ -26,6 +26,8 @@
#include "qtdemux.h"
#include "gstrtpxqtdepay.h"
#include "gstqtmux.h"
#include "gstqtmoovrecover.h"
#include <gst/pbutils/pbutils.h>
......@@ -57,6 +59,11 @@ plugin_init (GstPlugin * plugin)
GST_RANK_MARGINAL, GST_TYPE_RTP_XQT_DEPAY))
return FALSE;
if (!gst_qt_mux_register (plugin))
return FALSE;
if (!gst_qt_moov_recover_register (plugin))
return FALSE;
return TRUE;
}
......
......@@ -134,6 +134,7 @@ check_PROGRAMS = \
elements/matroskamux \
elements/mpegaudioparse \
elements/multifile \
elements/qtmux \
elements/rganalysis \
elements/rglimiter \
elements/rgvolume \
......@@ -149,6 +150,7 @@ check_PROGRAMS = \
elements/y4menc \
pipelines/simple-launch-lines \
pipelines/effectv \
pipelines/tagschecking \
pipelines/wavenc \
$(check_flac) \
$(check_gdkpixbuf) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment