[FFmpeg-cvslog] Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
Michael Niedermayer
git at videolan.org
Thu Sep 12 12:52:46 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 12:45:29 2013 +0200| [f8932d990228c53ee498b17eadf9dae4755c87ab] | committer: Michael Niedermayer
Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
smacker: Make sure we don't fill in huffman codes out of range
Conflicts:
libavcodec/smacker.c
See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4
the added test is redundant but will be used after future refactoring
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8932d990228c53ee498b17eadf9dae4755c87ab
---
More information about the ffmpeg-cvslog
mailing list