From d328eea5f20884bd58315fc7299be5e6df0b9f71 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 3 Dec 2014 16:40:49 -0500 Subject: [PATCH] v4l2bufferpool: Cleanup uneeded check and cases There is nothing in between the break and the "done:" anymore, plus USERPTR and DMABUF_IMPORT case is exactly the same. --- sys/v4l2/gstv4l2bufferpool.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c index 340044ef52..55d3a102f6 100644 --- a/sys/v4l2/gstv4l2bufferpool.c +++ b/sys/v4l2/gstv4l2bufferpool.c @@ -1188,20 +1188,13 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer, } case GST_V4L2_IO_DMABUF: case GST_V4L2_IO_MMAP: + case GST_V4L2_IO_USERPTR: + case GST_V4L2_IO_DMABUF_IMPORT: { /* just dequeue a buffer, we basically use the queue of v4l2 as the * storage for our buffers. This function does poll first so we can * interrupt it fine. */ ret = gst_v4l2_buffer_pool_dqbuf (pool, buffer); - if (G_UNLIKELY (ret != GST_FLOW_OK)) - goto done; - break; - } - case GST_V4L2_IO_USERPTR: - case GST_V4L2_IO_DMABUF_IMPORT: - { - /* dequeue filled buffer */ - ret = gst_v4l2_buffer_pool_dqbuf (pool, buffer); break; } default: