summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 72ec4a2)
raw | patch | inline | side by side (parent: 72ec4a2)
author | Thomas Vander Stichele <thomas@apestaart.org> | |
Mon, 15 Mar 2004 17:17:28 +0000 (17:17 +0000) | ||
committer | Thomas Vander Stichele <thomas@apestaart.org> | |
Mon, 15 Mar 2004 17:17:28 +0000 (17:17 +0000) |
Original commit message from CVS:
adding media info pc files
package them
use ffmpegcolorspace in gstplay
adding media info pc files
package them
use ffmpegcolorspace in gstplay
ChangeLog | patch | blob | history | |
configure.ac | patch | blob | history | |
gst-libs/gst/play/play.c | patch | blob | history | |
gst-plugins-ugly.spec.in | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 4254c8916f67f20241c982dbfb30a0b9a53b754c..7f1b9d32409d35ed26fdc9b6cfa2d0e9099e7d81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2004-03-15 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst-libs/gst/play/play.c: (gst_play_pipeline_setup):
+ use the new ffmpegcolorspace
+ * gst-plugins.spec.in:
+ package new colorspace and media-info
+ * configure.ac:
+ * pkgconfig/Makefile.am:
+ fix some more disting issues
+ * pkgconfig/gstreamer-media-info-uninstalled.pc.in:
+ * pkgconfig/gstreamer-media-info.pc.in:
+ generate media-info pc files
+
2004-03-15 Johan Dahlin <johan@gnome.org>
* *.h: Revert indenting
diff --git a/configure.ac b/configure.ac
index c4f7b93e9b04655e90540de5e59776d66a73c288..fc8b285724a01e21ba3080d3926b4b8f0ddd3d64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_CONFIG_FILES(
Makefile
-pkgconfig/gstreamer-gconf.pc
-pkgconfig/gstreamer-gconf-uninstalled.pc
-pkgconfig/gstreamer-interfaces.pc
-pkgconfig/gstreamer-interfaces-uninstalled.pc
-pkgconfig/gstreamer-libs.pc
-pkgconfig/gstreamer-libs-uninstalled.pc
-pkgconfig/gstreamer-play.pc
-pkgconfig/gstreamer-play-uninstalled.pc
gst-plugins.spec
gst/Makefile
gst/ac3parse/Makefile
gconf/Makefile
gconf/gstreamer.schemas
pkgconfig/Makefile
+pkgconfig/gstreamer-gconf.pc
+pkgconfig/gstreamer-gconf-uninstalled.pc
+pkgconfig/gstreamer-interfaces.pc
+pkgconfig/gstreamer-interfaces-uninstalled.pc
+pkgconfig/gstreamer-libs.pc
+pkgconfig/gstreamer-libs-uninstalled.pc
+pkgconfig/gstreamer-media-info.pc
+pkgconfig/gstreamer-media-info-uninstalled.pc
+pkgconfig/gstreamer-play.pc
+pkgconfig/gstreamer-play-uninstalled.pc
po/Makefile.in
)
AC_OUTPUT
index 97ce306091f2a803f7c38c03aea330cec7a3263e..d884dbc8b8f2c0adb635fa03b45825d9e9d1d02c 100644 (file)
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
GST_PLAY_MAKE_OR_ERROR (identity, "identity", "identity", error);
g_hash_table_insert (play->priv->elements, "identity", identity);
- identity_cs = gst_element_factory_make ("ffcolorspace", "identity_cs");
+ identity_cs = gst_element_factory_make ("ffmpegcolorspace", "identity_cs");
if (!GST_IS_ELEMENT (identity_cs)) {
- identity_cs = gst_element_factory_make ("colorspace", "identity_cs");
+ identity_cs = gst_element_factory_make ("ffcolorspace", "identity_cs");
if (!GST_IS_ELEMENT (identity_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
+ identity_cs = gst_element_factory_make ("colorspace", "identity_cs");
+ if (!GST_IS_ELEMENT (identity_cs)) {
+ gst_play_error_plugin ("colorspace", error);
+ return FALSE;
+ }
}
}
g_hash_table_insert (play->priv->elements, "identity_cs", identity_cs);
g_hash_table_insert (play->priv->elements, "vis_element", vis_element);
/* Colorspace conversion */
- vis_cs = gst_element_factory_make ("ffcolorspace", "vis_cs");
+ vis_cs = gst_element_factory_make ("ffmpegcolorspace", "vis_cs");
if (!GST_IS_ELEMENT (vis_cs)) {
- vis_cs = gst_element_factory_make ("colorspace", "vis_cs");
+ vis_cs = gst_element_factory_make ("ffcolorspace", "vis_cs");
if (!GST_IS_ELEMENT (vis_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
+ vis_cs = gst_element_factory_make ("colorspace", "vis_cs");
+ if (!GST_IS_ELEMENT (vis_cs)) {
+ gst_play_error_plugin ("colorspace", error);
+ return FALSE;
+ }
}
}
g_hash_table_insert (play->priv->elements, "video_switch", video_switch);
/* Colorspace conversion */
- video_cs = gst_element_factory_make ("ffcolorspace", "video_cs");
+ video_cs = gst_element_factory_make ("ffmpegcolorspace", "video_cs");
if (!GST_IS_ELEMENT (video_cs)) {
- video_cs = gst_element_factory_make ("colorspace", "video_cs");
+ video_cs = gst_element_factory_make ("ffcolorspace", "video_cs");
if (!GST_IS_ELEMENT (video_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
+ video_cs = gst_element_factory_make ("colorspace", "video_cs");
+ if (!GST_IS_ELEMENT (video_cs)) {
+ gst_play_error_plugin ("colorspace", error);
+ return FALSE;
+ }
}
}
g_hash_table_insert (play->priv->elements, "video_cs", video_cs);
g_hash_table_insert (play->priv->elements, "video_balance", video_balance);
/* Colorspace conversion */
- balance_cs = gst_element_factory_make ("ffcolorspace", "balance_cs");
+ balance_cs = gst_element_factory_make ("ffmpegcolorspace", "balance_cs");
if (!GST_IS_ELEMENT (balance_cs)) {
- balance_cs = gst_element_factory_make ("colorspace", "balance_cs");
+ balance_cs = gst_element_factory_make ("ffcolorspace", "balance_cs");
if (!GST_IS_ELEMENT (balance_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
+ balance_cs = gst_element_factory_make ("colorspace", "balance_cs");
+ if (!GST_IS_ELEMENT (balance_cs)) {
+ gst_play_error_plugin ("colorspace", error);
+ return FALSE;
+ }
}
}
g_hash_table_insert (play->priv->elements, "balance_cs", balance_cs);
index cd2fa576d1456b635a1a080b853b1c8ef2907c38..6c6843c79aa3808d1961f5f3bb486d392856b0f0 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
%clean
%{_libdir}/gstreamer-%{majorminor}/libgstefence.so
%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
+%{_libdir}/gstreamer-%{majorminor}/libgstffmpegcolorspace.so
%{_libdir}/gstreamer-%{majorminor}/libgstfilter.so
%{_libdir}/gstreamer-%{majorminor}/libgstflxdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstgamma.so
%{_includedir}/gstreamer-%{majorminor}/gst/xwindowlistener/xwindowlistener.h
# library headers
@USE_GCONF_TRUE@%{_includedir}/gstreamer-%{majorminor}/gst/gconf/gconf.h
+%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h
%{_includedir}/gstreamer-%{majorminor}/gst/play/play.h
%{_includedir}/gstreamer-%{majorminor}/gst/play/play-enumtypes.h
%{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h
# pkg-config files
+@USE_GCONF_TRUE@%{_libdir}/pkgconfig/gstreamer-gconf-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-media-info-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
-%{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc
-@USE_GCONF_TRUE@%{_libdir}/pkgconfig/gstreamer-gconf-%{majorminor}.pc
# .so files
@USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so
+%{_libdir}/libgstmedia-info-%{majorminor}.so
%{_libdir}/libgstplay-%{majorminor}.so
# Here are packages not in the base plugins package but not dependant
%changelog
+* Mon Mar 15 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- put back media-info
+- add ffmpegcolorspace plugin
+
* Tue Mar 02 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- Libraries/Multimedia doesn't exist, remove it