vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 12:41:16 2012 +0300| [1051a606b49c1a42fa02ab1c74e201a904e7316a] | committer: Rémi Denis-Courmont
Remove recursion into modules/stream_out/transcode/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1051a606b49c1a42fa02ab1c74e201a904e7316a --- configure.ac | 1 - modules/stream_out/Modules.am | 10 +++++++--- modules/stream_out/transcode/Modules.am | 6 ------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 66d6d06..cff9f90 100644 --- a/configure.ac +++ b/configure.ac @@ -4162,7 +4162,6 @@ AC_CONFIG_FILES([ modules/stream_filter/Makefile modules/stream_filter/dash/Makefile modules/stream_out/Makefile - modules/stream_out/transcode/Makefile modules/text_renderer/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 022f06e..26ad06b 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -1,5 +1,3 @@ -SUBDIRS = transcode - SOURCES_stream_out_dummy = dummy.c SOURCES_stream_out_delay = delay.c SOURCES_stream_out_description = description.c @@ -17,6 +15,12 @@ SOURCES_stream_out_smem = smem.c SOURCES_stream_out_setid = setid.c SOURCES_stream_out_langfromtelx = langfromtelx.c +libstream_out_transcode_plugin_la_SOURCES = \ + transcode/transcode.c transcode/transcode.h \ + transcode/osd.c transcode/spu.c transcode/audio.c transcode/video.c +libstream_out_transcode_plugin_la_CFLAGS = $(AM_CFLAGS) +libstream_out_transcode_plugin_la_LIBADD = $(AM_LIBADD) + libvlc_LTLIBRARIES += \ libstream_out_dummy_plugin.la \ libstream_out_delay_plugin.la \ @@ -33,7 +37,7 @@ libvlc_LTLIBRARIES += \ libstream_out_smem_plugin.la \ libstream_out_setid_plugin.la \ libstream_out_langfromtelx_plugin.la \ - $(NULL) + libstream_out_transcode_plugin.la # RTP plugin libvlc_LTLIBRARIES += \ diff --git a/modules/stream_out/transcode/Modules.am b/modules/stream_out/transcode/Modules.am deleted file mode 100644 index cabc94c..0000000 --- a/modules/stream_out/transcode/Modules.am +++ /dev/null @@ -1,6 +0,0 @@ -SOURCES_stream_out_transcode = transcode.c transcode.h \ - osd.c \ - spu.c \ - audio.c \ - video.c -libvlc_LTLIBRARIES += libstream_out_transcode_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
