From de799f4d8435d579f8c8ecc1aec6852589a5a6d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aur=C3=A9lien=20Zanelli?= Date: Wed, 23 Jul 2014 18:40:10 +0200 Subject: [PATCH] v4l2sink: use directly 'obj' instead of 'v4l2sink->v4l2object' https://bugzilla.gnome.org/show_bug.cgi?id=733616 --- sys/v4l2/gstv4l2sink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c index 5cc30f7..c25a719 100644 --- a/sys/v4l2/gstv4l2sink.c +++ b/sys/v4l2/gstv4l2sink.c @@ -486,7 +486,7 @@ gst_v4l2sink_set_caps (GstBaseSink * bsink, GstCaps * caps) LOG_CAPS (v4l2sink, caps); - if (!GST_V4L2_IS_OPEN (v4l2sink->v4l2object)) { + if (!GST_V4L2_IS_OPEN (obj)) { GST_DEBUG_OBJECT (v4l2sink, "device is not open"); return FALSE; } @@ -498,7 +498,7 @@ gst_v4l2sink_set_caps (GstBaseSink * bsink, GstCaps * caps) if (!gst_v4l2_object_stop (obj)) goto stop_failed; - if (!gst_v4l2_object_set_format (v4l2sink->v4l2object, caps)) + if (!gst_v4l2_object_set_format (obj, caps)) goto invalid_format; gst_v4l2sink_sync_overlay_fields (v4l2sink); @@ -506,8 +506,8 @@ gst_v4l2sink_set_caps (GstBaseSink * bsink, GstCaps * caps) GST_INFO_OBJECT (v4l2sink, "outputting buffers via mode %u", obj->mode); - v4l2sink->video_width = GST_V4L2_WIDTH (v4l2sink->v4l2object); - v4l2sink->video_height = GST_V4L2_HEIGHT (v4l2sink->v4l2object); + v4l2sink->video_width = GST_V4L2_WIDTH (obj); + v4l2sink->video_height = GST_V4L2_HEIGHT (obj); /* TODO: videosink width/height should be scaled according to * pixel-aspect-ratio -- 2.7.4