[FFmpeg-cvslog] Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
Michael Niedermayer
git at videolan.org
Wed Jul 3 13:08:40 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 3 12:16:24 2013 +0200| [26f6acc66b668aa9cb97d487aa980a361d4030a1] | committer: Michael Niedermayer
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
jpeg2000: Clean up return paths and error messages
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26f6acc66b668aa9cb97d487aa980a361d4030a1
---
More information about the ffmpeg-cvslog
mailing list