[FFmpeg-cvslog] Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 09:33:46 2013 +0100| [4427fe7e4bf652856e4ee4101fae3c361fc8637f] | committer: Michael Niedermayer

Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'

* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
  libopenjpegdec: return meaningful error codes

Conflicts:
	libavcodec/libopenjpegdec.c

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

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