diff --git a/Android.mk b/Android.mk index ac02ac3cce..ec380920b1 100644 --- a/Android.mk +++ b/Android.mk @@ -28,7 +28,7 @@ GST_PLUGINS_GOOD_BUILT_SOURCES = \ gst/matroska/Android.mk \ gst/multifile/Android.mk \ gst/multipart/Android.mk \ - gst/qtdemux/Android.mk \ + gst/quicktime/Android.mk \ gst/replaygain/Android.mk \ gst/rtp/Android.mk \ gst/rtpmanager/Android.mk \ @@ -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/multifile/Android.mk -include $(GST_PLUGINS_GOOD_TOP)/gst/multipart/Android.mk --include $(GST_PLUGINS_GOOD_TOP)/gst/qtdemux/Android.mk +-include $(GST_PLUGINS_GOOD_TOP)/gst/quicktime/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/rtpmanager/Android.mk diff --git a/configure.ac b/configure.ac index 7f6996eb73..8f0b052f80 100644 --- a/configure.ac +++ b/configure.ac @@ -346,7 +346,7 @@ AG_GST_CHECK_PLUGIN(matroska) AG_GST_CHECK_PLUGIN(monoscope) AG_GST_CHECK_PLUGIN(multifile) AG_GST_CHECK_PLUGIN(multipart) -AG_GST_CHECK_PLUGIN(qtdemux) +AG_GST_CHECK_PLUGIN(quicktime) AG_GST_CHECK_PLUGIN(replaygain) AG_GST_CHECK_PLUGIN(rtp) AG_GST_CHECK_PLUGIN(rtpmanager) @@ -1159,7 +1159,7 @@ gst/matroska/Makefile gst/monoscope/Makefile gst/multifile/Makefile gst/multipart/Makefile -gst/qtdemux/Makefile +gst/quicktime/Makefile gst/replaygain/Makefile gst/rtp/Makefile gst/rtpmanager/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 1ac1ebf02c..6b599d36dc 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -190,7 +190,7 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/multifile/gstmultifilesrc.h \ $(top_srcdir)/gst/multipart/multipartdemux.h \ $(top_srcdir)/gst/multipart/multipartmux.h \ - $(top_srcdir)/gst/qtdemux/qtdemux.h \ + $(top_srcdir)/gst/quicktime/qtdemux.h \ $(top_srcdir)/gst/replaygain/gstrganalysis.h \ $(top_srcdir)/gst/replaygain/gstrglimiter.h \ $(top_srcdir)/gst/replaygain/gstrgvolume.h \ diff --git a/docs/plugins/inspect/plugin-quicktime.xml b/docs/plugins/inspect/plugin-quicktime.xml index f9b98162d6..c36c6c977a 100644 --- a/docs/plugins/inspect/plugin-quicktime.xml +++ b/docs/plugins/inspect/plugin-quicktime.xml @@ -1,7 +1,7 @@ quicktime Quicktime support - ../../gst/qtdemux/.libs/libgstqtdemux.so + ../../gst/quicktime/.libs/libgstqtdemux.so libgstqtdemux.so 0.10.28.1 LGPL diff --git a/gst/qtdemux/LEGAL b/gst/quicktime/LEGAL similarity index 100% rename from gst/qtdemux/LEGAL rename to gst/quicktime/LEGAL diff --git a/gst/qtdemux/Makefile.am b/gst/quicktime/Makefile.am similarity index 100% rename from gst/qtdemux/Makefile.am rename to gst/quicktime/Makefile.am diff --git a/gst/qtdemux/gstrtpxqtdepay.c b/gst/quicktime/gstrtpxqtdepay.c similarity index 100% rename from gst/qtdemux/gstrtpxqtdepay.c rename to gst/quicktime/gstrtpxqtdepay.c diff --git a/gst/qtdemux/gstrtpxqtdepay.h b/gst/quicktime/gstrtpxqtdepay.h similarity index 100% rename from gst/qtdemux/gstrtpxqtdepay.h rename to gst/quicktime/gstrtpxqtdepay.h diff --git a/gst/qtdemux/qtatomparser.h b/gst/quicktime/qtatomparser.h similarity index 100% rename from gst/qtdemux/qtatomparser.h rename to gst/quicktime/qtatomparser.h diff --git a/gst/qtdemux/qtdemux.c b/gst/quicktime/qtdemux.c similarity index 100% rename from gst/qtdemux/qtdemux.c rename to gst/quicktime/qtdemux.c diff --git a/gst/qtdemux/qtdemux.h b/gst/quicktime/qtdemux.h similarity index 100% rename from gst/qtdemux/qtdemux.h rename to gst/quicktime/qtdemux.h diff --git a/gst/qtdemux/qtdemux.vcproj b/gst/quicktime/qtdemux.vcproj similarity index 100% rename from gst/qtdemux/qtdemux.vcproj rename to gst/quicktime/qtdemux.vcproj diff --git a/gst/qtdemux/qtdemux_dump.c b/gst/quicktime/qtdemux_dump.c similarity index 100% rename from gst/qtdemux/qtdemux_dump.c rename to gst/quicktime/qtdemux_dump.c diff --git a/gst/qtdemux/qtdemux_dump.h b/gst/quicktime/qtdemux_dump.h similarity index 100% rename from gst/qtdemux/qtdemux_dump.h rename to gst/quicktime/qtdemux_dump.h diff --git a/gst/qtdemux/qtdemux_fourcc.h b/gst/quicktime/qtdemux_fourcc.h similarity index 100% rename from gst/qtdemux/qtdemux_fourcc.h rename to gst/quicktime/qtdemux_fourcc.h diff --git a/gst/qtdemux/qtdemux_lang.c b/gst/quicktime/qtdemux_lang.c similarity index 100% rename from gst/qtdemux/qtdemux_lang.c rename to gst/quicktime/qtdemux_lang.c diff --git a/gst/qtdemux/qtdemux_lang.h b/gst/quicktime/qtdemux_lang.h similarity index 100% rename from gst/qtdemux/qtdemux_lang.h rename to gst/quicktime/qtdemux_lang.h diff --git a/gst/qtdemux/qtdemux_types.c b/gst/quicktime/qtdemux_types.c similarity index 100% rename from gst/qtdemux/qtdemux_types.c rename to gst/quicktime/qtdemux_types.c diff --git a/gst/qtdemux/qtdemux_types.h b/gst/quicktime/qtdemux_types.h similarity index 100% rename from gst/qtdemux/qtdemux_types.h rename to gst/quicktime/qtdemux_types.h diff --git a/gst/qtdemux/qtpalette.h b/gst/quicktime/qtpalette.h similarity index 100% rename from gst/qtdemux/qtpalette.h rename to gst/quicktime/qtpalette.h diff --git a/gst/qtdemux/quicktime.c b/gst/quicktime/quicktime.c similarity index 100% rename from gst/qtdemux/quicktime.c rename to gst/quicktime/quicktime.c diff --git a/po/POTFILES.in b/po/POTFILES.in index ea9a35d8ed..5424a03bf9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,7 +9,7 @@ ext/wavpack/gstwavpackparse.c gconf/gstreamer.schemas.in gst/avi/gstavidemux.c gst/avi/gstavimux.c -gst/qtdemux/qtdemux.c +gst/quicktime/qtdemux.c gst/rtsp/gstrtspsrc.c gst/wavparse/gstwavparse.c sys/oss/gstossmixer.c