Merge commit '0ccddbad200c1d9439c5a836501917d515cddf76'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 04:13:07 +0000 (01:13 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 04:13:07 +0000 (01:13 -0300)
commitd2ad6f11920e972d0ef53121f74d9e25a3eb4304
tree341086ecf1e45d663f8dffebe4fdc5e75418fcf1
parentb3e5899e475d02dc0730e9405b4c067c8c78d8f4
parent0ccddbad200c1d9439c5a836501917d515cddf76
Merge commit '0ccddbad200c1d9439c5a836501917d515cddf76'

* commit '0ccddbad200c1d9439c5a836501917d515cddf76':
  smacker: limit recursion depth of smacker_decode_bigtree

See 946ecd19ea752399bccc751c9339ff74b815587e

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/smacker.c