Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)
commit3f0364327c32175221104799958702458be8fbd6
tree398f383c6ec344d8e64e24e5585606adf25ff5ae
parent37a970bbb668956956c632652a4316cceb48955a
parentfbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'

* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
  jpeg2000: Check code-block size

Conflicts:
libavcodec/jpeg2000dec.c

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