Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
authorClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:25:49 +0000 (11:25 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:28:51 +0000 (11:28 +0200)
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
.gitignore
doc/.gitignore
doc/examples/.gitignore
libavutil/.gitignore
tests/.gitignore
tools/.gitignore

diff --combined .gitignore
@@@ -1,6 -1,5 +1,6 @@@
  *.a
  *.o
 +*.o.*
  *.d
  *.def
  *.dll
  *.swp
  *.ver
  *-test
 +*_g
 +\#*
 +.\#*
  /.config
  /.version
 -/avconv
 -/avplay
 -/avprobe
 -/avversion.h
 +/ffmpeg
 +/ffplay
 +/ffprobe
 +/ffserver
  /config.*
  /coverage.info
- /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_dir_cmd
- /doc/examples/avio_reading
- /doc/examples/decoding_encoding
- /doc/examples/demuxing_decoding
- /doc/examples/extract_mvs
- /doc/examples/filter_audio
- /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/examples/transcoding
- /doc/fate.txt
- /doc/print_options
 +/avversion.h
  /lcov/
- /libavformat/protocol_list.c
- /libavcodec/*_tablegen
- /libavcodec/*_tables.c
- /libavcodec/*_tables.h
- /libavcodec/bsf_list.c
- /libavutil/avconfig.h
- /libavutil/ffversion.h
 +/src
- /tests/audiogen
- /tests/audiomatch
- /tests/base64
- /tests/checkasm/checkasm
- /tests/data/
- /tests/pixfmts.mak
- /tests/rotozoom
- /tests/test_copy.ffmeta
- /tests/tiny_psnr
- /tests/tiny_ssim
- /tests/videogen
- /tests/vsynth1/
- /tools/aviocat
- /tools/ffbisect
- /tools/bisect.need
- /tools/crypto_bench
- /tools/cws2fws
- /tools/fourcc2pixfmt
- /tools/ffescape
- /tools/ffeval
- /tools/ffhash
- /tools/graph2dot
- /tools/ismindex
- /tools/pktdumper
- /tools/probetest
- /tools/qt-faststart
- /tools/sidxindex
- /tools/trasher
- /tools/seek_print
- /tools/uncoded_frame
- /tools/zmqsend
diff --combined doc/.gitignore
index 0000000,b057241..7628cec
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,6 +1,9 @@@
+ /*.1
++/*.3
+ /*.html
+ /*.pod
++/config.texi
+ /avoptions_codec.texi
+ /avoptions_format.texi
++/fate.txt
+ /print_options
diff --combined doc/examples/.gitignore
index 0000000,3f60af7..2fe81f6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,5 +1,16 @@@
 -/avcodec
++/avio_dir_cmd
++/avio_reading
++/decoding_encoding
++/demuxing_decoding
++/extract_mvs
+ /filter_audio
++/filtering_audio
++/filtering_video
+ /metadata
 -/output
++/muxing
++/pc-uninstalled
++/remuxing
++/resampling_audio
++/scaling_video
+ /transcode_aac
++/transcoding
diff --combined libavutil/.gitignore
index 0000000,e2ac949..4dc7466
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1 +1,2 @@@
+ /avconfig.h
++/ffversion.h
diff --combined tests/.gitignore
index 0000000,7ddaca2..4766e56
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,8 +1,11 @@@
+ /audiogen
++/audiomatch
+ /base64
+ /data/
+ /pixfmts.mak
+ /rotozoom
++/test_copy.ffmeta
+ /tiny_psnr
++/tiny_ssim
+ /videogen
+ /vsynth1/
diff --combined tools/.gitignore
index 0000000,21202fa..c0958f4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,9 +1,19 @@@
+ /aviocat
++/ffbisect
++/bisect.need
++/crypto_bench
+ /cws2fws
++/fourcc2pixfmt
++/ffescape
++/ffeval
++/ffhash
+ /graph2dot
+ /ismindex
+ /pktdumper
+ /probetest
+ /qt-faststart
+ /sidxindex
+ /trasher
++/seek_print
++/uncoded_frame
++/zmqsend