diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 02:06:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 02:10:15 +0100 |
| commit | fd982f2b40b8908a71d25202f0e6842206d8a78a (patch) | |
| tree | 36690c47c832b10a054787ff97cf5ab76a5df8ba /configure | |
| parent | abb6821e43e74bfce1565c4a6ed75cfb666a2e6d (diff) | |
| parent | 60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8 (diff) | |
| download | ffmpeg-fd982f2b40b8908a71d25202f0e6842206d8a78a.tar.gz | |
Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'
* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8':
configure: avserver does not need $ldl
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -2433,7 +2433,6 @@ ffplay_select="rdft crop_filter" ffprobe_deps="avcodec avformat" ffserver_deps="avformat fork sarestart" ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer" -ffserver_extralibs='$ldl' # documentation podpages_deps="perl" |