Merge remote-tracking branch 'qatar/master'

[ffmpeg] / configure

diff --git a/configure b/configure
index 101954e3e45d39f4e198277da6543175227d12be..75d523dc3de340d922ab271c2990c270cb4d737f 100755 (executable)
--- a/configure
+++ b/configure
@@ -424,7 +424,7 @@ sh_quote(){
 }
 
 cleanws(){
-    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//'
+    echo "$@" | sed 's/^ *//;s/  */ /g;s/ *$//;s/\r//g'
 }
 
 filter(){
@@ -2263,7 +2263,7 @@ postproc_deps="avutil gpl"
 swscale_deps="avutil"
 
 # programs
-ffmpeg_deps="avcodec avfilter avformat swscale swresample"
+ffmpeg_deps="avcodec avfilter avformat swresample"
 ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
                null_filter
                setpts_filter trim_filter"