Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

[ffmpeg] / .gitignore

diff --git a/.gitignore b/.gitignore
index d03a6b9ffd24d75e0f7e308af3ba76178e90c186..1e87a8f8de02e2baa0a39a228906b60448b3ffa0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,9 @@
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/doxy/html/
 /doc/examples/avio_reading
-/doc/examples/decoding_encoding
+/doc/examples/avcodec
 /doc/examples/demuxing_decoding
 /doc/examples/filtering_audio
 /doc/examples/filtering_video
@@ -47,9 +48,6 @@
 /doc/examples/scaling_video
 /doc/examples/transcode_aac
 /doc/fate.txt
-/doc/doxy/html/
-/doc/examples/output
-/doc/examples/transcode_aac
 /doc/print_options
 /lcov/
 /libavcodec/*_tablegen