diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:37:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:38:12 +0200 |
commit | 59412e3a0703222c8bc995a7deb883327b7a9c03 (patch) | |
tree | f641754c62b6a30a70c4f3d05a1f036e5be2f666 /libavformat/ffmeta.h | |
parent | e1795bc380896701dfbbf904a8089154aff04746 (diff) | |
parent | e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe (diff) | |
download | ffmpeg-59412e3a0703222c8bc995a7deb883327b7a9c03.tar.gz |
Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'
* commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe':
png: support reading gray+alpha at 16 bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmeta.h')
0 files changed, 0 insertions, 0 deletions