1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'

* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
  doc: Update paths to match new examples location

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-17 19:36:59 +01:00
commit b0c75963c8
2 changed files with 0 additions and 4 deletions

1
.gitignore vendored
View File

@ -18,7 +18,6 @@
*.so.*
*.swp
*.ver
*-example
*-test
*_g
\#*

View File

@ -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).