Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 22:40:17 +0000 (00:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 22:40:17 +0000 (00:40 +0200)
commit9834874f8c540773f9a727413e38ba2f6b510e2a
treed49cf42c9933ce68b1248ee315ca063c32861f68
parent143a19f5c73b95c177aa03dd41ce85e03e2d13c2
parenta81cad8f86d1feb7e4bfae29e43f3e994935a5c7
Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'

* commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7':
  pngdec: Stop trying to decode once inflate returns Z_STREAM_END

Conflicts:
libavcodec/pngdec.c

See: 65bf9a44d7b0295e03463fd143499ab5b85d0cb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pngdec.c