summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/NuMediaExtractor.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-04-17 15:01:10 -0700
committerAndreas Huber <andih@google.com>2012-04-17 15:01:10 -0700
commit4835705370584f6904c80afebcc6e8b9fdb110a5 (patch)
treea6569e176526eb2785a3953801d3dc55d85bd6ac /media/libstagefright/NuMediaExtractor.cpp
parent183058b1515e276a03d5aae28c7814f367a7b330 (diff)
downloadframeworks_av-4835705370584f6904c80afebcc6e8b9fdb110a5.zip
frameworks_av-4835705370584f6904c80afebcc6e8b9fdb110a5.tar.gz
frameworks_av-4835705370584f6904c80afebcc6e8b9fdb110a5.tar.bz2
NuMediaExtractor accidentally returned what looked like errors to the caller...
Change-Id: Iec0c62ba98c8a8afc5cb423a76b8f53778aeb867 related-to-bug: 6276111
Diffstat (limited to 'media/libstagefright/NuMediaExtractor.cpp')
-rw-r--r--media/libstagefright/NuMediaExtractor.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index a1d95e6..166a99f 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -429,7 +429,13 @@ ssize_t NuMediaExtractor::fetchTrackSamples(int64_t seekTimeUs) {
}
status_t NuMediaExtractor::seekTo(int64_t timeUs) {
- return fetchTrackSamples(timeUs);
+ ssize_t minIndex = fetchTrackSamples(timeUs);
+
+ if (minIndex < 0) {
+ return ERROR_END_OF_STREAM;
+ }
+
+ return OK;
}
status_t NuMediaExtractor::advance() {