| commit | 71ee06d081d814b079ed22d2e1a50e1a0bbb490e | [log] [tgz] |
|---|---|---|
| author | Hangyu Kuang <hkuang@google.com> | Thu Aug 03 00:52:23 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 03 00:52:23 2017 +0000 |
| tree | 98a90c81a068ae932c2a2e809ac99b129a3639e3 | |
| parent | cab827ee4b250ce0a76a9158f44f58cc8d0e5443 [diff] | |
| parent | 414708370eeb5379c1ec869455ede9e086dc8ef4 [diff] |
Merge "media: Increase the maximum ctts offset to be 2 seconds." into oc-dr1-dev
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 93d4f57..d57efee 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp
@@ -127,7 +127,7 @@ private: enum { - kMaxCttsOffsetTimeUs = 1000000LL, // 1 second + kMaxCttsOffsetTimeUs = 2000000LL, // 2 seconds kSampleArraySize = 1000, };