diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 873c2aa..2c94965 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2004,9 +2004,12 @@
                (const uint8_t *)srcBuffer->data() + srcBuffer->range_offset(),
                srcBuffer->range_length());
 
+        int64_t lastBufferTimeUs;
+        CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &lastBufferTimeUs));
+        CHECK(timestampUs >= 0);
+
         if (offset == 0) {
-            CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &timestampUs));
-            CHECK(timestampUs >= 0);
+            timestampUs = lastBufferTimeUs;
         }
 
         offset += srcBuffer->range_length();
@@ -2019,6 +2022,13 @@
         if (!(mQuirks & kSupportsMultipleFramesPerInputBuffer)) {
             break;
         }
+
+        int64_t coalescedDurationUs = lastBufferTimeUs - timestampUs;
+
+        if (coalescedDurationUs > 250000ll) {
+            // Don't coalesce more than 250ms worth of encoded data at once.
+            break;
+        }
     }
 
     if (n > 1) {