summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:36:59 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:36:59 +0100
commitb0c75963c87defa2c31661af23860854dfe15b4c (patch)
tree6b468b64724ccaf37eaa885b1b5b178dea08a5ff
parent9d4799c247e305ab480198e4942d229a2949ea9b (diff)
parent48362ceadeb2eb5286ae94ef7f9542d990ff7ec7 (diff)
downloadffmpeg-streaming-b0c75963c87defa2c31661af23860854dfe15b4c.zip
ffmpeg-streaming-b0c75963c87defa2c31661af23860854dfe15b4c.tar.gz
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7': doc: Update paths to match new examples location Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--.gitignore1
-rw-r--r--doc/build_system.txt3
2 files changed, 0 insertions, 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).
OpenPOWER on IntegriCloud