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

quicktime: rename plugin to isomp4

https://bugzilla.gnome.org/show_bug.cgi?id=648004
parent 865140fb
...@@ -28,7 +28,7 @@ GST_PLUGINS_GOOD_BUILT_SOURCES = \ ...@@ -28,7 +28,7 @@ GST_PLUGINS_GOOD_BUILT_SOURCES = \
gst/matroska/Android.mk \ gst/matroska/Android.mk \
gst/multifile/Android.mk \ gst/multifile/Android.mk \
gst/multipart/Android.mk \ gst/multipart/Android.mk \
gst/quicktime/Android.mk \ gst/isomp4/Android.mk \
gst/replaygain/Android.mk \ gst/replaygain/Android.mk \
gst/rtp/Android.mk \ gst/rtp/Android.mk \
gst/rtpmanager/Android.mk \ gst/rtpmanager/Android.mk \
...@@ -94,7 +94,7 @@ CONFIGURE_TARGETS += gst-plugins-good-configure ...@@ -94,7 +94,7 @@ CONFIGURE_TARGETS += gst-plugins-good-configure
-include $(GST_PLUGINS_GOOD_TOP)/gst/matroska/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/matroska/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/multifile/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/multifile/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/multipart/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/multipart/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/quicktime/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/isomp4/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/replaygain/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/replaygain/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/rtp/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/rtp/Android.mk
-include $(GST_PLUGINS_GOOD_TOP)/gst/rtpmanager/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/rtpmanager/Android.mk
......
...@@ -350,13 +350,13 @@ AG_GST_CHECK_PLUGIN(flx) ...@@ -350,13 +350,13 @@ AG_GST_CHECK_PLUGIN(flx)
AG_GST_CHECK_PLUGIN(goom) AG_GST_CHECK_PLUGIN(goom)
AG_GST_CHECK_PLUGIN(goom2k1) AG_GST_CHECK_PLUGIN(goom2k1)
AG_GST_CHECK_PLUGIN(imagefreeze) AG_GST_CHECK_PLUGIN(imagefreeze)
AG_GST_CHECK_PLUGIN(isomp4)
AG_GST_CHECK_PLUGIN(law) AG_GST_CHECK_PLUGIN(law)
AG_GST_CHECK_PLUGIN(level) AG_GST_CHECK_PLUGIN(level)
AG_GST_CHECK_PLUGIN(matroska) AG_GST_CHECK_PLUGIN(matroska)
AG_GST_CHECK_PLUGIN(monoscope) AG_GST_CHECK_PLUGIN(monoscope)
AG_GST_CHECK_PLUGIN(multifile) AG_GST_CHECK_PLUGIN(multifile)
AG_GST_CHECK_PLUGIN(multipart) AG_GST_CHECK_PLUGIN(multipart)
AG_GST_CHECK_PLUGIN(quicktime)
AG_GST_CHECK_PLUGIN(replaygain) AG_GST_CHECK_PLUGIN(replaygain)
AG_GST_CHECK_PLUGIN(rtp) AG_GST_CHECK_PLUGIN(rtp)
AG_GST_CHECK_PLUGIN(rtpmanager) AG_GST_CHECK_PLUGIN(rtpmanager)
...@@ -1157,19 +1157,19 @@ gst/debugutils/Makefile ...@@ -1157,19 +1157,19 @@ gst/debugutils/Makefile
gst/effectv/Makefile gst/effectv/Makefile
gst/equalizer/Makefile gst/equalizer/Makefile
gst/flv/Makefile gst/flv/Makefile
gst/goom/Makefile
gst/goom2k1/Makefile
gst/id3demux/Makefile gst/id3demux/Makefile
gst/icydemux/Makefile gst/icydemux/Makefile
gst/imagefreeze/Makefile gst/imagefreeze/Makefile
gst/interleave/Makefile gst/interleave/Makefile
gst/goom/Makefile gst/isomp4/Makefile
gst/goom2k1/Makefile
gst/law/Makefile gst/law/Makefile
gst/level/Makefile gst/level/Makefile
gst/matroska/Makefile gst/matroska/Makefile
gst/monoscope/Makefile gst/monoscope/Makefile
gst/multifile/Makefile gst/multifile/Makefile
gst/multipart/Makefile gst/multipart/Makefile
gst/quicktime/Makefile
gst/replaygain/Makefile gst/replaygain/Makefile
gst/rtp/Makefile gst/rtp/Makefile
gst/rtpmanager/Makefile gst/rtpmanager/Makefile
......
...@@ -190,9 +190,9 @@ EXTRA_HFILES = \ ...@@ -190,9 +190,9 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/multifile/gstmultifilesrc.h \ $(top_srcdir)/gst/multifile/gstmultifilesrc.h \
$(top_srcdir)/gst/multipart/multipartdemux.h \ $(top_srcdir)/gst/multipart/multipartdemux.h \
$(top_srcdir)/gst/multipart/multipartmux.h \ $(top_srcdir)/gst/multipart/multipartmux.h \
$(top_srcdir)/gst/quicktime/qtdemux.h \ $(top_srcdir)/gst/isomp4/qtdemux.h \
$(top_srcdir)/gst/quicktime/gstqtmux.h \ $(top_srcdir)/gst/isomp4/gstqtmux.h \
$(top_srcdir)/gst/quicktime/gstqtmux-doc.h \ $(top_srcdir)/gst/isomp4/gstqtmux-doc.h \
$(top_srcdir)/gst/replaygain/gstrganalysis.h \ $(top_srcdir)/gst/replaygain/gstrganalysis.h \
$(top_srcdir)/gst/replaygain/gstrglimiter.h \ $(top_srcdir)/gst/replaygain/gstrglimiter.h \
$(top_srcdir)/gst/replaygain/gstrgvolume.h \ $(top_srcdir)/gst/replaygain/gstrgvolume.h \
......
...@@ -222,6 +222,7 @@ ...@@ -222,6 +222,7 @@
<xi:include href="xml/plugin-id3demux.xml" /> <xi:include href="xml/plugin-id3demux.xml" />
<xi:include href="xml/plugin-imagefreeze.xml" /> <xi:include href="xml/plugin-imagefreeze.xml" />
<xi:include href="xml/plugin-interleave.xml" /> <xi:include href="xml/plugin-interleave.xml" />
<xi:include href="xml/plugin-isomp4.xml" />
<xi:include href="xml/plugin-jack.xml" /> <xi:include href="xml/plugin-jack.xml" />
<xi:include href="xml/plugin-jpeg.xml" /> <xi:include href="xml/plugin-jpeg.xml" />
<xi:include href="xml/plugin-level.xml" /> <xi:include href="xml/plugin-level.xml" />
...@@ -237,7 +238,6 @@ ...@@ -237,7 +238,6 @@
<xi:include href="xml/plugin-osxvideo.xml" /> <xi:include href="xml/plugin-osxvideo.xml" />
<xi:include href="xml/plugin-png.xml" /> <xi:include href="xml/plugin-png.xml" />
<xi:include href="xml/plugin-pulseaudio.xml" /> <xi:include href="xml/plugin-pulseaudio.xml" />
<xi:include href="xml/plugin-quicktime.xml" />
<xi:include href="xml/plugin-replaygain.xml" /> <xi:include href="xml/plugin-replaygain.xml" />
<xi:include href="xml/plugin-rtp.xml" /> <xi:include href="xml/plugin-rtp.xml" />
<xi:include href="xml/plugin-gstrtpmanager.xml" /> <xi:include href="xml/plugin-gstrtpmanager.xml" />
......
<plugin> <plugin>
<name>quicktime</name> <name>isomp4</name>
<description>Quicktime support</description> <description>ISO base media file format support (mp4, 3gpp, qt, mj2)</description>
<filename>../../gst/quicktime/.libs/libgstquicktime.so</filename> <filename>../../gst/isomp4/.libs/libgstisomp4.so</filename>
<basename>libgstquicktime.so</basename> <basename>libgstisomp4.so</basename>
<version>0.10.28.3</version> <version>0.10.28.3</version>
<license>LGPL</license> <license>LGPL</license>
<source>gst-plugins-good</source> <source>gst-plugins-good</source>
...@@ -235,4 +235,4 @@ ...@@ -235,4 +235,4 @@
</pads> </pads>
</element> </element>
</elements> </elements>
</plugin> </plugin>
\ No newline at end of file
...@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT ...@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so %{_libdir}/gstreamer-%{majorminor}/libgstlevel.so
%{_libdir}/gstreamer-%{majorminor}/libgstefence.so %{_libdir}/gstreamer-%{majorminor}/libgstefence.so
%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so %{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
%{_libdir}/gstreamer-%{majorminor}/libgstquicktime.so %{_libdir}/gstreamer-%{majorminor}/libgstisomp4.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so %{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so %{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so %{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so
......
plugin_LTLIBRARIES = libgstquicktime.la plugin_LTLIBRARIES = libgstisomp4.la
libgstquicktime_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstisomp4_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstquicktime_la_LIBADD = \ libgstisomp4_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstriff-@GST_MAJORMINOR@ \ -lgstriff-@GST_MAJORMINOR@ \
-lgstaudio-@GST_MAJORMINOR@ \ -lgstaudio-@GST_MAJORMINOR@ \
...@@ -10,12 +10,12 @@ libgstquicktime_la_LIBADD = \ ...@@ -10,12 +10,12 @@ libgstquicktime_la_LIBADD = \
-lgsttag-@GST_MAJORMINOR@ \ -lgsttag-@GST_MAJORMINOR@ \
-lgstpbutils-@GST_MAJORMINOR@ \ -lgstpbutils-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
libgstquicktime_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS} libgstisomp4_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
libgstquicktime_la_SOURCES = quicktime.c gstrtpxqtdepay.c \ libgstisomp4_la_SOURCES = isomp4-plugin.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 \ gstqtmux.c gstqtmoovrecover.c atoms.c atomsrecovery.c descriptors.c \
properties.c gstqtmuxmap.c properties.c gstqtmuxmap.c
libgstquicktime_la_LIBTOOLFLAGS = --tag=disable-static libgstisomp4_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \ noinst_HEADERS = \
qtatomparser.h \ qtatomparser.h \
...@@ -42,13 +42,13 @@ EXTRA_DIST = \ ...@@ -42,13 +42,13 @@ EXTRA_DIST = \
Android.mk: Makefile.am $(BUILT_SOURCES) Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \ androgenizer \
-:PROJECT libgstquicktime -:SHARED libgstquicktime \ -:PROJECT libgstisomp4 -:SHARED libgstisomp4 \
-:TAGS eng debug \ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstquicktime_la_SOURCES) \ -:SOURCES $(libgstisomp4_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(libgstquicktime_la_CFLAGS) \ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(libgstisomp4_la_CFLAGS) \
-:LDFLAGS $(libgstquicktime_la_LDFLAGS) \ -:LDFLAGS $(libgstisomp4_la_LDFLAGS) \
$(libgstquicktime_la_LIBADD) \ $(libgstisomp4_la_LIBADD) \
-ldl \ -ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
......
...@@ -69,6 +69,6 @@ plugin_init (GstPlugin * plugin) ...@@ -69,6 +69,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"quicktime", "isomp4",
"Quicktime support", "ISO base media file format support (mp4, 3gpp, qt, mj2)",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
...@@ -9,7 +9,7 @@ ext/wavpack/gstwavpackparse.c ...@@ -9,7 +9,7 @@ ext/wavpack/gstwavpackparse.c
gconf/gstreamer.schemas.in gconf/gstreamer.schemas.in
gst/avi/gstavidemux.c gst/avi/gstavidemux.c
gst/avi/gstavimux.c gst/avi/gstavimux.c
gst/quicktime/qtdemux.c gst/isomp4/qtdemux.c
gst/rtsp/gstrtspsrc.c gst/rtsp/gstrtspsrc.c
gst/wavparse/gstwavparse.c gst/wavparse/gstwavparse.c
sys/oss/gstossmixer.c sys/oss/gstossmixer.c
......
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