diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:03:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:04:04 +0200 |
| commit | 1faece7eccdb35df1cdd5363c4bbc67f6a668755 (patch) | |
| tree | 3aae2905889e4351a311e8077b8f266570c21247 /configure | |
| parent | 0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1 (diff) | |
| parent | 406e6c0ba5393fa302080202fe77bd09187889a1 (diff) | |
| download | ffmpeg-1faece7eccdb35df1cdd5363c4bbc67f6a668755.tar.gz | |
Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'
* commit '406e6c0ba5393fa302080202fe77bd09187889a1':
configure: Properly split avserver component and system dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |