Skip to content

untrunk uses MacOSx incompatible assert() #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

untrunk uses MacOSx incompatible assert() #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/atom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ void BufferedAtom::write(FileWrite &output, bool force_64) {
offset += to_skip_it->second;
to_skip_it++;
assert(at_end(to_skip_it) || to_skip_it->first > (to_skip_it-1)->first);
assert(offset <= contentSize(), offset, contentSize(), offset-contentSize());
//assert(offset <= contentSize(), offset, contentSize(), offset-contentSize());
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ void Codec::initOnce() {
}

Track* Codec::getTrack() {
assert(track_idx_ >= 0, track_idx_);
//assert(track_idx_ >= 0, track_idx_);
auto r = &g_mp4->tracks_[track_idx_];
assert(r->codec_.name_ == name_, track_idx_, r->codec_.name_, name_);
//assert(r->codec_.name_ == name_, track_idx_, r->codec_.name_, name_);
return r;
}

Expand Down
2 changes: 1 addition & 1 deletion src/mp4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ friend ChunkIt;
start = last_end;
length -= already_skipped;
}
assert(length >= 0, length);
//assert(length >= 0, length);
}

int64_t calcStep(off_t offset);
Expand Down
2 changes: 1 addition & 1 deletion src/track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ void Track::saveSampleToChunk() {
}

void Track::saveChunkOffsets() {
assert(chunks_[0].off_ >= 0, codec_.name_, chunks_[0].off_);
//assert(chunks_[0].off_ >= 0, codec_.name_, chunks_[0].off_);

Atom *co64 = trak_->atomByName("co64");
if (co64) {
Expand Down