Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:03:21 +0000 (15:03 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:03:21 +0000 (15:03 -0300)
* commit 'ab87af41636b081dd3562423999351b5444fa09e':
  configure: Add proper weak dependency of avformat on network

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc 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