Mercurial > mplayer.hg

changeset 35133:816fffbf8647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Freeze FFmpeg to 1.0 until planar audio playback is fixed.
author cehoyos
date Wed, 03 Oct 2012 10:19:31 +0000
parents 5ba6eb55d311
children 2b037cee0795
files configure
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Oct 01 19:47:45 2012 +0000
+++ b/configure	Wed Oct 03 10:19:31 2012 +0000
@@ -41,10 +41,13 @@
 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