From 4827777035d44786155785b17cca21e3cbe50618 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 6 Dec 2013 10:46:32 +0800
Subject: [PATCH] fix the build ffmpeg script bug, add yasm to path when build

---
 trunk/auto/build_ffmpeg.sh | 6 +++---
 trunk/auto/depends.sh      | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 trunk/auto/build_ffmpeg.sh
 mode change 100755 => 100644 trunk/auto/depends.sh

diff --git a/trunk/auto/build_ffmpeg.sh b/trunk/auto/build_ffmpeg.sh
old mode 100755
new mode 100644
index d2ad359d0..04de4b01a
--- a/trunk/auto/build_ffmpeg.sh
+++ b/trunk/auto/build_ffmpeg.sh
@@ -17,9 +17,6 @@ mkdir -p ${ff_release_dir}
 ff_yasm_bin=${ff_release_dir}/bin/yasm
 if [[ -f ${ff_yasm_bin} ]]; then 
     echo "yasm is ok"
-    # add yasm to path, for x264 to use yasm directly.
-    # ffmpeg can specifies the yasm path when configure it.
-    PATH=${PATH}:${ff_release_dir}/bin
 else
     echo "build yasm-1.2.0"
     cd $ff_current_dir &&
@@ -28,6 +25,9 @@ else
     make && make install
     ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build yasm-1.2.0 failed"; exit 1; fi
 fi
+# add yasm to path, for x264 to use yasm directly.
+# ffmpeg can specifies the yasm path when configure it.
+PATH=${PATH}:${ff_release_dir}/bin
 
 # libaacplus
 if [[ -f ${ff_release_dir}/lib/libaacplus.a ]]; then
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
old mode 100755
new mode 100644