]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a45951c 9265364)
Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 13 Apr 2017 09:05:50 +0000 (11:05 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 13 Apr 2017 09:06:27 +0000 (11:06 +0200)
commit1849d0caa52f6748f59c75ee0d29adde9cb3451b
tree877005df2ae80fdcd436de1ef54ff3f460a12b70tree | snapshot
parenta45951c0a4917d3a1e3857a02689770654adcdebcommit | diff
parent9265364bec0af2e8b7c3a6de7bfc8291a0b70bcacommit | diff
Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'

* commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca':
  build: Separate avisynth and avxsynth support

Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.

Only merged the cosmetic re-ordering in the Makefile.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.