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)
* 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>
1  2 
libavcodec/pngdec.c

Simple merge