summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-04-30 09:16:07 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-09-13 16:29:46 +0200
commit2f8c13323c5ca6b944711b9dd033d2151a466581 (patch)
tree81ac8c08c9c302b5bff20cf3f84c50d30d0db7bd
parent438b53e7f2152bde8e3a5b90d627af3c77d143d1 (diff)
downloadgst-plugins-good-2f8c13323c5ca6b944711b9dd033d2151a466581.tar.gz
gst-plugins-good-2f8c13323c5ca6b944711b9dd033d2151a466581.tar.xz
v4l2: fix broken boolean expression to detect non-frame buffers
https://bugzilla.gnome.org/show_bug.cgi?id=699294
-rw-r--r--sys/v4l2/gstv4l2object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 678645c11..4ac95d96b 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -2536,7 +2536,7 @@ gst_v4l2_object_copy (GstV4l2Object * v4l2object, GstBuffer * dest,
{
const GstVideoFormatInfo *finfo = v4l2object->info.finfo;
- if (finfo && (finfo->format != GST_VIDEO_FORMAT_UNKNOWN ||
+ if (finfo && (finfo->format != GST_VIDEO_FORMAT_UNKNOWN &&
finfo->format != GST_VIDEO_FORMAT_ENCODED)) {
GstVideoFrame src_frame, dest_frame;