Commit 731e0d4
MacOS FFMpeg builds. (#56)
* Build LGPL FFmpeg shared libraries.
OpenCV should automatically use them.
* Also disable the x264 encoder.
* Also disable xvid
* Confirm FFmpeg is being built correctly.
* Make log easier to read.
* Travis-CI Mac environment only has 2 cores.1 parent 228b6ab commit 731e0d4
1 file changed
+8
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
16 | 22 | | |
17 | 23 | | |
18 | 24 | | |
| |||
113 | 119 | | |
114 | 120 | | |
115 | 121 | | |
116 | | - | |
| 122 | + | |
117 | 123 | | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
122 | | - | |
| 128 | + | |
123 | 129 | | |
124 | 130 | | |
125 | 131 | | |
| |||
0 commit comments