public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: "Bård Eirik Winther" <bwinther@cisco.com>
To: linux-media@vger.kernel.org
Subject: Re: [PATCHv2 FINAL 6/6] qv4l2: add OpenGL rendering
Date: Thu, 01 Aug 2013 13:05:34 +0200	[thread overview]
Message-ID: <1688697.agkONg0tYT@bwinther> (raw)
In-Reply-To: <fc31f05e803a960fbe31bd3b150567ff4fc3b362.1375172029.git.bwinther@cisco.com>

On Tuesday, July 30, 2013 10:15:24 AM you wrote:
> [PATCHv2 FINAL 6/6] qv4l2: add OpenGL rendering
>From 505e803da95dd7c4aeb9d7ec4661c83bb743da1e Mon Sep 17 00:00:00 2001
Message-Id: <505e803da95dd7c4aeb9d7ec4661c83bb743da1e.1375355021.git.bwinther@cisco.com>
From: =?UTF-8?q?B=C3=A5rd=20Eirik=20Winther?= <bwinther@cisco.com>
Date: Thu, 1 Aug 2013 13:02:43 +0200
Subject: [PATCH] qv4l2: fix compile error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a compile error caused when opengl is not available

Signed-off-by: Bård Eirik Winther <bwinther@cisco.com>
---
 utils/qv4l2/capture-win-gl.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp
index 807d9e9..52412c7 100644
--- a/utils/qv4l2/capture-win-gl.cpp
+++ b/utils/qv4l2/capture-win-gl.cpp
@@ -26,7 +26,9 @@
 
 CaptureWinGL::CaptureWinGL()
 {
+#ifdef ENABLE_GL
 	CaptureWin::buildWindow(&m_videoSurface);
+#endif
 	CaptureWin::setWindowTitle("V4L2 Capture (OpenGL)");
 }
 
-- 
1.8.3.2



  reply	other threads:[~2013-08-01 11:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30  8:15 [PATCHv2 FINAL 0/6] qv4l2: add OpenGL rendering and window fixes Bård Eirik Winther
2013-07-30  8:15 ` [PATCHv2 FINAL 1/6] qv4l2: move function ctrlEvent Bård Eirik Winther
2013-07-30  8:15   ` [PATCHv2 FINAL 2/6] qv4l2: add hotkeys for common operations Bård Eirik Winther
2013-07-30 12:39     ` Mauro Carvalho Chehab
2013-07-30  8:15   ` [PATCHv2 FINAL 3/6] qv4l2: fix minimum size in capture win to frame size Bård Eirik Winther
2013-07-30  8:15   ` [PATCHv2 FINAL 4/6] qv4l2: add Capture menu Bård Eirik Winther
2013-07-30  8:15   ` [PATCHv2 FINAL 5/6] qv4l2: new modular capture window design Bård Eirik Winther
2013-07-30  8:15   ` [PATCHv2 FINAL 6/6] qv4l2: add OpenGL rendering Bård Eirik Winther
2013-08-01 11:05     ` Bård Eirik Winther [this message]
2013-07-30 13:12 ` [PATCHv2 FINAL 0/6] qv4l2: add OpenGL rendering and window fixes Mauro Carvalho Chehab
2013-07-31  5:57   ` Bård Eirik Winther
2013-07-31 10:58     ` Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1688697.agkONg0tYT@bwinther \
    --to=bwinther@cisco.com \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox