| commit | ddc0123df747c3911da9e25645d892e92319c10b | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Aug 04 01:46:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 01:46:13 2017 +0000 |
| tree | 2606c6f9d9ce87799f0a8d2ac60a263188da4a07 | |
| parent | ca5104eb946179b7659f42e027ca2adb4bcc15e2 [diff] | |
| parent | dcca7ebd8b2a3e1584827d31838a1798df925df3 [diff] |
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b Change-Id: I6ef1beaa0ccae2312260164cc9687105f06810af
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, };