summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-22 10:11:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-22 10:11:51 -0700
commit9dbd5240b3096b6a44525b22d8a10057ce13cec9 (patch)
tree71e0ffeea0b4bae48a6c79d6363b661d2374aa3a /media/libstagefright/include
parenta4d13a5419af68fe5adb521e265f8c80c4e760b1 (diff)
parent15b1eeaf7f694939873bb28a2ef223e6826ef568 (diff)
downloadframeworks_av-9dbd5240b3096b6a44525b22d8a10057ce13cec9.zip
frameworks_av-9dbd5240b3096b6a44525b22d8a10057ce13cec9.tar.gz
frameworks_av-9dbd5240b3096b6a44525b22d8a10057ce13cec9.tar.bz2
Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r--media/libstagefright/include/AVCDecoder.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/include/AVCDecoder.h b/media/libstagefright/include/AVCDecoder.h
index 898c90a..eb3b142 100644
--- a/media/libstagefright/include/AVCDecoder.h
+++ b/media/libstagefright/include/AVCDecoder.h
@@ -82,6 +82,8 @@ private:
void releaseFrames();
+ MediaBuffer *drainOutputBuffer();
+
AVCDecoder(const AVCDecoder &);
AVCDecoder &operator=(const AVCDecoder &);
};