Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index eac1758ed9cf078a78defeff627c0e439ff5c6a6..c922b8855df0a5107258c184bb269dc8f935bd34 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ ffmpeg
 ffplay
 ffprobe
 ffserver
+libavcodec/*_tablegen
+libavcodec/*_tables.c
+libavcodec/*_tables.h
 libavcodec/libavcodec*
 libavcore/libavcore*
 libavdevice/libavdevice*
@@ -41,5 +44,4 @@ tools/pktdumper
 tools/probetest
 tools/qt-faststart
 tools/trasher
-tools/trasher*.d
 version.h