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:
82a60de
250e077
)
Merge commit '250e077ee9eec0176a6d54a78542dc792943e71a'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 19:35:16 +0000
(20:35 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 19:37:49 +0000
(20:37 +0100)
* commit '
250e077ee9eec0176a6d54a78542dc792943e71a
':
riff: Support decoding png in avi (ImageJ)
See:
3668168afa1ef73928b2c6cc2a6ffa8e8ad82312
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge