OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ec90c9 5517466)
Merge commit '551746680462538bb5ad7adf55fb1248190428ec'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 16:21:23 +0000 (18:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Sep 2014 16:23:39 +0000 (18:23 +0200)
* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
configure

This is not merged as it does not work with musl here, while
our previous solution does.

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help