OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
990f956
aa80742
)
Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 12 Mar 2014 20:45:02 +0000
(21:45 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 12 Mar 2014 20:45:02 +0000
(21:45 +0100)
* commit '
aa807425395caa17a85ed2833133278e8bd44a76
':
configure: Support older version of openjpeg1
Conflicts:
configure
Not merged as the problematic pkg config code wasnt merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge