diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-09-23 09:08:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 09:08:11 -0700 |
| commit | 3d5ec85e29edfa0639290610044517bec269c7df (patch) | |
| tree | c0eca34588f66fb2a2e2b3d43e80a2c902b8d418 /media | |
| parent | e2c10206a506381ecd466e050f8b5cdf87db7100 (diff) | |
| parent | 3e9bf4061475ae0d01c57e32c13e63808aa3e31f (diff) | |
| download | frameworks_av-3d5ec85e29edfa0639290610044517bec269c7df.zip frameworks_av-3d5ec85e29edfa0639290610044517bec269c7df.tar.gz frameworks_av-3d5ec85e29edfa0639290610044517bec269c7df.tar.bz2 | |
am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer, // 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 |