aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-03 11:55:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-03 11:55:45 +0200
commit3f0364327c32175221104799958702458be8fbd6 (patch)
tree398f383c6ec344d8e64e24e5585606adf25ff5ae /tests
parent37a970bbb668956956c632652a4316cceb48955a (diff)
parentfbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e (diff)
downloadffmpeg-3f0364327c32175221104799958702458be8fbd6.tar.gz
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e': jpeg2000: Check code-block size Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions