Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 08:33:46 +0000 (09:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 08:33:46 +0000 (09:33 +0100)
commit4427fe7e4bf652856e4ee4101fae3c361fc8637f
tree2ff6e849a30c27483a8b62cdce7055a8374de8ce
parente1848aa469b7fc7f65df7656593ce382923e7371
parent5c0a09839c707f10e5dba59460e219e989c1da93
Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'

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

Conflicts:
libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libopenjpegdec.c