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:
dd1382a
f56fe04
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 13 Jul 2013 10:22:17 +0000
(12:22 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 13 Jul 2013 10:22:22 +0000
(12:22 +0200)
* qatar/master:
jpeg2000: Initialize only once mqc arrays
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge