[vlc-commits] [Git][videolan/vlc][master] demux: avformat: use automake var for zlib

Sat Mar 19 12:42:47 UTC 2022


François Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
e3a42ec9 by Francois Cartegnie at 2022-03-19T12:24:37+00:00
demux: avformat: use automake var for zlib

- - - - -


1 changed file:

- modules/demux/Makefile.am


Changes:

=====================================
modules/demux/Makefile.am
=====================================
@@ -152,11 +152,8 @@ if ENABLE_SOUT
 libavformat_plugin_la_SOURCES += demux/avformat/mux.c
 endif
 libavformat_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
-libavformat_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) libavcodec_common.la
+libavformat_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) $(LIBZ) libavcodec_common.la
 libavformat_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
-if HAVE_ZLIB
-libavformat_plugin_la_LIBADD += -lz
-endif
 if HAVE_AVFORMAT
 if !MERGE_FFMPEG
 demux_LTLIBRARIES += libavformat_plugin.la



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e3a42ec98f664dbaad635d02b38cd45f2f55a180

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e3a42ec98f664dbaad635d02b38cd45f2f55a180
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance
