ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jul 3
04:06:56 2015 +0200| [3ffa38580190f56d255bca2449b27720b6c18d60] | committer:
Michael Niedermayer
Merge commit '76d4c62734fbb8a9f497712812f30ff5c27e787f'
* commit '76d4c62734fbb8a9f497712812f30ff5c27e787f':
webp: Make sure enough bytes are available
Conflicts:
libavcodec/webp.c
See: 0762152f7af6cd93bc8f504d5503723500c3f369
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ffa38580190f56d255bca2449b27720b6c18d60
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
