[MPlayer-cvslog] r33247 - trunk/configure
reimar
subversion at mplayerhq.hu
Sun Apr 10 01:20:52 CEST 2011
Author: reimar
Date: Sun Apr 10 01:20:51 2011
New Revision: 33247
Log:
Reindent. Probably should also be moved, but that I leave to someone else.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Sun Apr 10 00:09:09 2011 (r33246)
+++ trunk/configure Sun Apr 10 01:20:51 2011 (r33247)
@@ -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
+ 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
- touch ffmpeg/mp_auto_pull
-fi
}
# Prevent locale nonsense from breaking basic text processing utils
More information about the MPlayer-cvslog
mailing list