OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 938e5f5 4e62b57)
Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)
* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
tests/fate/checkasm.mak patch | diff1 | diff2 | blob | history

diff --cc tests/fate/checkasm.mak
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help