summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts/ESQueue.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-11-15 09:03:03 -0800
committerAndreas Huber <andih@google.com>2010-11-15 09:03:03 -0800
commite332a9181cf6a3155ed1a0fd2afc212ccb1f2753 (patch)
tree71973a8c5dedf9c38180a30b21d90ffff4f92e22 /media/libstagefright/mpeg2ts/ESQueue.cpp
parent2d71233de5450f1b128c8149fdbdf39b937f3cb8 (diff)
downloadframeworks_av-e332a9181cf6a3155ed1a0fd2afc212ccb1f2753.zip
frameworks_av-e332a9181cf6a3155ed1a0fd2afc212ccb1f2753.tar.gz
frameworks_av-e332a9181cf6a3155ed1a0fd2afc212ccb1f2753.tar.bz2
More HTTP live support, AES encryption etc.
Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c related-to-bug: 2368598
Diffstat (limited to 'media/libstagefright/mpeg2ts/ESQueue.cpp')
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index b0b9e66..f11b3c3 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -41,7 +41,10 @@ sp<MetaData> ElementaryStreamQueue::getFormat() {
}
void ElementaryStreamQueue::clear() {
- mBuffer->setRange(0, 0);
+ if (mBuffer != NULL) {
+ mBuffer->setRange(0, 0);
+ }
+
mTimestamps.clear();
mFormat.clear();
}