ffmpeg | branch: master | Derek Buitenhuis <[email protected]> | Sun Apr 17 19:36:59 2016 +0100| [b0c75963c87defa2c31661af23860854dfe15b4c] | committer: Derek Buitenhuis
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7' * commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7': doc: Update paths to match new examples location Merged-by: Derek Buitenhuis <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0c75963c87defa2c31661af23860854dfe15b4c --- .gitignore | 1 - doc/build_system.txt | 3 --- 2 files changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e6e18c..f0442e2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ *.so.* *.swp *.ver -*-example *-test *_g \#* diff --git a/doc/build_system.txt b/doc/build_system.txt index a9bd4eb..8c12e0e 100644 --- a/doc/build_system.txt +++ b/doc/build_system.txt @@ -39,9 +39,6 @@ examples libavformat/output-example Build the libavformat basic example. -libavcodec/api-example - Build the libavcodec basic example. - libswscale/swscale-test Build the swscale self-test (useful also as an example). ====================================================================== diff --cc .gitignore index 3e6e18c,6f14290..f0442e2 --- a/.gitignore +++ b/.gitignore @@@ -18,17 -17,12 +18,16 @@@ *.so.* *.swp *.ver - *-example *-test +*_g +\#* +.\#* /.config /.version -/avconv -/avplay -/avprobe +/ffmpeg +/ffplay +/ffprobe +/ffserver /config.* /coverage.info /avversion.h diff --cc doc/build_system.txt index a9bd4eb,3c5f156..8c12e0e --- a/doc/build_system.txt +++ b/doc/build_system.txt @@@ -33,32 -19,8 +33,29 @@@ fate-lis install Install headers, libraries and programs. -doc/examples/output +examples + Build all examples located in doc/examples. + +libavformat/output-example Build the libavformat basic example. - libavcodec/api-example - Build the libavcodec basic example. - libswscale/swscale-test - Build the swscale self-test (useful also as example). + Build the swscale self-test (useful also as an example). + +config + Reconfigure the project with the current configuration. + + +Useful standard make commands: +make -t <target> + Touch all files that otherwise would be built, this is useful to reduce + unneeded rebuilding when changing headers, but note that you must force rebuilds + of files that actually need it by hand then. + +make -j<num> + Rebuild with multiple jobs at the same time. Faster on multi processor systems. + +make -k + Continue build in case of errors, this is useful for the regression tests + sometimes but note that it will still not run all reg tests. + _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
