Mercurial > mplayer.hg
changeset 33160:d413ad875691
Reindent. Probably should also be moved, but that I leave to someone else.
| author | reimar |
|---|---|
| date | Sat, 09 Apr 2011 23:20:51 +0000 |
| parents | 18eb947fc34d |
| children | 5bc14a521e82 |
| files | configure |
| diffstat | 1 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Apr 09 22:09:09 2011 +0000 +++ b/configure Sat Apr 09 23:20:51 2011 +0000 @@ -36,28 +36,28 @@ ############################################################################# check_ffmpeg_git() { -if test -e ffmpeg/.svn ; then - echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" - exit 1 -fi - -if test -e ffmpeg/mp_auto_pull ; then - if ! (cd ffmpeg && git pull --rebase --ff-only) ; then - echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + if test -e ffmpeg/.svn ; then + echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" exit 1 fi -fi - -if ! test -e ffmpeg ; then - echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" - read tmp - if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then - rm -rf ffmpeg - echo "Failed to get a FFmpeg checkout" - exit 1 - fi - touch ffmpeg/mp_auto_pull -fi + + if test -e ffmpeg/mp_auto_pull ; then + if ! (cd ffmpeg && git pull --rebase --ff-only) ; then + echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + exit 1 + fi + fi + + if ! test -e ffmpeg ; then + echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" + read tmp + if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then + rm -rf ffmpeg + echo "Failed to get a FFmpeg checkout" + exit 1 + fi + touch ffmpeg/mp_auto_pull + fi } # Prevent locale nonsense from breaking basic text processing utils