diff options
author | Andreas Huber <andih@google.com> | 2011-04-04 12:45:23 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-04 12:45:23 -0700 |
commit | 7fb4b427d5fca79c09d69b212ddca41539c215a2 (patch) | |
tree | 76e0d913dfdfc18fc07348a003b4dc35c0ffec81 /media/libstagefright/AudioPlayer.cpp | |
parent | bd7b7177f88ae6e83bd7bb8bfd9b7018be923931 (diff) | |
parent | 51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444 (diff) | |
download | frameworks_av-7fb4b427d5fca79c09d69b212ddca41539c215a2.zip frameworks_av-7fb4b427d5fca79c09d69b212ddca41539c215a2.tar.gz frameworks_av-7fb4b427d5fca79c09d69b212ddca41539c215a2.tar.bz2 |
Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491"
Diffstat (limited to 'media/libstagefright/AudioPlayer.cpp')
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 07b9522..fcea848 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -306,9 +306,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { } if (mReachedEOS) { - memset(data, 0, size); - - return size; + return 0; } bool postSeekComplete = false; |