Enable to merge the avparser packetizer with --merge option

(cherry picked from commit 6431ea3957eec984d85ebe82295fb86f92f40fd0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/codec/Makefile.am

@@ -266,9 +266,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

modules/packetizer/Modules.am

@@ -34,5 +34,7 @@ if ENABLE_SOUT
 packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la
 endif
 if HAVE_AVCODEC
+if !MERGE_FFMPEG
 packetizer_LTLIBRARIES += libpacketizer_avparser_plugin.la
 endif
+endif