[FFmpeg-cvslog] Merge commit 'b564784a207b1395d2b5a41e580539df04651096'
Michael Niedermayer
git at videolan.org
Wed Jul 3 15:01:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 14:59:35 2013 +0200| [273f600b037ccf166e5540bc6e8e13d3bf738aa9] | committer: Michael Niedermayer
Merge commit 'b564784a207b1395d2b5a41e580539df04651096'
* commit 'b564784a207b1395d2b5a41e580539df04651096':
jpeg2000: Check that there is a SOT before SOD
jpeg2000: Remove unneeded returns
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=273f600b037ccf166e5540bc6e8e13d3bf738aa9
---
More information about the ffmpeg-cvslog
mailing list