[FFmpeg-cvslog] Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
Michael Niedermayer
git at videolan.org
Wed Jul 3 16:08:40 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 15:45:03 2013 +0200| [ee7da5baccc3e038179c4072e9bab00b5689c1a9] | committer: Michael Niedermayer
Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
jpeg2000: Use the correct sizeof in memset for T1 data
jpeg2000: Simplify init_tile()
jpeg2000: Update pixel format support
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee7da5baccc3e038179c4072e9bab00b5689c1a9
---
More information about the ffmpeg-cvslog
mailing list