Mercurial > mplayer.hg

changeset 35135:6f635f9d2404

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author cigaes
date Thu, 04 Oct 2012 18:04:44 +0000
parents 2b037cee0795
children 9d2c691272aa
files configure
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Oct 04 18:04:42 2012 +0000
+++ b/configure	Thu Oct 04 18:04:44 2012 +0000
@@ -41,13 +41,10 @@
 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