| commit | b5ba1eb0a07c35fa4d5596b3e2dae5dfba39a9b6 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Wed Oct 02 18:05:02 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 02 18:05:02 2019 +0000 |
| tree | bb45fd9230ae7dfabc91da5bc16a6863e50cb4cc | |
| parent | e9ad58533c38be8ec0f7c9ebd3b2e6e850354f82 [diff] | |
| parent | af609f933c95bb7d42939714c6143a0dbf0ee0f8 [diff] |
Merge "Fix comparing int32_t with INT64_MIN"
diff --git a/media/extractors/mp4/SampleIterator.cpp b/media/extractors/mp4/SampleIterator.cpp index 2890b26..0967652 100644 --- a/media/extractors/mp4/SampleIterator.cpp +++ b/media/extractors/mp4/SampleIterator.cpp
@@ -355,7 +355,7 @@ if (offset > 0) { *time += offset; } else { - *time -= (offset == INT64_MIN ? INT64_MAX : (-offset)); + *time -= (offset == INT32_MIN ? INT64_MAX : (-offset)); } *duration = mTTSDuration;