Merge remote-tracking branch 'qatar/master'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index bfce23d311accf663fa192eab84faebfafe40e3c..e7585e3d7f9e22620a19ad8eda695e7df94a6d93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.ho
 *-example
 *-test
+*_g
 config.*
 doc/*.1
 doc/*.html
@@ -15,10 +16,13 @@ ffmpeg
 ffplay
 ffprobe
 ffserver
+avconv
 libavcodec/*_tablegen
 libavcodec/*_tables.c
 libavcodec/*_tables.h
+libavcodec/codec_names.h
 libavcodec/libavcodec*
+libavcore/libavcore*
 libavdevice/libavdevice*
 libavfilter/libavfilter*
 libavformat/libavformat*