Merge commit '9f5b77c16f4da6248b57f0601364d9c762c620c2'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 12:58:01 +0000 (09:58 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 12:58:01 +0000 (09:58 -0300)
commitbdbf14abba9d1fb99b63cdaabf4bba074a36ea2f
tree6c00b0f1bc18f228353663e244862085f1544a7c
parent1b6e52c68fd0ce24f0e5dbafe93146c7793c677b
parent9f5b77c16f4da6248b57f0601364d9c762c620c2
Merge commit '9f5b77c16f4da6248b57f0601364d9c762c620c2'

* commit '9f5b77c16f4da6248b57f0601364d9c762c620c2':
  png: Report more details regarding unsupported pixel formats

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/pngdec.c