[FFmpeg-cvslog] Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'

Michael Niedermayer git at videolan.org
Mon Sep 30 00:46:13 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 00:40:17 2013 +0200| [9834874f8c540773f9a727413e38ba2f6b510e2a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9834874f8c540773f9a727413e38ba2f6b510e2a
---





More information about the ffmpeg-cvslog mailing list