# HG changeset patch
# User reimar
# Date 1393442349 0
# Node ID d0b9b50d1c0739ec52ed9fa9a643e1d29e8326d8
# Parent  0177bb090db2c893b6baf6dd7256a8a5c6266eba
configure: add support for specifying a branch to use.

This is intended for use in releases.

diff -r 0177bb090db2 -r d0b9b50d1c07 configure
--- a/configure	Wed Feb 26 00:32:28 2014 +0000
+++ b/configure	Wed Feb 26 19:19:09 2014 +0000
@@ -1507,9 +1507,12 @@
     exit 1
 fi
 
+FFBRANCH=master
+test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
+
 if test -e ffmpeg/mp_auto_pull ; then
     echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
-    (cd ffmpeg && git checkout master)
+    (cd ffmpeg && git checkout $FFBRANCH)
     if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
         echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
         exit 1
@@ -1519,7 +1522,7 @@
 if ! test -e ffmpeg ; then
     echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
     read tmp
-    if ! git clone --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
+    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
         rm -rf ffmpeg
         echo "Failed to get a FFmpeg checkout"
         echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually."