aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-30 09:33:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-30 09:33:46 +0100
commit4427fe7e4bf652856e4ee4101fae3c361fc8637f (patch)
tree2ff6e849a30c27483a8b62cdce7055a8374de8ce /Changelog
parente1848aa469b7fc7f65df7656593ce382923e7371 (diff)
parent5c0a09839c707f10e5dba59460e219e989c1da93 (diff)
downloadffmpeg-4427fe7e4bf652856e4ee4101fae3c361fc8637f.tar.gz
Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'
* commit '5c0a09839c707f10e5dba59460e219e989c1da93': libopenjpegdec: return meaningful error codes Conflicts: libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions