mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: the Hermes library controls hermescolorspace, not colorspace.

Browse source 
Original commit message from CVS:
* configure.ac: the Hermes library controls hermescolorspace, not
colorspace.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init),
(gst_mpeg2dec_init): minor pet peeve: disable code with #ifdef,
not /* */
* ext/sdl/sdlvideosink.c: Change XID to unsigned long.
* ext/sdl/sdlvideosink.h: ditto.
* gst/colorspace/gstcolorspace.c: Fix old comments about Hermes
This commit is contained in:
David Schleef 2004-03-13 00:19:26 +00:00
parent be9994c745
commit 0b5b176e1e
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,14 @@
2004-03-12 David Schleef <ds@schleef.org>
* configure.ac: the Hermes library controls hermescolorspace, not
colorspace.
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init),
(gst_mpeg2dec_init): minor pet peeve: disable code with #ifdef,
not /* */
* ext/sdl/sdlvideosink.c: Change XID to unsigned long.
* ext/sdl/sdlvideosink.h: ditto.
* gst/colorspace/gstcolorspace.c: Fix old comments about Hermes
2004-03-12 Benjamin Otte <otte@gnome.org> 2004-03-12 Benjamin Otte <otte@gnome.org>
* gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id), * gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id),
@ -89,7 +100,7 @@
2004-03-09 David Schleef <ds@schleef.org> 2004-03-09 David Schleef <ds@schleef.org>
* ext/alsa/gstalsa.c: (gst_alsa_request_new_pad), * ext/alsa/gstalsa.c: (gst_alsa_request_new_pad),
(gst_alsa_fixate): Add fixate function. (bug #135719) (gst_alsa_fixate): Add fixate function. (bug #136686)
* ext/alsa/gstalsa.h: * ext/alsa/gstalsa.h:
* ext/alsa/gstalsasink.c: (gst_alsa_sink_init): * ext/alsa/gstalsasink.c: (gst_alsa_sink_init):

2
configure.ac
View file

@ -913,7 +913,7 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
dnl *** Hermes *** dnl *** Hermes ***
translit(dnm, m, l) AM_CONDITIONAL(USE_HERMES, true) translit(dnm, m, l) AM_CONDITIONAL(USE_HERMES, true)
GST_CHECK_FEATURE(HERMES, [Hermes library], colorspace, [ GST_CHECK_FEATURE(HERMES, [Hermes library], hermescolorspace, [
GST_CHECK_LIBHEADER(HERMES, Hermes, Hermes_ConverterInstance, , Hermes/Hermes.h, HERMES_LIBS="-lHermes") GST_CHECK_LIBHEADER(HERMES, Hermes, Hermes_ConverterInstance, , Hermes/Hermes.h, HERMES_LIBS="-lHermes")
], AC_SUBST(HERMES_LIBS)) ], AC_SUBST(HERMES_LIBS))

16
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -74,7 +74,7 @@ GST_STATIC_PAD_TEMPLATE (
"25.0, 29.970030, 30.0, 50.0, 59.940060, 60.0 }") "25.0, 29.970030, 30.0, 50.0, 59.940060, 60.0 }")
); );
/* #ifdef enable_user_data
static GstStaticPadTemplate user_data_template_factory = static GstStaticPadTemplate user_data_template_factory =
GST_STATIC_PAD_TEMPLATE ( GST_STATIC_PAD_TEMPLATE (
"user_data", "user_data",
@ -82,7 +82,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY GST_STATIC_CAPS_ANY
); );
*/ #endif
static GstStaticPadTemplate sink_template_factory = static GstStaticPadTemplate sink_template_factory =
GST_STATIC_PAD_TEMPLATE ( GST_STATIC_PAD_TEMPLATE (
@ -162,9 +162,9 @@ gst_mpeg2dec_base_init (gpointer g_class)
gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template_factory));
gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template_factory));
/* #ifdef enable_user_data
gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&user_data_template_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&user_data_template_factory));
*/ #endif
gst_element_class_set_details (element_class, &gst_mpeg2dec_details); gst_element_class_set_details (element_class, &gst_mpeg2dec_details);
} }
@ -210,11 +210,11 @@ gst_mpeg2dec_init (GstMpeg2dec *mpeg2dec)
gst_pad_set_query_function (mpeg2dec->srcpad, GST_DEBUG_FUNCPTR (gst_mpeg2dec_src_query)); gst_pad_set_query_function (mpeg2dec->srcpad, GST_DEBUG_FUNCPTR (gst_mpeg2dec_src_query));
gst_pad_set_convert_function (mpeg2dec->srcpad, GST_DEBUG_FUNCPTR (gst_mpeg2dec_convert_src)); gst_pad_set_convert_function (mpeg2dec->srcpad, GST_DEBUG_FUNCPTR (gst_mpeg2dec_convert_src));
/* #ifdef enable_user_data
mpeg2dec->userdatapad = gst_pad_new_from_template ( mpeg2dec->userdatapad = gst_pad_new_from_template (
gst_static_pad_template_get (&user_data_template_factory), "user_data"); gst_static_pad_template_get (&user_data_template_factory), "user_data");
gst_element_add_pad (GST_ELEMENT (mpeg2dec), mpeg2dec->userdatapad); gst_element_add_pad (GST_ELEMENT (mpeg2dec), mpeg2dec->userdatapad);
*/ #endif
/* initialize the mpeg2dec acceleration */ /* initialize the mpeg2dec acceleration */
mpeg2_accel (MPEG2_ACCEL_DETECT); mpeg2_accel (MPEG2_ACCEL_DETECT);
@ -642,7 +642,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstData *_data)
/* /*
* FIXME: should pass more information such as state the user data is from * FIXME: should pass more information such as state the user data is from
*/ */
/* #ifdef enable_user_data
if (info->user_data_len > 0) { if (info->user_data_len > 0) {
if (GST_PAD_IS_USABLE (mpeg2dec->userdatapad)) { if (GST_PAD_IS_USABLE (mpeg2dec->userdatapad)) {
GstBuffer *udbuf = gst_buffer_new_and_alloc (info->user_data_len); GstBuffer *udbuf = gst_buffer_new_and_alloc (info->user_data_len);
@ -652,7 +652,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstData *_data)
gst_pad_push (mpeg2dec->userdatapad, GST_DATA (udbuf)); gst_pad_push (mpeg2dec->userdatapad, GST_DATA (udbuf));
} }
} }
*/ #endif
} }
exit: exit:
gst_buffer_unref(buf); gst_buffer_unref(buf);