Skip to content

Fix flag comparisons in FindPacket #473

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
arch1t3cht wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −2
Open

Fix flag comparisons in FindPacket #473

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c17355
Fix flag comparisons in FindPacket
arch1t3cht Apr 23, 2026
ed80530
Don't try to find EOF packets in FindPacket
arch1t3cht Apr 23, 2026
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
9 changes: 7 additions & 2 deletions src/core/track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ const std::array<std::vector<AVPacketProp>, 5> FindPacketCheckSequence = {{
// If examples come up where this fallback sequence becomes relevant, it can
// be adjusted.
int FFMS_Track::FindPacket(const AVPacket &packet) const {
if (!packet.data && !packet.side_data_elems) {
// Empty packet signaling EOF
return -1;
}

FrameInfo F;
F.PTS = UseDTS ? packet.dts : packet.pts;

Expand Down Expand Up @@ -213,9 +218,9 @@ int FFMS_Track::FindPacket(const AVPacket &packet) const {
case AVPacketProp::Pos:
return it->FilePos == packet.pos;
case AVPacketProp::Hidden:
return it->MarkedHidden == (packet.flags & AV_PKT_FLAG_DISCARD);
return it->MarkedHidden == !!(packet.flags & AV_PKT_FLAG_DISCARD);
case AVPacketProp::Key:
return it->KeyFrame == (packet.flags & AV_PKT_FLAG_KEY);
return it->KeyFrame == !!(packet.flags & AV_PKT_FLAG_KEY);
}
return false;
});
Expand Down
Loading