Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'
[ffmpeg.git] / .gitignore
index 33c366f..16c9c62 100644 (file)
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/doxy/html/
+/doc/examples/avio_reading
 /doc/examples/decoding_encoding
 /doc/examples/demuxing_decoding
 /doc/examples/decoding_encoding
 /doc/examples/demuxing_decoding
+/doc/examples/filter_audio
 /doc/examples/filtering_audio
 /doc/examples/filtering_video
 /doc/examples/metadata
 /doc/examples/muxing
 /doc/examples/pc-uninstalled
 /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/examples/resampling_audio
 /doc/examples/scaling_video
 /doc/examples/transcode_aac
 /doc/fate.txt
-/doc/doxy/html/
 /doc/print_options
 /lcov/
 /libavcodec/*_tablegen
 /doc/print_options
 /lcov/
 /libavcodec/*_tablegen
@@ -77,4 +80,5 @@
 /tools/qt-faststart
 /tools/trasher
 /tools/seek_print
 /tools/qt-faststart
 /tools/trasher
 /tools/seek_print
+/tools/uncoded_frame
 /tools/zmqsend
 /tools/zmqsend