[FFmpeg-cvslog] build: Skip compiling network.h and rtsp.h if networking is not enabled.

Diego Biurrun git at videolan.org
Sun Jan 8 04:21:44 CET 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jan  7 19:17:15 2012 +0100| [52877251cfc309bd9d8b57905f6805222857aeb2] | committer: Diego Biurrun

build: Skip compiling network.h and rtsp.h if networking is not enabled.

rtsp.h relies on network.h and the latter conditionally defines fallback OS
structures that rely on configure tests, which are only run if networking
is enabled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52877251cfc309bd9d8b57905f6805222857aeb2
---

 libavformat/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 8c8a36d..3902e89 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -349,6 +349,8 @@ OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_TLS_PROTOCOL)              += tls.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
+SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
+
 EXAMPLES  = metadata output
 TESTPROGS = seek
 TOOLS     = pktdumper probetest



More information about the ffmpeg-cvslog mailing list