[go: up one dir, main page]

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

Backport #12562 and #12521 #12602

Merged
merged 2 commits into from
Sep 7, 2024
Merged

Backport #12562 and #12521 #12602

merged 2 commits into from
Sep 7, 2024

Conversation

gnattu
Copy link
Member
@gnattu gnattu commented Sep 7, 2024

Changes

This is a manual back-port of #12562 and #12521

Issues

@gnattu gnattu requested review from a team September 7, 2024 01:23
@dmitrylyzo
Copy link
Contributor

videoStream?.Codec -> videoCodecs.

i.ContainsAnyCodec(videoStream?.Codec, container, useSubContainer) &&

I would do a backport, keeping Nyan as the author, but I'm not sure which author would be taken when squashing.

@gnattu
Copy link
Member Author
gnattu commented Sep 7, 2024

videoStream?.Codec -> videoCodecs.

i.ContainsAnyCodec(videoStream?.Codec, container, useSubContainer) &&

I would do a backport, keeping Nyan as the author, but I'm not sure which author would be taken when squashing.

This change is intentional as that is what we did to 10.9, or something has changed since then.

I would do a backport, keeping Nyan as the author, but I'm not sure which author would be taken when squashing.

Can this be done by PR though? I think this needs to commit to master directly?

nyanmisaka and others added 2 commits September 7, 2024 15:48
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
Signed-off-by: gnattu <gnattuoc@me.com>
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
Signed-off-by: gnattu <gnattuoc@me.com>
@dmitrylyzo
Copy link
Contributor

This change is intentional as that is what we did to 10.9, or something has changed since then.

https://github.com/jellyfin/jellyfin/pull/12562/files#diff-bde118dfa6110f699ead01698c41be0bb9b4b7690a4a0adaf62ad0697ef61d69R900
It just requires the change from the previous PR: https://github.com/jellyfin/jellyfin/pull/12521/files#diff-bde118dfa6110f699ead01698c41be0bb9b4b7690a4a0adaf62ad0697ef61d69R900

Can this be done by PR though? I think this needs to commit to master directly?

I would cherry-pick Nyan's commit and fix conflicts. Or you can just copy stats from the commit using -C flag for Git CLI.

@gnattu gnattu changed the title Backport #12562 Backport #12562 and #12521 Sep 7, 2024
@crobibero crobibero merged commit df00909 into jellyfin:master Sep 7, 2024
18 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.

5 participants