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:
a354189
34e7a3d
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Mar 2013 04:37:09 +0000
(
05:37
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Mar 2013 04:37:14 +0000
(
05:37
+0100)
* cehoyos/master:
Move the iconv test to the bottom of configure.
Make 32bit zmbv colour-space opaque.
Use uint8_t instead of uint16_t pointer in kega decoder.
kgv1dec: Simplify kega decoding by using memcpy instead of loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge