[FFmpeg-cvslog] Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
Michael Niedermayer
git at videolan.org
Wed Jul 3 16:32:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 16:22:11 2013 +0200| [19ff6f55e800d848920af4a10e9516e51bfdcb0f] | committer: Michael Niedermayer
Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
* commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9':
jpeg2000: Simplify jpeg2000_decode_packets()
jpeg2000: Do not crash on NULL node in tag_tree_decode
jpeg2000: Refactor SOT marker parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19ff6f55e800d848920af4a10e9516e51bfdcb0f
---
More information about the ffmpeg-cvslog
mailing list