[vlc-commits] Enable to merge the avparser packetizer with --merge option

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 26 21:00:48 2015 +0100| [faf90e03a59f871c7de996012d2655e34c0b76a7] | committer: Jean-Baptiste Kempf

Enable to merge the avparser packetizer with --merge option

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=faf90e03a59f871c7de996012d2655e34c0b76a7
---

 modules/codec/Makefile.am     |    6 +++---
 modules/packetizer/Modules.am |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index b825128..bc39a4f 100644
--- a/modules/codec/Makefile.am
+++ b/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
diff --git a/modules/packetizer/Modules.am b/modules/packetizer/Modules.am
index fe4b949..de6ea1d 100644
--- a/modules/packetizer/Modules.am
+++ b/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