[FFmpeg-cvslog] Merge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'

James Almer git at videolan.org
Thu Sep 28 01:09:34 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 27 19:08:19 2017 -0300| [57db1faf7a47223b471924845f2c37178d3ebf33] | committer: James Almer

Merge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'

* commit 'c546147db07d16a76c2fb698d2e8a3057f393475':
  configure: Correctly recurse in do_check_deps()

See 7659f35638e2ca7a8b202cb3007ca5473b108fa4.

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57db1faf7a47223b471924845f2c37178d3ebf33
---

 configure | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure b/configure
index 0af8f3c7e5..c7d73325db 100755
--- a/configure
+++ b/configure
@@ -734,7 +734,6 @@ is_in(){
 
 do_check_deps(){
     for cfg; do
-        cfg="${cfg#!}"
         enabled ${cfg}_checking && die "Circular dependency for $cfg."
         disabled ${cfg}_checking && continue
         enable ${cfg}_checking


======================================================================




More information about the ffmpeg-cvslog mailing list