Mercurial > mplayer.hg

changeset 35138:f5f583024549

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Save poor users from my configure hack (r35227).
author cehoyos
date Sat, 06 Oct 2012 04:48:58 +0000
parents 21162d7c4140
children 15129bd36699
files configure
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Oct 06 04:45:34 2012 +0000
+++ b/configure	Sat Oct 06 04:48:58 2012 +0000
@@ -41,6 +41,7 @@
 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