From 3b48ccfc4f015fd87090ae8ed5c84fa719d3ec5b Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Thu, 5 Feb 2015 18:24:02 +0100
Subject: [PATCH] Bug 1129858 - Get the local preview surface (line dropped
 during merge). r=jesup

---
 .../java/src/org/webrtc/videoengine/VideoCaptureAndroid.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
index d3bc984f23e..4a575312a9e 100644
--- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
@@ -206,6 +206,7 @@ public class VideoCaptureAndroid implements PreviewCallback, Callback, AppStateL
         camera = Camera.open();
       }
 
+      localPreview = ViERenderer.GetLocalRenderer();
       if (localPreview != null) {
         localPreview.addCallback(this);
         if (localPreview.getSurface() != null &&