Browse Source

Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
1faece7ecc
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      configure

+ 2
- 1
configure View File

@@ -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


Loading…
Cancel
Save