From 7eb9fa14d3e8f52ade5dca4ab3583addc4234be2 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 31 Jul 2012 12:15:54 +0400
Subject: [PATCH] Warning fix. ifdefs for 4.1.1 added.

---
 modules/androidcamera/camera_wrapper/camera_wrapper.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
index a2209c875d..c7a55fb39b 100644
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
@@ -58,6 +58,9 @@
 
 using namespace android;
 
+void debugShowFPS();
+
+#if defined(ANDROID_r4_1_1)
 class ConsumerListenerStub: public BufferQueue::ConsumerListener
 {
 public:
@@ -68,6 +71,7 @@ public:
     {
     }
 };
+#endif
 
 void debugShowFPS()
 {
@@ -277,7 +281,7 @@ public:
 
     virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr
 #if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1)
-                          ,camera_frame_metadata_t* metadata
+                          ,camera_frame_metadata_t*
 #endif
                           )
     {