x86: Fix assembly with NASM

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0b00f07e5055c3cddecb315dbd6722a6e2c62003..be4b4ab22d7d4f797abbc6984124cbe87efa9a92 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,8 @@
 /doc/examples/muxing
 /doc/examples/scaling_video
 /doc/fate.txt
+/doc/doxy/html/
 /doc/print_options
-/doxy/
 /libavcodec/*_tablegen
 /libavcodec/*_tables.c
 /libavcodec/*_tables.h
@@ -55,6 +55,7 @@
 /tools/ffbisect
 /tools/bisect.need
 /tools/cws2fws
+/tools/ffescape
 /tools/ffeval
 /tools/graph2dot
 /tools/ismindex