diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 22:41:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 22:50:19 +0200 |
| commit | 21e40f006aac36e41d3d6074928d584f0be51ada (patch) | |
| tree | 61b6f610471fc47a3ac36a0231d9b8e85b3df390 /libavcodec/cavsdec.c | |
| parent | 12a83bc0aa4bf680805757fd5e025adf3b16c526 (diff) | |
| parent | 876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de (diff) | |
| download | ffmpeg-21e40f006aac36e41d3d6074928d584f0be51ada.tar.gz | |
Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
configure: don't enable tls protocols if network is disabled
Conflicts:
configure
See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
0 files changed, 0 insertions, 0 deletions