Merge commit '1720791e36f9cc24c05efea5bb275ab52156ce50'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:50:35 +0000 (11:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:50:35 +0000 (11:50 +0100)
commit1fc13a6269516541917b646231b5bc19a42c1384
tree3fc0bac8a6c5f79b85db610f5dc97cf996b04e10
parent6b5d6c93dda9be232507a188f83e1f639238e958
parent1720791e36f9cc24c05efea5bb275ab52156ce50
Merge commit '1720791e36f9cc24c05efea5bb275ab52156ce50'

* commit '1720791e36f9cc24c05efea5bb275ab52156ce50':
  png: read and write stereo3d frame side data information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/pngdec.c