[MPlayer-cvslog] r35227 - trunk/configure

[cehoyos]

Author: cehoyos
Date: Wed Oct  3 12:19:31 2012
New Revision: 35227

Log:
Freeze FFmpeg to 1.0 until planar audio playback is fixed.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Oct  1 21:47:45 2012	(r35226)
+++ trunk/configure	Wed Oct  3 12:19:31 2012	(r35227)
@@ -41,10 +41,13 @@ if test -e ffmpeg/.svn ; then
 fi
 
 if test -e ffmpeg/mp_auto_pull ; then
+    if ! (cd ffmpeg && git checkout release/1.0) ; 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
+    (cd ffmpeg && git checkout release/1.0)
+    fi
 fi
 
 if ! test -e ffmpeg ; then