diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-13 08:54:08 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-13 08:54:08 +0000 |
| commit | 1aea3ef36381297e6866a1a28b73e05804d5168e (patch) | |
| tree | 91e50e47ff4d13a175bb0a9726bfa31b84cd8891 | |
| parent | d49970264602af7be39612f46bd3f9eca297a24b (diff) | |
| download | gst-plugins-bad-1aea3ef36381297e6866a1a28b73e05804d5168e.tar.gz gst-plugins-bad-1aea3ef36381297e6866a1a28b73e05804d5168e.tar.bz2 gst-plugins-bad-1aea3ef36381297e6866a1a28b73e05804d5168e.zip | |
gst/videoparse/Makefile.am: Add $(GST_PLUGINS_BASE_CFLAGS) to CFLAGS to fix the build.
Original commit message from CVS:
* gst/videoparse/Makefile.am:
Add $(GST_PLUGINS_BASE_CFLAGS) to CFLAGS to fix the build.
* gst/videoparse/gstvideoparse.c: (gst_video_parse_init),
(gst_video_parse_set_property), (gst_video_parse_get_property):
Use g_value_[sg]et_enum() for enum properties, g_value_[sg]et_int()
gives a g_critical().
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst/videoparse/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/videoparse/gstvideoparse.c | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,13 @@ +2007-12-13 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/videoparse/Makefile.am: + Add $(GST_PLUGINS_BASE_CFLAGS) to CFLAGS to fix the build. + + * gst/videoparse/gstvideoparse.c: (gst_video_parse_init), + (gst_video_parse_set_property), (gst_video_parse_get_property): + Use g_value_[sg]et_enum() for enum properties, g_value_[sg]et_int() + gives a g_critical(). + 2007-12-12 David Schleef <ds@schleef.org> * gst/videoparse/README: diff --git a/gst/videoparse/Makefile.am b/gst/videoparse/Makefile.am index 7cc5fd2a..0e95a016 100644 --- a/gst/videoparse/Makefile.am +++ b/gst/videoparse/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstvideoparse.la libgstvideoparse_la_SOURCES = gstvideoparse.c -libgstvideoparse_la_CFLAGS = $(GST_CFLAGS) +libgstvideoparse_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstvideoparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstvideoparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/videoparse/gstvideoparse.c b/gst/videoparse/gstvideoparse.c index 790ea594..8c663cb7 100644 --- a/gst/videoparse/gstvideoparse.c +++ b/gst/videoparse/gstvideoparse.c @@ -234,7 +234,7 @@ gst_video_parse_init (GstVideoParse * vp, GstVideoParseClass * g_class) vp->width = 320; vp->height = 240; - vp->format = 0; + vp->format = GST_VIDEO_PARSE_FORMAT_I420; vp->par_n = 1; vp->par_d = 1; vp->fps_n = 25; @@ -265,7 +265,7 @@ gst_video_parse_set_property (GObject * object, guint prop_id, vp->height = g_value_get_int (value); break; case ARG_FORMAT: - vp->format = g_value_get_int (value); + vp->format = g_value_get_enum (value); break; case ARG_FRAMERATE: vp->fps_n = gst_value_get_fraction_numerator (value); @@ -296,7 +296,7 @@ gst_video_parse_get_property (GObject * object, guint prop_id, GValue * value, g_value_set_int (value, vp->height); break; case ARG_FORMAT: - g_value_set_int (value, vp->format); + g_value_set_enum (value, vp->format); break; case ARG_FRAMERATE: gst_value_set_fraction (value, vp->fps_n, vp->fps_d); |