From 49a862ec4cba4060f9897ceb24b215d316bc0544 Mon Sep 17 00:00:00 2001
From: Per <perkj@chromium.org>
Date: Tue, 7 Apr 2015 14:16:09 +0200
Subject: [PATCH] Return pending buffers to Java VideoCapturerAndroid if camera
 is stopping BUG=4510 R=magjed@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/45009005

Cr-Commit-Position: refs/heads/master@{#8935}
---
 talk/app/webrtc/java/jni/androidvideocapturer_jni.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
index 4fa23f3516..88cc31bc52 100644
--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
@@ -176,6 +176,8 @@ void AndroidVideoCapturerJni::OnIncomingFrame_w(void* video_frame,
   DCHECK(thread_checker_.CalledOnValidThread());
   if (capturer_)
     capturer_->OnIncomingFrame(video_frame, length, rotation, time_stamp);
+  else
+    ReturnBuffer_w(time_stamp);
 }
 
 JNIEnv* AndroidVideoCapturerJni::jni() { return AttachCurrentThreadIfNeeded(); }