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)
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
libavcodec/smacker.c

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

Simple merge