commit 91d34137903c278e5e077fa1edef9bbbcdd140f7
author Pannag Sanketi <psanketi@google.com> Fri Sep 23 09:08:11 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 23 09:08:11 2011 -0700
tree 170495ea90f215584e1cc52385b4fcf5620d032e
parent 4cd34752cb229f3e1716e1e92f54f58dd847745c
parent 1d71c7b40a7f38487e602e78f45279b6a8364fc9

am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom

* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read

media/libstagefright/SurfaceMediaSource.cpp

diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 306f1f6..2b27ee2 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -764,8 +764,8 @@
     // If the loop was exited as a result of stopping the recording,
     // it is OK
     if (mStopped) {
-        LOGV("Read: SurfaceMediaSource is stopped. Returning NO_INIT;");
-        return NO_INIT;
+        LOGV("Read: SurfaceMediaSource is stopped. Returning ERROR_END_OF_STREAM.");
+        return ERROR_END_OF_STREAM;
     }
 
     // Update the current buffer info