| commit | fc32901189f8655d3d51064a0366ec9d8264940d | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:46:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 01:46:14 2017 +0000 |
| tree | 959a381244371a100be88da6d4ec433cd5fb718d | |
| parent | 4679313133edebc90b42f2b5f35ce2090d09fa52 [diff] | |
| parent | dcca7ebd8b2a3e1584827d31838a1798df925df3 [diff] |
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b Change-Id: Iaa6232308cbca7ebb61d43c76df9e15e6ef19b1c
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index d57efee..93d4f57 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp
@@ -127,7 +127,7 @@ private: enum { - kMaxCttsOffsetTimeUs = 2000000LL, // 2 seconds + kMaxCttsOffsetTimeUs = 1000000LL, // 1 second kSampleArraySize = 1000, };