ffmpeg | branch: master | Clément Bœsch <[email protected]> | Wed Jun 22 11:25:49 2016 +0200| [5558ff3a9f11acbf751fe46a27f5c67b04b23884] | committer: Clément Bœsch
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801' * commit '257f00ec1ab06a2a161f535036c6512f3fc8e801': Split global .gitignore file into per-directory files Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5558ff3a9f11acbf751fe46a27f5c67b04b23884 --- .gitignore | 64 --------------------------------------------- doc/.gitignore | 9 +++++++ doc/doxy/.gitignore | 1 + doc/examples/.gitignore | 16 ++++++++++++ libavcodec/.gitignore | 4 +++ libavformat/.gitignore | 1 + libavutil/.gitignore | 2 ++ tests/.gitignore | 11 ++++++++ tests/checkasm/.gitignore | 1 + tools/.gitignore | 19 ++++++++++++++ 10 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index e8ea178..0eca7a1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,69 +31,5 @@ /config.* /coverage.info /avversion.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_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 /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 --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..7628cec --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,9 @@ +/*.1 +/*.3 +/*.html +/*.pod +/config.texi +/avoptions_codec.texi +/avoptions_format.texi +/fate.txt +/print_options diff --git a/doc/doxy/.gitignore b/doc/doxy/.gitignore new file mode 100644 index 0000000..ac7af2e --- /dev/null +++ b/doc/doxy/.gitignore @@ -0,0 +1 @@ +/html/ diff --git a/doc/examples/.gitignore b/doc/examples/.gitignore new file mode 100644 index 0000000..2fe81f6 --- /dev/null +++ b/doc/examples/.gitignore @@ -0,0 +1,16 @@ +/avio_dir_cmd +/avio_reading +/decoding_encoding +/demuxing_decoding +/extract_mvs +/filter_audio +/filtering_audio +/filtering_video +/metadata +/muxing +/pc-uninstalled +/remuxing +/resampling_audio +/scaling_video +/transcode_aac +/transcoding diff --git a/libavcodec/.gitignore b/libavcodec/.gitignore new file mode 100644 index 0000000..77a2ab1 --- /dev/null +++ b/libavcodec/.gitignore @@ -0,0 +1,4 @@ +/*_tablegen +/*_tables.c +/*_tables.h +/bsf_list.c diff --git a/libavformat/.gitignore b/libavformat/.gitignore new file mode 100644 index 0000000..cdc24b7 --- /dev/null +++ b/libavformat/.gitignore @@ -0,0 +1 @@ +/protocol_list.c diff --git a/libavutil/.gitignore b/libavutil/.gitignore new file mode 100644 index 0000000..4dc7466 --- /dev/null +++ b/libavutil/.gitignore @@ -0,0 +1,2 @@ +/avconfig.h +/ffversion.h diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..4766e56 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,11 @@ +/audiogen +/audiomatch +/base64 +/data/ +/pixfmts.mak +/rotozoom +/test_copy.ffmeta +/tiny_psnr +/tiny_ssim +/videogen +/vsynth1/ diff --git a/tests/checkasm/.gitignore b/tests/checkasm/.gitignore new file mode 100644 index 0000000..9ee0e5c --- /dev/null +++ b/tests/checkasm/.gitignore @@ -0,0 +1 @@ +/checkasm diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000..c0958f4 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +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 ====================================================================== diff --cc .gitignore index e8ea178,a191731..0eca7a1 --- a/.gitignore +++ b/.gitignore @@@ -19,81 -18,12 +19,17 @@@ *.swp *.ver *-test +*_g +\#* +.\#* /.config /.version -/avconv -/avplay -/avprobe -/avversion.h +/ffmpeg +/ffplay +/ffprobe +/ffserver /config.* /coverage.info +/avversion.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_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 /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 --cc doc/.gitignore index 0000000,b057241..7628cec mode 000000,100644..100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@@ -1,0 -1,6 +1,9 @@@ + /*.1 ++/*.3 + /*.html + /*.pod ++/config.texi + /avoptions_codec.texi + /avoptions_format.texi ++/fate.txt + /print_options diff --cc doc/examples/.gitignore index 0000000,3f60af7..2fe81f6 mode 000000,100644..100644 --- a/doc/examples/.gitignore +++ b/doc/examples/.gitignore @@@ -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 --cc libavutil/.gitignore index 0000000,e2ac949..4dc7466 mode 000000,100644..100644 --- a/libavutil/.gitignore +++ b/libavutil/.gitignore @@@ -1,0 -1,1 +1,2 @@@ + /avconfig.h ++/ffversion.h diff --cc tests/.gitignore index 0000000,7ddaca2..4766e56 mode 000000,100644..100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@@ -1,0 -1,8 +1,11 @@@ + /audiogen ++/audiomatch + /base64 + /data/ + /pixfmts.mak + /rotozoom ++/test_copy.ffmeta + /tiny_psnr ++/tiny_ssim + /videogen + /vsynth1/ diff --cc tools/.gitignore index 0000000,21202fa..c0958f4 mode 000000,100644..100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@@ -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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
