Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)
commit6c655b40eaceb77a8f4a8f32775db969935de746
tree827f60438d46fff1b950ec87a750869d5365a48a
parent85a3d20da55ff0eafff8ff6a3e52d52204fc6fd7
parentbbb2945f2dfbc2306c1655bf7eb6e220912a9a7c
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'

* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
libavcodec/smacker.c

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