Enable to merge the avparser packetizer with --merge option

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 1899284134998e4c60d65df627903c933c5f4ac3..9c31230fbca72aee69e3ea9342a7a0cdebe8f4eb 100644 (file)
--- 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 d67fc2113bd23e9ea8dccb8cca7c3a192404d307..40ad488468e87858c7b2888366f534470e53f21f 100644 (file)
--- 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