Skip to content
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.

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

demux_playlist: fix comparison for current file if it's in current dir #15164

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

llyyr
Copy link
Contributor

@llyyr llyyr commented Oct 23, 2024

when the file is in the current directory, p->real_stream->path points
directly to the path, while path includes "./". Neither include "./" in
any other situation

Fixes: c201c48

Copy link

github-actions bot commented Oct 23, 2024

Download the artifacts for this pull request:

Windows
macOS

@llyyr llyyr changed the title demux_playlist: fix comparison between path and basename demux_playlist: fix comparison for current file if it's in current dir Oct 23, 2024
@llyyr
Copy link
Contributor Author

llyyr commented Oct 23, 2024

@kasper93 do you have any better ideas to fix this?

@llyyr llyyr force-pushed the fix-autocreate branch 3 times, most recently from 3e1a4d7 to 6c610e0 Compare October 23, 2024 18:27
demux/demux_playlist.c Outdated Show resolved Hide resolved
When the file is in the current working directory, stream->path points
the path user passed as arg, so it may or may not include './'.

Strip it from both to make the comparison work

Fixes: c201c48
llyyr added a commit to llyyr/mpv that referenced this pull request Oct 23, 2024
@kasper93 kasper93 merged commit c5561b8 into mpv-player:master Oct 24, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants