Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
8e8f6a5f
Commit
8e8f6a5f
authored
Dec 30, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libav: do not build avio and avformat on MERGE_FFMPEG (fixes #10251)
parent
689ac6f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
modules/access/Makefile.am
modules/access/Makefile.am
+2
-0
modules/demux/Makefile.am
modules/demux/Makefile.am
+2
-0
No files found.
modules/access/Makefile.am
View file @
8e8f6a5f
...
...
@@ -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 ###
...
...
modules/demux/Makefile.am
View file @
8e8f6a5f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment