[MPlayer-cvslog] r35232 - trunk/configure

[cehoyos]

Author: cehoyos
Date: Sat Oct  6 06:48:58 2012
New Revision: 35232

Log:
Save poor users from my configure hack (r35227).

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Oct  6 06:45:34 2012	(r35231)
+++ trunk/configure	Sat Oct  6 06:48:58 2012	(r35232)
@@ -41,6 +41,7 @@ if test -e ffmpeg/.svn ; then
 fi
 
 if test -e ffmpeg/mp_auto_pull ; then
+    (cd ffmpeg && git checkout master)
     if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
         echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
         exit 1