Mercurial > mplayer.hg
comparison configure @ 35133:816fffbf8647
Freeze FFmpeg to 1.0 until planar audio playback is fixed.
| author | cehoyos |
|---|---|
| date | Wed, 03 Oct 2012 10:19:31 +0000 |
| parents | 46134abbcaea |
| children | 6f635f9d2404 |
comparison
equal
deleted
inserted
replaced
| 35132:5ba6eb55d311 | 35133:816fffbf8647 |
|---|---|
| 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 if ! (cd ffmpeg && git checkout release/1.0) ; then | |
| 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 |
| 48 fi | |
| 49 (cd ffmpeg && git checkout release/1.0) | |
| 47 fi | 50 fi |
| 48 fi | 51 fi |
| 49 | 52 |
| 50 if ! test -e ffmpeg ; then | 53 if ! test -e ffmpeg ; then |
| 51 echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" | 54 echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" |