Merge commit '294a51e1'

* commit '294a51e1':
  gitignore: Add all examples below doc/examples
Merged-by: Michael Niedermayer <michaelni@gmx.at>

.gitignore

@@ -34,6 +34,7 @@
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/doxy/html/
 /doc/examples/avio_reading
 /doc/examples/avcodec
 /doc/examples/demuxing_decoding
@@ -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