Commit 1faece7e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '406e6c0b'

* commit '406e6c0b':
  configure: Properly split avserver component and system dependencies

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0a8f5eb2 406e6c0b
......@@ -2230,7 +2230,8 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
ffplay_deps="avcodec avformat swscale swresample sdl"
ffplay_select="rdft crop_filter"
ffprobe_deps="avcodec avformat"
ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer sarestart"
ffserver_deps="avformat fork sarestart"
ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
ffserver_extralibs='$ldl'
# documentation
......
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