Skip to content

Commit d725f32

Browse files
Update README.md
1 parent a5d8e42 commit d725f32

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,8 @@ Option | Description
5555
Feel free to copy-paste and run the examples above. More runnable examples are in ```examples/extract_motion_vectors.sh``` and ```examples/vis_motion_vectors.sh```. Feel free to use ```vis.cpp``` and ```examples/vis_hue.m``` as examples of parsing **mpegflow** output. ```examples/vis_hue``` can also be used to produce hue flow visualizations like above.
5656

5757
# Building from source
58-
**mpegflow** depends only on a recent FFmpeg, **vis** depends on FFmpeg, OpenCV and libpng. The tools are known to work with FFmpeg 2.7.2 and OpenCV 2.4.11. We strongly recommend running the following snippet to install the dependencies:
59-
60-
```bash
61-
cd dependencies
62-
bash install_ffmpeg_here_linux.sh # to install ffmpeg
63-
bash install_opencv_here_linux.sh # to install opencv
64-
cd .. # to move back from dependencies directory
65-
```
58+
**mpegflow** depends only on a recent FFmpeg, **vis** depends on FFmpeg, OpenCV and libpng. The tools are known to work with FFmpeg 3.1 and OpenCV 3.1. You may use [wigwam](http://wigwam.in) to install them to a local directory (no root required):
59+
```wigwam init && wigwam install opencv ffmpeg```
6660

6761
Once the dependencies are visible to g++, run:
6862
```bash
@@ -72,11 +66,13 @@ make vis # to build vis
7266

7367
To build the tools on Windows:
7468

75-
1. Follow ```dependencies\install_dependencies_here_windows.txt```
76-
2. Open VS2015 x64 Native Tools Command Prompt (VS2015 Community Edition will work) and run:
69+
1. Install 7zip
70+
2. Extract these FFmpeg builds to the dependencies directory using 7zip (for mpegflow and vis): https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-3.0.1-win64-dev.7z and https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-3.0.1-win64-shared.7z
71+
3. Extract this OpenCV build to the dependencies directory using 7zip (for vis): https://github.com/opencv/opencv/releases/download/3.1.0/opencv-3.1.0.exe
72+
4. Open VS2015 x64 Native Tools Command Prompt (VS2015 Community Edition will work) and run:
7773

7874
```shell
7975
nmake mpegflow.exe FFMPEG_DIR=dependencies\ffmpeg-3.0.1-win64-dev\ffmpeg-3.0.1-win64-dev
8076
# nmake vis.exe OPENCV_DIR=dependencies\opencv-3.1.0\opencv\build\x64\vc14
8177
```
82-
3. The Windows build is not fully static. You need to keep `avutil-54.dll`, `avformat-56.dll`, `avcodec-56.dll`, `swresample-2.dll` (for **mpegflow**) and `opencv_world310.dll` (for **vis**) in the same directory as the binary. Note that the instructions and the Makefile assume x64 machine architecture.
78+
5. The Windows build is not fully static. You need to keep `avutil-54.dll`, `avformat-56.dll`, `avcodec-56.dll`, `swresample-2.dll` (for **mpegflow**) and `opencv_world310.dll` (for **vis**) in the same directory as the binary. Note that the instructions and the Makefile assume x64 machine architecture.

0 commit comments

Comments
 (0)