diff options
author | James Almer <jamrial@gmail.com> | 2017-09-26 15:03:21 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-09-26 15:03:21 -0300 |
commit | 7289c7658a1ae32a59b26fac6b93791524f00dcb (patch) | |
tree | 4293101789a828c1aeee30c4988158d4d65fcf6d | |
parent | 4c359200b142da0f57f050ae25c75f467939ecc1 (diff) | |
parent | ab87af41636b081dd3562423999351b5444fa09e (diff) | |
download | ffmpeg-7289c7658a1ae32a59b26fac6b93791524f00dcb.tar.gz |
Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'
* commit 'ab87af41636b081dd3562423999351b5444fa09e':
configure: Add proper weak dependency of avformat on network
Merged-by: James Almer <jamrial@gmail.com>
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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" |