[FFmpeg-cvslog] Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 24 01:21:23 2014 +0200| [97511bc7cf443ffd6b8738f8f290422a0e3b23e5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97511bc7cf443ffd6b8738f8f290422a0e3b23e5
---