summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-12-14 10:11:28 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-14 10:11:28 -0800
commit123e95a584556a64a2e0f9e242f48b9a080750a5 (patch)
tree684ea21a6d4cf973801660be37fbab3bfe99f0cd /media/libstagefright
parent93b47835ef496da664f98949ba3bb6c4583559a6 (diff)
parent763b772bb6bca6a4aaef85cec840fd7061630d61 (diff)
downloadframeworks_av-123e95a584556a64a2e0f9e242f48b9a080750a5.zip
frameworks_av-123e95a584556a64a2e0f9e242f48b9a080750a5.tar.gz
frameworks_av-123e95a584556a64a2e0f9e242f48b9a080750a5.tar.bz2
Merge "Properly signal the condition if we run out of input data."
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/OMXCodec.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 43e4e97..69ab75a 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2675,6 +2675,7 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) {
signalEOS = true;
mFinalStatus = err;
mSignalledEOS = true;
+ mBufferFilled.signal();
break;
}