* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c': smacker: check the return value of smacker_decode_tree Conflicts: libavcodec/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>