[FFmpeg-cvslog] Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
Michael Niedermayer
git at videolan.org
Tue May 28 08:08:30 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 08:04:02 2013 +0200| [91db8ff203048e3d6fed589e8352d3a5407d4302] | committer: Michael Niedermayer
Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
matroskadec: silently skip CodecState element.
smacker: fix off-by-one error in palette expanding code
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91db8ff203048e3d6fed589e8352d3a5407d4302
---
More information about the ffmpeg-cvslog
mailing list