[FFmpeg-cvslog] Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 11:41:54 2013 +0200| [aecb3421f641d56d3b3419c28da5cf98b0eadd7c] | committer: Michael Niedermayer

Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'

* commit '45a1694fde251ee56e23aec073d73172c00aa470':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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