Merge commit '5650e331a733711b809bc27f968500f0f5530126'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)
commit37a970bbb668956956c632652a4316cceb48955a
tree5e060b0057dc9ca87abbeeb39b3b08bd58cb9abb
parentb2498dcf5ca9473da4a63aebec9765e410f13dbb
parent5650e331a733711b809bc27f968500f0f5530126
Merge commit '5650e331a733711b809bc27f968500f0f5530126'

* commit '5650e331a733711b809bc27f968500f0f5530126':
  jpeg2000: Validate resolution levels

Conflicts:
libavcodec/jpeg2000dec.c

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