amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 18:50:20 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
xiongziliang 2017-08-03 14:59:22 +08:00
parent dd168e82f6
commit a8b7d53f87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H264/ranges.h
View File

@ -96,7 +96,7 @@ namespace media {
// original loop went too far. // original loop went too far.
while ((i + 1) < ranges_.size() && while ((i + 1) < ranges_.size() &&
ranges_[i + 1].first <= ranges_[i].second) { ranges_[i + 1].first <= ranges_[i].second) {
ranges_[i].second = std::max(ranges_[i].second, ranges_[i + 1].second); ranges_[i].second = max(ranges_[i].second, ranges_[i + 1].second);
ranges_.erase(ranges_.begin() + i + 1); ranges_.erase(ranges_.begin() + i + 1);
} }
@ -133,8 +133,8 @@ namespace media {
size_t j = 0; size_t j = 0;
while (i < size() && j < other.size()) { while (i < size() && j < other.size()) {
T max_start = std::max(start(i), other.start(j)); T max_start = max(start(i), other.start(j));
T min_end = std::min(end(i), other.end(j)); T min_end = min(end(i), other.end(j));
// Add an intersection range to the result if the ranges overlap. // Add an intersection range to the result if the ranges overlap.
if (max_start < min_end) if (max_start < min_end)