[libav-commits] x86: Fix assembly with NASM

Dave Yeo git at libav.org
Wed Oct 31 10:30:51 CET 2012


Module: libav
Branch: master
Commit: 9c167914a1d88192882fe09dfce430a299580a8a

Author:    Dave Yeo <dave.r.yeo at gmail.com>
Committer: Diego Biurrun <diego at biurrun.de>
Date:      Tue Oct 30 23:48:26 2012 -0700

x86: Fix assembly with NASM

Unlike YASM, NASM only looks for include files in the current
directory, not in the directory that included files reside in.

Signed-off-by: Diego Biurrun <diego at biurrun.de>

---

 libavutil/x86/x86util.asm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index d7ec594..4c6f4c6 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -23,7 +23,7 @@
 ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
+%include "libavutil/x86/x86inc.asm"
 
 %macro SBUTTERFLY 4
 %if avx_enabled == 0



More information about the libav-commits mailing list