[vlc-commits] libav: do not build avio and avformat on MERGE_FFMPEG (fixes #10251)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 30 20:05:36 2013 +0200| [8e8f6a5fdbe2b8091330a589b497c063f973597b] | committer: Rémi Denis-Courmont

libav: do not build avio and avformat on MERGE_FFMPEG (fixes #10251)

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

 modules/access/Makefile.am |    2 ++
 modules/demux/Makefile.am  |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 27193a1..c655a47 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -408,8 +408,10 @@ libavio_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
 libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
 libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
 if HAVE_AVFORMAT
+if !MERGE_FFMPEG
 access_LTLIBRARIES += libavio_plugin.la
 endif
+endif
 
 
 ### Misc ###
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 96f4655..6eb646d 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -151,8 +151,10 @@ if HAVE_DARWIN
 libavformat_plugin_la_LDFLAGS += -Wl,-read_only_relocs,suppress
 endif
 if HAVE_AVFORMAT
+if !MERGE_FFMPEG
 demux_LTLIBRARIES += libavformat_plugin.la
 endif
+endif
 
 libes_plugin_la_SOURCES  = demux/mpeg/es.c codec/dts_header.c codec/dts_header.h
 demux_LTLIBRARIES += libes_plugin.la