summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-29 10:58:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 10:58:24 -0700
commit6db33a9272da8f011be1c51675220b81655fd470 (patch)
tree796c8bf29fb794b6c558b8cb845b06182cdc2fb8 /media
parent4c6c1f1d582a0aae24aa3ecef3fc1166513efba0 (diff)
parent8836f8e0bfc64dce81963db89dfc5d0f11c29483 (diff)
downloadframeworks_av-6db33a9272da8f011be1c51675220b81655fd470.zip
frameworks_av-6db33a9272da8f011be1c51675220b81655fd470.tar.gz
frameworks_av-6db33a9272da8f011be1c51675220b81655fd470.tar.bz2
am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483': MPEG2TSWriter: Read more immediately if an empty buffer is received
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG2TSWriter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG2TSWriter.cpp b/media/libstagefright/MPEG2TSWriter.cpp
index 92f12af..c9ed5bb 100644
--- a/media/libstagefright/MPEG2TSWriter.cpp
+++ b/media/libstagefright/MPEG2TSWriter.cpp
@@ -419,6 +419,8 @@ void MPEG2TSWriter::SourceInfo::onMessageReceived(const sp<AMessage> &msg) {
} else {
postAVCFrame(buffer);
}
+ } else {
+ readMore();
}
buffer->release();