vlc | branch: master | Romain Vimont <[email protected]> | Thu Dec 5 15:40:07 2019 +0100| [888451fe5146a49de8d49e830dbe57dd478e358f] | committer: Thomas Guillem
opengl: rename converter_*.c to interop_*.c The "converter" modules are now only "interop" modules. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=888451fe5146a49de8d49e830dbe57dd478e358f --- modules/video_output/Makefile.am | 10 +++++----- .../opengl/{converter_android.c => interop_android.c} | 0 .../video_output/opengl/{converter_cvpx.c => interop_cvpx.c} | 0 modules/video_output/opengl/{converter_sw.c => interop_sw.c} | 0 .../video_output/opengl/{converter_vaapi.c => interop_vaapi.c} | 0 .../video_output/opengl/{converter_vdpau.c => interop_vdpau.c} | 0 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index baf7818cac..7d0bfbdd1f 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -7,7 +7,7 @@ OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \ video_output/opengl/gl_common.h video_output/opengl/interop.h \ video_output/opengl/vout_helper.h video_output/opengl/converter.h \ video_output/opengl/internal.h video_output/opengl/fragment_shaders.c \ - video_output/opengl/converter_sw.c + video_output/opengl/interop_sw.c if HAVE_LIBPLACEBO OPENGL_COMMONSOURCES += video_output/placebo_utils.c video_output/placebo_utils.h endif @@ -30,7 +30,7 @@ libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread vout_LTLIBRARIES += libdecklinkoutput_plugin.la endif -libglconv_cvpx_plugin_la_SOURCES = video_output/opengl/converter_cvpx.c \ +libglconv_cvpx_plugin_la_SOURCES = video_output/opengl/interop_cvpx.c \ video_output/opengl/interop.h libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' @@ -86,13 +86,13 @@ libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS libgl_plugin_la_LIBADD += $(GL_LIBS) endif -libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \ +libglconv_vaapi_plugin_la_SOURCES = video_output/opengl/interop_vaapi.c \ video_output/opengl/interop.h \ hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h libglconv_vaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) libglconv_vaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) -libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \ +libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/interop_vdpau.c \ video_output/opengl/interop.h hw/vdpau/picture.c hw/vdpau/vlc_vdpau.h libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11 @@ -279,7 +279,7 @@ libandroid_display_plugin_la_SOURCES = video_output/android/display.c \ libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS) libandroid_display_plugin_la_LIBADD = $(LIBDL) -libglconv_android_plugin_la_SOURCES = video_output/opengl/converter_android.c \ +libglconv_android_plugin_la_SOURCES = video_output/opengl/interop_android.c \ video_output/opengl/interop.h libglconv_android_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2 diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/interop_android.c similarity index 100% rename from modules/video_output/opengl/converter_android.c rename to modules/video_output/opengl/interop_android.c diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/interop_cvpx.c similarity index 100% rename from modules/video_output/opengl/converter_cvpx.c rename to modules/video_output/opengl/interop_cvpx.c diff --git a/modules/video_output/opengl/converter_sw.c b/modules/video_output/opengl/interop_sw.c similarity index 100% rename from modules/video_output/opengl/converter_sw.c rename to modules/video_output/opengl/interop_sw.c diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/interop_vaapi.c similarity index 100% rename from modules/video_output/opengl/converter_vaapi.c rename to modules/video_output/opengl/interop_vaapi.c diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/interop_vdpau.c similarity index 100% rename from modules/video_output/opengl/converter_vdpau.c rename to modules/video_output/opengl/interop_vdpau.c _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
