[FFmpeg-cvslog] Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'
James Almer
git at videolan.org
Tue Sep 26 21:04:16 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 26 15:03:21 2017 -0300| [7289c7658a1ae32a59b26fac6b93791524f00dcb] | committer: James Almer
Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'
* commit 'ab87af41636b081dd3562423999351b5444fa09e':
configure: Add proper weak dependency of avformat on network
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7289c7658a1ae32a59b26fac6b93791524f00dcb
---
configure | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure b/configure
index 16fc2bd074..f0c114e9e3 100755
--- a/configure
+++ b/configure
@@ -3273,6 +3273,7 @@ avcodec_select="null_bsf"
avdevice_deps="avformat avcodec avutil"
avfilter_deps="avutil"
avformat_deps="avcodec avutil"
+avformat_suggest="network"
avresample_deps="avutil"
postproc_deps="avutil gpl"
swresample_deps="avutil"
======================================================================
diff --cc configure
index 16fc2bd074,a2223022cb..f0c114e9e3
--- a/configure
+++ b/configure
@@@ -3273,9 -2484,8 +3273,10 @@@ avcodec_select="null_bsf
avdevice_deps="avformat avcodec avutil"
avfilter_deps="avutil"
avformat_deps="avcodec avutil"
+ avformat_suggest="network"
avresample_deps="avutil"
+postproc_deps="avutil gpl"
+swresample_deps="avutil"
swscale_deps="avutil"
# programs
More information about the ffmpeg-cvslog
mailing list