diff options
| author | Marco Nelissen <marcone@google.com> | 2010-08-04 15:37:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-04 15:37:37 -0700 |
| commit | f196d3ed76f38b131a89390bec12ff0152fb3727 (patch) | |
| tree | 001eb9d9652649169f8d178f9f1c7a67affaacd0 /media | |
| parent | 979c6c9720d8861375570b81222e55c43bb2838d (diff) | |
| parent | e8c07d18201ac6d3a5458a2e15e5129159a1429e (diff) | |
| download | frameworks_av-f196d3ed76f38b131a89390bec12ff0152fb3727.zip frameworks_av-f196d3ed76f38b131a89390bec12ff0152fb3727.tar.gz frameworks_av-f196d3ed76f38b131a89390bec12ff0152fb3727.tar.bz2 | |
Merge "Fix divide by zero." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OggExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp index c267a23..16f094b 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. |