[FFmpeg-cvslog] Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
Michael Niedermayer
git at videolan.org
Wed Jul 3 15:39:02 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 15:30:05 2013 +0200| [2328e7e865216acdad6c9ce8a8dae4664aff3a29] | committer: Michael Niedermayer
Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
* commit '5bf208f659703895df7926238dcfa8a8175de36b':
jpeg2000: Use separate fields for int and float codepaths
jpeg2000: Split int/float codepaths depending on the DWT
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=2328e7e865216acdad6c9ce8a8dae4664aff3a29
---
More information about the ffmpeg-cvslog
mailing list