[FFmpeg-cvslog] Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'
Michael Niedermayer
git at videolan.org
Mon Sep 30 01:05:25 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 00:56:24 2013 +0200| [a612bb3099eb0319567c3d682253782bee1d52de] | committer: Michael Niedermayer
Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'
* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
pcx: Consume the whole packet if giving up due to missing palette
Conflicts:
libavcodec/pcx.c
See: b4e516e30e7004a0454a9009080c4de38987189a
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a612bb3099eb0319567c3d682253782bee1d52de
---
More information about the ffmpeg-cvslog
mailing list