Mercurial > mplayer.hg
changeset 34142:bd4f91a73fda
configure: cosmetics: fix indentation
| author | diego |
|---|---|
| date | Fri, 21 Oct 2011 15:44:55 +0000 |
| parents | bb7288560eff |
| children | 3f73c0da20c7 |
| files | configure |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Oct 21 15:44:53 2011 +0000 +++ b/configure Fri Oct 21 15:44:55 2011 +0000 @@ -35,28 +35,28 @@ # ############################################################################# - if test -e ffmpeg/.svn ; then +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 +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 + echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + exit 1 fi - fi - - if ! test -e ffmpeg ; then +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 + rm -rf ffmpeg + echo "Failed to get a FFmpeg checkout" + exit 1 fi touch ffmpeg/mp_auto_pull - fi +fi # Prevent locale nonsense from breaking basic text processing utilities export LC_ALL=C @@ -5973,7 +5973,7 @@ if test "$_ass" = no ; then res_comment="FreeType >= 2.2.1 needed" elif test "$ass_internal" != yes ; then - cat > $TMPC << EOF + cat > $TMPC << EOF #include <ass/ass.h> int main(void) { #if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00910000