vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Feb 26 21:00:48 2015 +0100| [6431ea3957eec984d85ebe82295fb86f92f40fd0] | committer: Jean-Baptiste Kempf
Enable to merge the avparser packetizer with --merge option > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6431ea3957eec984d85ebe82295fb86f92f40fd0 --- modules/codec/Makefile.am | 6 +++--- modules/packetizer/Makefile.am | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 1899284..9c31230 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -303,9 +303,9 @@ libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM) libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) if MERGE_FFMPEG -libavcodec_plugin_la_SOURCES += demux/avformat/demux.c access/avio.c -libavcodec_plugin_la_CFLAGS += $(AVFORMAT_CFLAGS) -libavcodec_plugin_la_LIBADD += $(AVFORMAT_LIBS) +libavcodec_plugin_la_SOURCES += demux/avformat/demux.c access/avio.c packetizer/avparser.c +libavcodec_plugin_la_CFLAGS += $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) +libavcodec_plugin_la_LIBADD += $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) if ENABLE_SOUT libavcodec_plugin_la_SOURCES += demux/avformat/mux.c endif diff --git a/modules/packetizer/Makefile.am b/modules/packetizer/Makefile.am index d67fc21..40ad488 100644 --- a/modules/packetizer/Makefile.am +++ b/modules/packetizer/Makefile.am @@ -40,6 +40,8 @@ packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la endif if HAVE_AVCODEC +if !MERGE_FFMPEG packetizer_LTLIBRARIES += libpacketizer_avparser_plugin.la endif +endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
