virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
102,156 Commits 37 Branches 400 Tags 465 MiB
a04ad248a0
Commit Graph

12 Commits

Author SHA1 Message Date
James Almer
ecb5546e97 Merge commit '899ee03088d55152a48830df0899887f055da1de' 
* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

Merged-by: James Almer <jamrial@gmail.com>
 2019-03-14 15:53:16 -03:00
Luca Barbato
899ee03088 Unbreak travis on macos 2019-02-19 10:05:10 +01:00
James Almer
16a17fb6b2 Merge commit '4809781586d1c956005f72946a2aab5915eab350' 
* commit '4809781586d1c956005f72946a2aab5915eab350':
  travis: Exclude gcc for the macOS target

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-28 15:08:31 -03:00
Diego Biurrun
4f9297ac3b build: Prefer NASM assembler over YASM 
NASM is more actively maintained and permits generating dependency information
as a sideeffect of assembling, thus cutting build times in half.

(Cherry-picked from libav commit 57b753b445)

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-06-21 17:00:30 -03:00
Luca Barbato
4809781586 travis: Exclude gcc for the macOS target 
On a normal macOS setup, 'gcc' is a symlink to clang. Therefore there is
little point in running the tests twice, with CC=gcc and CC=clang.
 2017-04-20 12:53:08 +02:00
Diego Biurrun
57b753b445 build: Prefer NASM assembler over YASM 
NASM is more actively maintained and permits generating dependency information
as a sideeffect of assembling, thus cutting build times in half.
 2017-03-07 08:32:37 +01:00
Derek Buitenhuis
df8e24be5d Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec' 
* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
  travis: Enable OSX integration

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-11-22 17:12:24 +00:00
Vittorio Giovara
eda1832874 travis: Enable OSX integration 2015-11-17 16:51:00 +01:00
James Almer
1e0b8bf0b3 travis: fix dependencies 
bc hasn't been needed since a982c5d74f

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-12 12:29:27 +02:00
Hendrik Leppkes
33be39efe3 Merge commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c' 
* commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c':
  travis: fix dependencies

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:31:22 +02:00
Hendrik Leppkes
7e272100c9 Merge commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d' 
* commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d':
  build: Add support for travis CI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:24:51 +02:00
Federico Tomassetti
6bcd3e0599 build: Add support for travis CI 
It is useful to support a future staging branch and to have an
automated consistency check on github pull requests.
 2015-08-30 12:54:05 +02:00