ogg: Fix a heap buffer overflow.

[vlc] / modules / video_output / Modules.am

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 2db873f97e0f934af098d12ade19ead0892443c8..426b60fc374723beba336424710bdecd20b9ec5e 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -8,13 +8,12 @@ SOURCES_aa = aa.c
 SOURCES_caca = caca.c
 SOURCES_fb = fb.c
 SOURCES_vout_sdl = sdl.c
-SOURCES_snapshot = snapshot.c
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
 SOURCES_vout_macosx = macosx.m opengl.h opengl.c
 SOURCES_vout_ios = ios.m opengl.h opengl.c
-
+SOURCES_android_surface = androidsurface.c
 
 ### OpenGL ###
 # TODO: merge all three source files (?)
@@ -38,8 +37,6 @@ EXTRA_LTLIBRARIES += \
        libgles1_plugin.la \
        libgl_plugin.la
 libvlc_LTLIBRARIES += \
-       $(LTLIBgles2) \
-       $(LTLIBgles1) \
        $(LTLIBgl)
 
 
@@ -73,13 +70,14 @@ libxcb_glx_plugin_la_SOURCES = \
        opengl.c \
        xcb/events.c
 libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
-       $(XLIB_XCB_CFLAGS) $(GL_CFLAGS)
+       $(XCB_CFLAGS) $(GL_CFLAGS)
 libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(XLIB_XCB_LIBS) $(GL_LIBS)
+       $(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
 libxcb_glx_plugin_la_DEPENDENCIES =
 
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(CFLAGS_xcb_window) \
        $(XPROTO_CFLAGS) \
        $(XCB_CFLAGS) \
        $(XCB_KEYSYMS_CFLAGS)
@@ -110,6 +108,19 @@ if HAVE_WIN32
 libvlc_LTLIBRARIES += libdrawable_plugin.la
 endif
 
+### OS/2 ###
+if HAVE_OS2
+libvlc_LTLIBRARIES += libdrawable_plugin.la
+endif
+
+libkva_plugin_la_SOURCES = kva.c
+libkva_plugin_la_CFLAGS = $(AM_CFLAGS)
+libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS)
+libkva_plugin_la_DEPENDENCIES =
+if HAVE_KVA
+libvlc_LTLIBRARIES += libkva_plugin.la
+endif
+
 ### EGL ###
 libegl_plugin_la_SOURCES = egl.c
 libegl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
@@ -122,6 +133,12 @@ EXTRA_LTLIBRARIES += libegl_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBegl)
 
 ### Common ###
+libvdummy_plugin_la_SOURCES = vdummy.c
+libvdummy_plugin_la_CFLAGS = $(AM_CFLAGS)
+libvdummy_plugin_la_LIBADD = $(AM_LIBADD)
+libvdummy_plugin_la_DEPENDENCIES =
+
 libvlc_LTLIBRARIES += \
+       libvdummy_plugin.la \
        libvmem_plugin.la \
        libyuv_plugin.la