vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Sep 28 16:13:48 2013 +0300| [c414a2871a6fdfa71fb9711e4bbdac21150ddc07] | committer: Rémi Denis-Courmont
video_chroma: remove recursion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c414a2871a6fdfa71fb9711e4bbdac21150ddc07 --- configure.ac | 1 - modules/Makefile.am | 2 +- modules/video_chroma/Makefile.am | 45 +++++++++++++++++++------------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 6f83f81..75b2cef 100644 --- a/configure.ac +++ b/configure.ac @@ -4201,7 +4201,6 @@ AC_CONFIG_FILES([ modules/packetizer/Makefile modules/stream_out/Makefile modules/text_renderer/Makefile - modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_output/Makefile modules/video_splitter/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index f32e27d..2de5639 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -9,7 +9,6 @@ BASE_SUBDIRS = \ misc \ packetizer \ text_renderer \ - video_chroma \ video_filter \ video_output \ video_splitter \ @@ -44,6 +43,7 @@ include meta_engine/Makefile.am include notify/Makefile.am include services_discovery/Makefile.am include stream_filter/Makefile.am +include video_chroma/Makefile.am BUILT_SOURCES += dummy.cpp diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index f3fd61d..aa1a826 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -1,38 +1,37 @@ -include $(top_srcdir)/modules/common.am chromadir = $(pluginsdir)/video_chroma -libchain_plugin_la_SOURCES = chain.c +libchain_plugin_la_SOURCES = video_chroma/chain.c -libchroma_omx_plugin_la_SOURCES = omxdl.c +libchroma_omx_plugin_la_SOURCES = video_chroma/omxdl.c libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS) libchroma_omx_plugin_la_LIBADD = $(OMXIP_LIBS) -libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c +libswscale_plugin_la_SOURCES = video_chroma/swscale.c codec/avcodec/chroma.c libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS) libswscale_plugin_la_LIBADD = $(SWSCALE_LIBS) libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)' -libgrey_yuv_plugin_la_SOURCES = grey_yuv.c +libgrey_yuv_plugin_la_SOURCES = video_chroma/grey_yuv.c -libi420_rgb_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \ - i420_rgb8.c i420_rgb16.c i420_rgb_c.h +libi420_rgb_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_rgb.h \ + video_chroma/i420_rgb8.c video_chroma/i420_rgb16.c video_chroma/i420_rgb_c.h libi420_rgb_plugin_la_LIBADD = $(LIBM) -libi420_yuy2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h +libi420_yuy2_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i420_yuy2 -libi422_i420_plugin_la_SOURCES = i422_i420.c +libi422_i420_plugin_la_SOURCES = video_chroma/i422_i420.c -libi422_yuy2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h +libi422_yuy2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h libi422_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i422_yuy2 -librv32_plugin_la_SOURCES = rv32.c +librv32_plugin_la_SOURCES = video_chroma/rv32.c -libyuy2_i420_plugin_la_SOURCES = yuy2_i420.c +libyuy2_i420_plugin_la_SOURCES = video_chroma/yuy2_i420.c -libyuy2_i422_plugin_la_SOURCES = yuy2_i422.c +libyuy2_i422_plugin_la_SOURCES = video_chroma/yuy2_i422.c chroma_LTLIBRARIES = \ libi420_rgb_plugin.la \ @@ -46,10 +45,10 @@ chroma_LTLIBRARIES = \ libchain_plugin.la \ $(LTLIBswscale) -EXTRA_LTLIBRARIES = libswscale_plugin.la libchroma_omx_plugin.la +EXTRA_LTLIBRARIES += libswscale_plugin.la libchroma_omx_plugin.la # AltiVec -libi420_yuy2_altivec_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h +libi420_yuy2_altivec_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h libi420_yuy2_altivec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i420_yuy2_altivec libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALTIVEC_CFLAGS) @@ -60,15 +59,15 @@ chroma_LTLIBRARIES += \ endif # MMX -libi420_rgb_mmx_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \ - i420_rgb16_x86.c i420_rgb_mmx.h +libi420_rgb_mmx_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_rgb.h \ + video_chroma/i420_rgb16_x86.c video_chroma/i420_rgb_mmx.h libi420_rgb_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMMX -libi420_yuy2_mmx_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h +libi420_yuy2_mmx_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h libi420_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i420_yuy2_mmx -libi422_yuy2_mmx_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h +libi422_yuy2_mmx_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h libi422_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i422_yuy2_mmx @@ -80,15 +79,15 @@ chroma_LTLIBRARIES += \ endif # SSE2 -libi420_rgb_sse2_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \ - i420_rgb16_x86.c i420_rgb_sse2.h +libi420_rgb_sse2_plugin_la_SOURCES = video_chroma/i420_rgb.c video_chroma/i420_rgb.h \ + video_chroma/i420_rgb16_x86.c video_chroma/i420_rgb_sse2.h libi420_rgb_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSSE2 -libi420_yuy2_sse2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h +libi420_yuy2_sse2_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i420_yuy2.h libi420_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i420_yuy2_sse2 -libi422_yuy2_sse2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h +libi422_yuy2_sse2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422_yuy2.h libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_i422_yuy2_sse2 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
