Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:22:11 +0000 (16:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:26:01 +0000 (16:26 +0200)
commit19ff6f55e800d848920af4a10e9516e51bfdcb0f
treeb590f0bdfe74babb79986cdccef522c03833d446
parent1abb875c980ab9ab12bc6fe0e0762f489d887968
parentd57c737ac30cf079a342fa649fd4888c2d059dd9
Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'

* commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9':
  jpeg2000: Simplify jpeg2000_decode_packets()
  jpeg2000: Do not crash on NULL node in tag_tree_decode
  jpeg2000: Refactor SOT marker parsing

Conflicts:
libavcodec/jpeg2000dec.c

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