# HG changeset patch # User cigaes # Date 1349373884 0 # Node ID 6f635f9d24040354fd9a46933ab5e1283c418a4d # Parent 2b037cee0795b6a82d3d98c471393807fc475b34 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. diff -r 2b037cee0795 -r 6f635f9d2404 configure --- 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