Commit fd982f2b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '60e6cecf'

* commit '60e6cecf':
  configure: avserver does not need $ldl

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents abb6821e 60e6cecf
...@@ -2433,7 +2433,6 @@ ffplay_select="rdft crop_filter" ...@@ -2433,7 +2433,6 @@ ffplay_select="rdft crop_filter"
ffprobe_deps="avcodec avformat" ffprobe_deps="avcodec avformat"
ffserver_deps="avformat fork sarestart" ffserver_deps="avformat fork sarestart"
ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer" ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl'
# documentation # documentation
podpages_deps="perl" podpages_deps="perl"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment