Skip to content

V
vlc
Commit 6431ea39 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Enable to merge the avparser packetizer with --merge option

parent 361829e7
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/codec/Makefile.am
View file @ 6431ea39
...@@ -303,9 +303,9 @@ libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM) ...@@ -303,9 +303,9 @@ libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM)
libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
if MERGE_FFMPEG if MERGE_FFMPEG
libavcodec_plugin_la_SOURCES += demux/avformat/demux.c access/avio.c libavcodec_plugin_la_SOURCES += demux/avformat/demux.c access/avio.c packetizer/avparser.c
libavcodec_plugin_la_CFLAGS += $(AVFORMAT_CFLAGS) libavcodec_plugin_la_CFLAGS += $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
libavcodec_plugin_la_LIBADD += $(AVFORMAT_LIBS) libavcodec_plugin_la_LIBADD += $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
if ENABLE_SOUT if ENABLE_SOUT
libavcodec_plugin_la_SOURCES += demux/avformat/mux.c libavcodec_plugin_la_SOURCES += demux/avformat/mux.c
endif endif
......
modules/packetizer/Makefile.am
View file @ 6431ea39
...@@ -40,6 +40,8 @@ packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la ...@@ -40,6 +40,8 @@ packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la
endif endif
if HAVE_AVCODEC if HAVE_AVCODEC
if !MERGE_FFMPEG
packetizer_LTLIBRARIES += libpacketizer_avparser_plugin.la packetizer_LTLIBRARIES += libpacketizer_avparser_plugin.la
endif endif
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment