Android: cleanup path in audio_output and egl_surfacetexture vlc_gl_api reference
Merged
requested to merge alexandre-janniaux/vlc:android-cleanup-path-and-eglsurfacetexture/1 into master
The includes were not correct for the android's audio_output files, and egl_surfacetexture is still referencing vlc_gl_api though it has been removed from the public API, and not actually using it internally. Linking was working because of the static build for android, but it's breaking dynamic build.
Merge request reports
Activity
Filter activity
added Platform::Android label
added MRStatus::Reviewable label
added MRStatus::Acceptable label and removed MRStatus::Reviewable label
added MRStatus::Accepted label and removed MRStatus::Acceptable label
MR Acceptance result
This MergeRequest has been Accepted! Congratulations.MR acceptance checks details:
-
MR should be considered mergeable by Gitlab -
Last pipeline should be successful -
MergeRequest should have at least one external review and/or vote -
All threads should be resolved, and score >= 0 -
MergeRequest should have no activity (threads/votes) for (24h/24h)
-
added 11 commits
-
f0c75161...a7ff7c3c - 8 commits from branch
videolan:master
- 56eb26cf - egl_surfacetexture: remove useless vlc_gl_api
- 73e14aff - android: audiotrack: fix path to android/env.h
- d35724bc - android: audioformat: fix path to android/env.h
Toggle commit list-
f0c75161...a7ff7c3c - 8 commits from branch
enabled an automatic merge when all merge checks for d35724bc pass
Please register or sign in to reply