diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-04 09:32:07 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-04 09:32:07 +0200 |
commit | 23dbb15ff56bb04717613c0797dcc5436a148677 (patch) | |
tree | 6127cd8f7ca145b38676d2304500bcc0d464b81f /sys/v4l2/gstv4l2sink.c | |
parent | 99e2ac121d7252aa858a8e0b2db0872d06ca226c (diff) |
v4l2: Remove some OMAP specific hacks
They require special build flags and are not useful in general.
Diffstat (limited to 'sys/v4l2/gstv4l2sink.c')
-rw-r--r-- | sys/v4l2/gstv4l2sink.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c index b0dff5e6..fd792cd7 100644 --- a/sys/v4l2/gstv4l2sink.c +++ b/sys/v4l2/gstv4l2sink.c @@ -624,14 +624,7 @@ gst_v4l2sink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size, V4L2_BUF_TYPE_VIDEO_OUTPUT))) { return GST_FLOW_ERROR; } -#ifdef OMAPZOOM - if (!gst_v4l2_object_start_streaming (v4l2sink->v4l2object)) { - return GST_FLOW_ERROR; - } - v4l2sink->state = STATE_STREAMING; -#else v4l2sink->state = STATE_PENDING_STREAMON; -#endif GST_INFO_OBJECT (v4l2sink, "outputting buffers via mmap()"); @@ -693,14 +686,12 @@ gst_v4l2sink_show_frame (GstBaseSink * bsink, GstBuffer * buf) if (!gst_v4l2_buffer_pool_qbuf (v4l2sink->pool, GST_V4L2_BUFFER (buf))) { return GST_FLOW_ERROR; } -#ifndef OMAPZOOM if (v4l2sink->state == STATE_PENDING_STREAMON) { if (!gst_v4l2_object_start_streaming (v4l2sink->v4l2object)) { return GST_FLOW_ERROR; } v4l2sink->state = STATE_STREAMING; } -#endif if (!newbuf) { gst_buffer_ref (buf); |