Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'
[ffmpeg.git] / .gitignore
index 5397a35..1e87a8f 100644 (file)
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
-/doc/examples/decoding_encoding
+/doc/doxy/html/
+/doc/examples/avio_reading
+/doc/examples/avcodec
 /doc/examples/demuxing_decoding
 /doc/examples/filtering_audio
 /doc/examples/filtering_video
 /doc/examples/metadata
 /doc/examples/muxing
 /doc/examples/pc-uninstalled
+/doc/examples/remuxing
 /doc/examples/resampling_audio
 /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