[FFmpeg-cvslog] Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'
Michael Niedermayer
git at videolan.org
Wed Aug 14 10:44:02 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 10:35:38 2013 +0200| [86fe16a763abf2d44a9d3c2ed6d19324239731e4] | committer: Michael Niedermayer
Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'
* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
nuv: Pad the lzo outbuf
Conflicts:
libavcodec/nuv.c
See: 95e1dfee76c9ecdf70037b7e792897bc6e3d460b
See: 266f6eefc603dd3c34be7de94eec5c9c293b80f1
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86fe16a763abf2d44a9d3c2ed6d19324239731e4
---
More information about the ffmpeg-cvslog
mailing list