Mercurial > mplayer.hg
comparison configure @ 35138:f5f583024549
Save poor users from my configure hack (r35227).
| author | cehoyos |
|---|---|
| date | Sat, 06 Oct 2012 04:48:58 +0000 |
| parents | 6f635f9d2404 |
| children | 15129bd36699 |
comparison
equal
deleted
inserted
replaced
| 35137:21162d7c4140 | 35138:f5f583024549 |
|---|---|
| 39 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" | 39 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" |
| 40 exit 1 | 40 exit 1 |
| 41 fi | 41 fi |
| 42 | 42 |
| 43 if test -e ffmpeg/mp_auto_pull ; then | 43 if test -e ffmpeg/mp_auto_pull ; then |
| 44 (cd ffmpeg && git checkout master) | |
| 44 if ! (cd ffmpeg && git pull --rebase --ff-only) ; then | 45 if ! (cd ffmpeg && git pull --rebase --ff-only) ; then |
| 45 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" | 46 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" |
| 46 exit 1 | 47 exit 1 |
| 47 fi | 48 fi |
| 48 fi | 49 fi |