[FFmpeg-cvslog] Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2
Michael Niedermayer
git at videolan.org
Mon Jul 14 22:45:35 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 22:37:59 2014 +0200| [ebf381168af50021f1112a2564c9fe2c627e41d8] | committer: Michael Niedermayer
Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2
* commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957':
jpeg2000: fix dereferencing invalid pointers during cleanup
Conflicts:
libavcodec/jpeg2000.c
See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebf381168af50021f1112a2564c9fe2c627e41d8
---
More information about the ffmpeg-cvslog
mailing list