Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:31:26 +0000 (14:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:33:22 +0000 (14:33 +0100)
* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
  gitignore: Add all examples below doc/examples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
.gitignore

diff --cc .gitignore
  *.ver
  *-example
  *-test
 +*_g
  /.config
  /.version
 -/avconv
 -/avplay
 -/avprobe
 -/avserver
 +/ffmpeg
 +/ffplay
 +/ffprobe
 +/ffserver
  /config.*
  /coverage.info
 -/version.h
  /doc/*.1
 +/doc/*.3
  /doc/*.html
  /doc/*.pod
 +/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
 +/doc/examples/filtering_audio
 +/doc/examples/filtering_video
  /doc/examples/metadata
 -/doc/examples/output
 +/doc/examples/muxing
 +/doc/examples/pc-uninstalled
 +/doc/examples/remuxing
 +/doc/examples/resampling_audio
 +/doc/examples/scaling_video
  /doc/examples/transcode_aac
- /doc/doxy/html/
- /doc/examples/output
- /doc/examples/transcode_aac
 +/doc/fate.txt
  /doc/print_options
  /lcov/
  /libavcodec/*_tablegen