[FFmpeg-cvslog] Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 16:11:01 2013 +0200| [1abb875c980ab9ab12bc6fe0e0762f489d887968] | committer: Michael Niedermayer

Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'

* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
	libavcodec/jpeg2000.c

See: 9d56ccf5

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

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