Skip to content

Feature/vplay 12902 early attach#1413

Draft
anshephe wants to merge 12 commits into
feature/VPLAY-12902from
feature/VPLAY-12902_early_attach
Draft

Feature/vplay 12902 early attach#1413
anshephe wants to merge 12 commits into
feature/VPLAY-12902from
feature/VPLAY-12902_early_attach

Conversation

@anshephe
Copy link
Copy Markdown
Contributor

@anshephe anshephe commented May 5, 2026

No description provided.

@anshephe
Copy link
Copy Markdown
Contributor Author

anshephe commented May 5, 2026

@copilot resolve the merge conflicts in this pull request

…e/VPLAY-12902_early_attach

# Conflicts:
#	direct-rialto/AampRialtoPlayer.cpp

Co-authored-by: anshephe <115161257+anshephe@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 5, 2026

@copilot resolve the merge conflicts in this pull request

Merge conflicts resolved in commit 74d7e73. The only conflict was in direct-rialto/AampRialtoPlayer.cpp where the EARLY_ATTACH_HARDCODED experimental block from this feature branch was preserved alongside the refactoring changes brought in from feature/VPLAY-12902.

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