[MPlayer-cvslog] r35229 - trunk/configure

[cigaes]

Author: cigaes
Date: Thu Oct  4 20:04:44 2012
New Revision: 35229

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

This reverts commit 6e1af1092c9e6c79ed54e3d5ff23e3d290ab87d6.

This is no longer necessary, planar audio playback works.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Oct  4 20:04:42 2012	(r35228)
+++ trunk/configure	Thu Oct  4 20:04:44 2012	(r35229)
@@ -41,13 +41,10 @@ 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