[vlc-commits] [Git][videolan/vlc][master] 3 commits: egl_surfacetexture: remove useless vlc_gl_api

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
56eb26cf by Alexandre Janniaux at 2025-02-20T05:52:36+00:00
egl_surfacetexture: remove useless vlc_gl_api

- - - - -
73e14aff by Alexandre Janniaux at 2025-02-20T05:52:36+00:00
android: audiotrack: fix path to android/env.h

- - - - -
d35724bc by Alexandre Janniaux at 2025-02-20T05:52:36+00:00
android: audioformat: fix path to android/env.h

- - - - -


3 changed files:

- modules/audio_output/android/audioformat_jni.c
- modules/audio_output/android/audiotrack.c
- modules/video_filter/egl_surfacetexture.c


Changes:

=====================================
modules/audio_output/android/audioformat_jni.c
=====================================
@@ -29,7 +29,7 @@
 #include <vlc_threads.h>
 #include <vlc_modules.h>
 #include <vlc_fourcc.h>
-#include "../video_output/android/env.h"
+#include "../../video_output/android/env.h"
 #include "audioformat_jni.h"
 
 #define THREAD_NAME "android_audio"


=====================================
modules/audio_output/android/audiotrack.c
=====================================
@@ -33,7 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
-#include "../video_output/android/env.h"
+#include "../../video_output/android/env.h"
 #include "device.h"
 #include "audioformat_jni.h"
 #include "dynamicsprocessing_jni.h"


=====================================
modules/video_filter/egl_surfacetexture.c
=====================================
@@ -67,8 +67,6 @@ struct surfacetexture_sys
 
     size_t current_flip;
 
-    struct vlc_gl_api api;
-
     EGLConfig cfgv;
 
     picture_t *current_picture;
@@ -403,14 +401,6 @@ static int Open(vlc_gl_t *gl, unsigned width, unsigned height,
     if (ret != VLC_SUCCESS)
         goto error4;
 
-    ret = vlc_gl_api_Init(&sys->api, gl);
-    if (ret != VLC_SUCCESS)
-    {
-        msg_Err(gl, "Failed to initialize gl_api");
-        vlc_gl_ReleaseCurrent(gl);
-        goto error4;
-    }
-
     struct vlc_gl_extension_vt extension_vt;
     vlc_gl_LoadExtensionFunctions(gl, &extension_vt);
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a7ff7c3c00d4bcd3e1230f46a18485b43af0672b...d35724bc460eec7ab891fa8774482f8e3fd6cd89

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a7ff7c3c00d4bcd3e1230f46a18485b43af0672b...d35724bc460eec7ab891fa8774482f8e3fd6cd89
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance