[FFmpeg-cvslog] x86: Fix assembly with NASM

Dave Yeo git at videolan.org
Wed Oct 31 14:01:04 CET 2012


ffmpeg | branch: master | Dave Yeo <dave.r.yeo at gmail.com> | Tue Oct 30 23:48:26 2012 -0700| [264f12342c3e71e4ecc9a2993e656e064f774105] | committer: Michael Niedermayer

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>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=264f12342c3e71e4ecc9a2993e656e064f774105
---

 libavutil/x86/x86util.asm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index f7c6e3e..2eefeff 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 ffmpeg-cvslog mailing list