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:
7a48b1c
46dee21
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Aug 2013 08:35:24 +0000
(10:35 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 Aug 2013 08:47:14 +0000
(10:47 +0200)
* qatar/master:
png: allow encoding 16-bit grayscale
Conflicts:
libavcodec/pngenc.c
See:
fdc013da7863190b9416d45830a9ad6d7fb854c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge