diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:21:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 01:45:42 +0200 |
| commit | 97511bc7cf443ffd6b8738f8f290422a0e3b23e5 (patch) | |
| tree | 83e331691485c173021cfabc069a5a6deb019d17 /libavformat/img2.c | |
| parent | faa1d4b1340f493ddc703706c9ab62bfc64835de (diff) | |
| parent | 10306e9c5fcc28bd9310a9b38f21540e9e1433e9 (diff) | |
| download | ffmpeg-97511bc7cf443ffd6b8738f8f290422a0e3b23e5.tar.gz | |
Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'
* commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9':
jpeg2000: fix dereferencing invalid pointers during cleanup
Conflicts:
libavcodec/jpeg2000.c
See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
0 files changed, 0 insertions, 0 deletions