Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:03:33 +0000 (19:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:04:04 +0000 (19:04 +0200)
* commit '406e6c0ba5393fa302080202fe77bd09187889a1':
  configure: Properly split avserver component and system dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2223,22 -1925,18 +2223,23 @@@ postproc_deps="avutil gpl
  swscale_deps="avutil"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale"
 -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 -               fps_filter null_filter resample_filter scale_filter
 +ffmpeg_deps="avcodec avfilter avformat swscale swresample"
 +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
 +               null_filter
                 setpts_filter trim_filter"
 -avplay_deps="avcodec avformat avresample swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat fork !shared"
 -avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 -avserver_extralibs='$ldl'
 -
 -doc_deps="texi2html"
 +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
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="texi2html"
 +txtpages_deps="makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters