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:
09d6cea
b3189af
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 18 Dec 2013 11:37:42 +0000
(12:37 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 18 Dec 2013 11:38:33 +0000
(12:38 +0100)
* qatar/master:
png_parser: Fix parsing on big endian
See:
3d42addf336739a69aee47891413a46e4f64995b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge