summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2010-08-04 15:39:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-04 15:39:55 -0700
commit533dc7866c19327e31ec6a13e36b997bcc74a650 (patch)
tree087f4e227f938024c8e9390ed4eb418e44e0e92b
parentd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea (diff)
parent7d146197873e9bd5c1618a4ae10bcd13c821e1ce (diff)
am 7d146197: Merge "Fix divide by zero." into gingerbread
Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp * commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce': Fix divide by zero.
-rw-r--r--media/libstagefright/OggExtractor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index c267a23e83a9..16f094b2abd1 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -361,7 +361,7 @@ status_t MyVorbisExtractor::readNextPacket(MediaBuffer **out) {
memcpy(tmp->data(), buffer->data(), buffer->range_length());
tmp->set_range(0, buffer->range_length());
buffer->release();
- } else {
+ } else if (mVi.rate) {
// XXX Not only is this not technically the correct time for
// this packet, we also stamp every packet in this page
// with the same time. This needs fixing later.