comparison configure @ 36038:777ccea2828d

Print a message before fetching a new FFmpeg version.
author reimar
date Mon, 01 Apr 2013 18:12:48 +0000
parents b81edd9d28ab
children 826e7d2dcd7e
comparison
equal deleted inserted replaced
36037:e31753d84084 36038:777ccea2828d
1495 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" 1495 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
1496 exit 1 1496 exit 1
1497 fi 1497 fi
1498 1498
1499 if test -e ffmpeg/mp_auto_pull ; then 1499 if test -e ffmpeg/mp_auto_pull ; then
1500 echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
1500 (cd ffmpeg && git checkout master) 1501 (cd ffmpeg && git checkout master)
1501 if ! (cd ffmpeg && git pull --rebase --ff-only) ; then 1502 if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
1502 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" 1503 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
1503 exit 1 1504 exit 1
1504 fi 1505 fi